natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switched to Guava 16.0 for CASSANDRA-6639

This commit is contained in:
Mikhail Stepura 2014-01-30 10:50:12 -08:00
parent 5fe0600744
commit 88bef0cbf3
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.xml
View File

@ -340,7 +340,7 @@
<dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.5"/>
<dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.2.0"/>
<dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/>
<dependency groupId="com.google.guava" artifactId="guava" version="15.0"/>
<dependency groupId="com.google.guava" artifactId="guava" version="16.0"/>
<dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
<dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
<dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
@ -418,7 +418,6 @@
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/>
<dependency groupId="org.apache.pig" artifactId="pig"/>
<dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
<dependency groupId="io.airlift" artifactId="airline"/>
</artifact:pom>
<artifact:pom id="coverage-deps-pom"

BIN
lib/guava-15.0.jar → lib/guava-16.0.jar
View File

Binary file not shown.

0
lib/licenses/guava-15.0.txt → lib/licenses/guava-16.0.txt
View File

5
src/java/org/apache/cassandra/tracing/TraceState.java
View File

@ -55,13 +55,12 @@ public class TraceState
this.coordinator = coordinator;
this.sessionId = sessionId;
sessionIdBytes = ByteBufferUtil.bytes(sessionId);
watch = new Stopwatch();
watch.start();
watch = Stopwatch.createStarted();
}
public int elapsed()
{
long elapsed = watch.elapsedTime(TimeUnit.MICROSECONDS);
long elapsed = watch.elapsed(TimeUnit.MICROSECONDS);
return elapsed < Integer.MAX_VALUE ? (int) elapsed : Integer.MAX_VALUE;
}