cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Tue, 08 Sep 2015 08:41:14 GMT
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/9d8091fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d8091fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d8091fb

Branch: refs/heads/trunk
Commit: 9d8091fb2b8406eeadddfc64c5b8a93c1701dd91
Parents: 51d7aaa 60e45c0
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Sep 8 10:41:05 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Sep 8 10:41:05 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../org/apache/cassandra/db/ColumnIndex.java    |  20 +--
 .../org/apache/cassandra/db/RowIndexEntry.java  | 133 ++++++++++++++-----
 .../org/apache/cassandra/db/Serializers.java    |   5 -
 .../columniterator/AbstractSSTableIterator.java |  13 +-
 .../cassandra/io/sstable/IndexHelper.java       | 109 ++++++---------
 .../cassandra/io/sstable/KeyIterator.java       |   8 +-
 .../apache/cassandra/io/sstable/SSTable.java    |   2 +-
 .../io/sstable/format/SSTableReader.java        |   6 +-
 .../io/sstable/format/big/BigTableReader.java   |   2 +-
 .../io/sstable/format/big/BigTableScanner.java  |   4 +-
 .../apache/cassandra/service/CacheService.java  |   7 +-
 .../db/SinglePartitionSliceCommandTest.java     |  39 +++---
 .../cassandra/io/sstable/IndexHelperTest.java   |   6 +-
 .../cassandra/io/sstable/SSTableLoaderTest.java |   8 +-
 15 files changed, 212 insertions(+), 151 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d8091fb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6fcb862,d6ebe7a..6bd9dd8
--- 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
+  * Small optimizations of sstable index serialization (CASSANDRA-10232)
   * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
  
  


Mime
View raw message