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

Merge branch 'cassandra-2.0' into trunk 

Conflicts:
	build.xml
	lib/lz4-1.1.2.jar
This commit is contained in:
Sylvain Lebresne 2013-10-23 11:25:12 +02:00
parent f895ad4f0f 93da683e0c
commit 9bf5b45d88
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -336,7 +336,7 @@
<scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
<dependencyManagement>
<dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.5"/>
<dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.1.2"/>
<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="commons-cli" artifactId="commons-cli" version="1.1"/>

BIN
lib/lz4-1.1.2.jar
View File

Binary file not shown.

BIN
lib/lz4-1.2.0.jar Normal file
View File

Binary file not shown.

4
src/java/org/apache/cassandra/net/IncomingTcpConnection.java
View File

@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.jpountz.lz4.LZ4BlockInputStream;
import net.jpountz.lz4.LZ4Decompressor;
import net.jpountz.lz4.LZ4FastDecompressor;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.xxhash.XXHashFactory;
import org.xerial.snappy.SnappyInputStream;
@ -117,7 +117,7 @@ public class IncomingTcpConnection extends Thread
in = new DataInputStream(new SnappyInputStream(socket.getInputStream()));
else
{
LZ4Decompressor decompressor = LZ4Factory.fastestInstance().decompressor();
LZ4FastDecompressor decompressor = LZ4Factory.fastestInstance().fastDecompressor();
Checksum checksum = XXHashFactory.fastestInstance().newStreamingHash32(OutboundTcpConnection.LZ4_HASH_SEED).asChecksum();
in = new DataInputStream(new LZ4BlockInputStream(socket.getInputStream(),
decompressor,