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/acb8fbb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acb8fbb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acb8fbb8 Branch: refs/heads/trunk Commit: acb8fbb8f8582a8cf0c10f6c8a820600aafd290b Parents: 8564f09 51b1a1c Author: Robert Stupp <sn...@snazy.de> Authored: Mon Sep 14 22:07:18 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Sep 14 22:07:18 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnIndex.java | 1 + .../org/apache/cassandra/db/RowIndexEntry.java | 82 +++-- .../columniterator/AbstractSSTableIterator.java | 18 +- .../cassandra/io/sstable/IndexHelper.java | 29 +- .../io/sstable/format/big/BigTableScanner.java | 2 +- .../cassandra/io/util/DataOutputBuffer.java | 10 + .../cassandra/io/util/DataOutputPlus.java | 9 + .../cassandra/io/util/SequentialWriter.java | 5 + .../legacy_ma_clust/ma-1-big-CompressionInfo.db | Bin 83 -> 83 bytes .../legacy_ma_clust/ma-1-big-Data.db | Bin 5045 -> 5049 bytes .../legacy_ma_clust/ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_clust/ma-1-big-Index.db | Bin 157123 -> 157553 bytes .../legacy_ma_clust/ma-1-big-Statistics.db | Bin 7045 -> 7045 bytes .../legacy_ma_clust/ma-1-big-TOC.txt | 10 +- .../ma-1-big-CompressionInfo.db | Bin 75 -> 75 bytes .../legacy_ma_clust_counter/ma-1-big-Data.db | Bin 4447 -> 4393 bytes .../ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_clust_counter/ma-1-big-Index.db | Bin 157123 -> 157553 bytes .../ma-1-big-Statistics.db | Bin 7054 -> 7054 bytes .../legacy_ma_clust_counter/ma-1-big-TOC.txt | 10 +- .../legacy_ma_simple/ma-1-big-Data.db | Bin 85 -> 85 bytes .../legacy_ma_simple/ma-1-big-Digest.crc32 | 2 +- .../legacy_ma_simple/ma-1-big-Statistics.db | Bin 4598 -> 4598 bytes .../legacy_ma_simple/ma-1-big-TOC.txt | 10 +- .../legacy_ma_simple_counter/ma-1-big-Data.db | Bin 106 -> 106 bytes .../ma-1-big-Digest.crc32 | 2 +- .../ma-1-big-Statistics.db | Bin 4607 -> 4607 bytes .../legacy_ma_simple_counter/ma-1-big-TOC.txt | 10 +- .../apache/cassandra/cql3/KeyCacheCqlTest.java | 365 +++++++++++++++++++ .../apache/cassandra/db/RowIndexEntryTest.java | 142 +++++++- .../cassandra/io/sstable/IndexHelperTest.java | 8 +- 32 files changed, 641 insertions(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/acb8fbb8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b83d74b,1a1ddeb..6e04690 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.2 + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0.0-rc1 + * Update index file format (CASSANDRA-10314) * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) * CFS.loadNewSSTables() broken for pre-3.0 sstables * Cache selected index in read command to reduce lookups (CASSANDRA-10215) http://git-wip-us.apache.org/repos/asf/cassandra/blob/acb8fbb8/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java ----------------------------------------------------------------------
