Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/356dd5b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/356dd5b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/356dd5b3 Branch: refs/heads/trunk Commit: 356dd5b31f73628ade6ea28efe33c55d1d1d3379 Parents: eaf0e35 ce63ccc Author: Benedict Elliott Smith <[email protected]> Authored: Fri Sep 4 12:43:37 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Sep 4 12:43:37 2015 +0100 ---------------------------------------------------------------------- build.xml | 8 +- lib/licenses/ohc-0.3.4.txt | 201 -------- lib/licenses/ohc-0.4.2.txt | 201 ++++++++ lib/ohc-core-0.4.2.jar | Bin 0 -> 126802 bytes lib/ohc-core-0.4.jar | Bin 127890 -> 0 bytes lib/ohc-core-j8-0.4.2.jar | Bin 0 -> 4994 bytes lib/ohc-core-j8-0.4.jar | Bin 4989 -> 0 bytes .../apache/cassandra/cache/AutoSavingCache.java | 2 +- .../org/apache/cassandra/cache/OHCProvider.java | 3 +- .../org/apache/cassandra/db/SystemKeyspace.java | 2 +- .../db/commitlog/CommitLogReplayer.java | 19 +- .../cassandra/db/filter/ColumnFilter.java | 2 +- .../cassandra/hints/ChecksummedDataInput.java | 128 +++-- .../org/apache/cassandra/hints/HintsReader.java | 67 ++- .../compress/CompressedRandomAccessReader.java | 147 +++--- .../io/compress/CompressedThrottledReader.java | 48 -- .../io/compress/CompressionMetadata.java | 2 +- .../cassandra/io/sstable/KeyIterator.java | 1 - .../io/sstable/format/SSTableReader.java | 100 ++-- .../cassandra/io/sstable/format/Version.java | 2 + .../io/sstable/format/big/BigFormat.java | 9 + .../io/sstable/format/big/BigTableReader.java | 108 ++--- .../io/sstable/format/big/BigTableWriter.java | 2 - .../cassandra/io/util/AbstractDataInput.java | 343 ------------- .../io/util/BufferedSegmentedFile.java | 24 - .../cassandra/io/util/ByteBufferDataInput.java | 171 ------- .../apache/cassandra/io/util/ChannelProxy.java | 4 +- .../io/util/ChecksummedRandomAccessReader.java | 62 ++- .../io/util/CompressedSegmentedFile.java | 100 ++-- .../cassandra/io/util/DataInputBuffer.java | 24 +- .../io/util/DataIntegrityMetadata.java | 11 +- .../apache/cassandra/io/util/FileDataInput.java | 25 +- .../io/util/FileSegmentInputStream.java | 96 ++++ .../cassandra/io/util/ICompressedFile.java | 9 +- .../cassandra/io/util/MemoryInputStream.java | 54 ++- .../cassandra/io/util/MmappedRegions.java | 344 +++++++++++++ .../cassandra/io/util/MmappedSegmentedFile.java | 214 +++----- .../cassandra/io/util/NIODataInputStream.java | 352 +------------- .../cassandra/io/util/RandomAccessReader.java | 417 ++++++++++------ .../io/util/RebufferingInputStream.java | 286 +++++++++++ .../apache/cassandra/io/util/SegmentedFile.java | 115 ++--- .../cassandra/io/util/ThrottledReader.java | 48 -- .../compress/CompressedStreamWriter.java | 10 +- .../apache/cassandra/utils/ByteBufferUtil.java | 3 - .../org/apache/cassandra/utils/Throwables.java | 45 +- .../apache/cassandra/utils/vint/VIntCoding.java | 2 +- .../cassandra/db/commitlog/CommitLogTest.java | 8 +- .../db/commitlog/CommitLogTestReplayer.java | 3 +- .../hints/ChecksummedDataInputTest.java | 227 +++++++-- .../io/ChecksummedRandomAccessReaderTest.java | 127 ----- .../cassandra/io/RandomAccessReaderTest.java | 269 ----------- .../CompressedRandomAccessReaderTest.java | 245 +++++----- .../CompressedSequentialWriterTest.java | 2 +- .../cassandra/io/sstable/SSTableReaderTest.java | 3 +- .../io/util/BufferedDataOutputStreamTest.java | 12 +- .../io/util/BufferedRandomAccessFileTest.java | 91 +--- .../util/ChecksummedRandomAccessReaderTest.java | 127 +++++ .../io/util/FileSegmentInputStreamTest.java | 131 +++++ .../apache/cassandra/io/util/MemoryTest.java | 37 ++ .../cassandra/io/util/MmappedRegionsTest.java | 375 ++++++++++++++ .../io/util/NIODataInputStreamTest.java | 16 +- .../io/util/RandomAccessReaderTest.java | 483 +++++++++++++++++++ 62 files changed, 3340 insertions(+), 2627 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/356dd5b3/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/356dd5b3/src/java/org/apache/cassandra/utils/ByteBufferUtil.java ----------------------------------------------------------------------
