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/b3d6b6f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3d6b6f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3d6b6f0 Branch: refs/heads/trunk Commit: b3d6b6f00f0a290ea926123773ca14b1c1fbe58b Parents: 0c1c555 5baf28d Author: T Jake Luciani <j...@apache.org> Authored: Mon Aug 10 12:16:39 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Mon Aug 10 12:16:39 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../apache/cassandra/cache/AutoSavingCache.java | 2 +- .../cassandra/db/view/MaterializedView.java | 7 ++- .../compress/CompressedRandomAccessReader.java | 10 ++-- .../io/compress/CompressedSequentialWriter.java | 4 +- .../io/compress/CompressionMetadata.java | 14 +++-- .../apache/cassandra/io/sstable/Component.java | 18 ++++-- .../cassandra/io/sstable/format/Version.java | 6 +- .../io/sstable/format/big/BigFormat.java | 38 +++++++++--- .../io/util/ChecksummedRandomAccessReader.java | 4 +- .../io/util/DataIntegrityMetadata.java | 10 ++-- .../compress/CompressedInputStream.java | 6 +- .../compress/CompressedStreamReader.java | 2 +- .../apache/cassandra/utils/ChecksumType.java | 63 ++++++++++++++++++++ .../cassandra/cql3/MaterializedViewTest.java | 43 +++++++++++++ .../org/apache/cassandra/db/VerifyTest.java | 7 ++- .../CompressedRandomAccessReaderTest.java | 8 +-- .../CompressedSequentialWriterTest.java | 4 +- .../compression/CompressedInputStreamTest.java | 4 +- 19 files changed, 201 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
