cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Tue, 26 May 2015 15:22:33 GMT
Merge branch 'cassandra-2.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ec7594f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ec7594f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ec7594f

Branch: refs/heads/trunk
Commit: 2ec7594fd5597acc0af68ecc7483f2b71deb2493
Parents: b23e91f 3adfd15
Author: Josh McKenzie <josh.mckenzie@datastax.com>
Authored: Tue May 26 11:19:23 2015 -0400
Committer: Josh McKenzie <josh.mckenzie@datastax.com>
Committed: Tue May 26 11:19:23 2015 -0400

----------------------------------------------------------------------
 .../db/commitlog/CompressedSegment.java         |  44 +++---
 .../cassandra/io/compress/BufferType.java       |  45 ++++++
 .../compress/CompressedRandomAccessReader.java  |  50 +++----
 .../io/compress/CompressedSequentialWriter.java |  47 +++---
 .../io/compress/DeflateCompressor.java          | 133 +++++++++++++----
 .../cassandra/io/compress/ICompressor.java      |  41 +++--
 .../cassandra/io/compress/LZ4Compressor.java    |  57 ++++---
 .../cassandra/io/compress/SnappyCompressor.java |  38 +++--
 .../io/util/ChecksummedSequentialWriter.java    |   6 +-
 .../cassandra/io/util/RandomAccessReader.java   |  13 +-
 .../cassandra/io/util/SequentialWriter.java     |  10 +-
 .../cassandra/io/util/ThrottledReader.java      |   4 +-
 .../org/apache/cassandra/utils/FBUtilities.java |   9 +-
 .../db/commitlog/CommitLogStressTest.java       |  21 +--
 .../io/compress/CompressorPerformance.java      |  99 ++++++++++++
 .../cassandra/io/RandomAccessReaderTest.java    |  11 +-
 .../CompressedRandomAccessReaderTest.java       |   2 +-
 .../CompressedSequentialWriterTest.java         |   4 +-
 .../cassandra/io/compress/CompressorTest.java   | 149 +++++++++++--------
 .../cassandra/io/util/DataOutputTest.java       |   4 +-
 .../cassandra/io/util/SequentialWriterTest.java |   4 +-
 21 files changed, 504 insertions(+), 287 deletions(-)
----------------------------------------------------------------------



Mime
View raw message