You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/10/23 11:25:22 UTC
[1/2] git commit: Update LZ4 lib to 1.2.0
Updated Branches:
refs/heads/trunk f895ad4f0 -> 9bf5b45d8
Update LZ4 lib to 1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93da683e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93da683e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93da683e
Branch: refs/heads/trunk
Commit: 93da683e0c835eb7e6cd28a03561c11f90435bb0
Parents: f8027ed
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Oct 23 11:20:23 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Oct 23 11:20:23 2013 +0200
----------------------------------------------------------------------
build.xml | 2 +-
lib/lz4-1.1.0.jar | Bin 134748 -> 0 bytes
lib/lz4-1.2.0.jar | Bin 0 -> 165505 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93da683e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 0e5771a..9a201a0 100644
--- a/build.xml
+++ b/build.xml
@@ -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.0"/>
+ <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"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93da683e/lib/lz4-1.1.0.jar
----------------------------------------------------------------------
diff --git a/lib/lz4-1.1.0.jar b/lib/lz4-1.1.0.jar
deleted file mode 100644
index fde917a..0000000
Binary files a/lib/lz4-1.1.0.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93da683e/lib/lz4-1.2.0.jar
----------------------------------------------------------------------
diff --git a/lib/lz4-1.2.0.jar b/lib/lz4-1.2.0.jar
new file mode 100644
index 0000000..9cdebd2
Binary files /dev/null and b/lib/lz4-1.2.0.jar differ
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
build.xml
lib/lz4-1.1.2.jar
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bf5b45d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bf5b45d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bf5b45d
Branch: refs/heads/trunk
Commit: 9bf5b45d889482757419bfb84a9d448de84dd500
Parents: f895ad4 93da683
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Oct 23 11:25:12 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Oct 23 11:25:12 2013 +0200
----------------------------------------------------------------------
build.xml | 2 +-
lib/lz4-1.1.2.jar | Bin 134344 -> 0 bytes
lib/lz4-1.2.0.jar | Bin 0 -> 165505 bytes
.../cassandra/net/IncomingTcpConnection.java | 4 ++--
4 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf5b45d/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf5b45d/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index ddc1853,f0449c4..469f9a2
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -25,11 -24,6 +25,11 @@@ import java.util.zip.Checksum
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;
import org.apache.cassandra.config.DatabaseDescriptor;
@@@ -113,16 -105,7 +113,16 @@@ public class IncomingTcpConnection exte
if (compressed)
{
logger.debug("Upgrading incoming connection to be compressed");
- in = new DataInputStream(new SnappyInputStream(socket.getInputStream()));
+ if (version < MessagingService.VERSION_21)
+ 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,
+ checksum));
+ }
}
else
{