cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Date Wed, 23 Oct 2013 09:25:23 GMT
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 <sylvain@datastax.com>
Authored: Wed Oct 23 11:25:12 2013 +0200
Committer: Sylvain Lebresne <sylvain@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
          {


Mime
View raw message