cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 09 Sep 2015 07:56:29 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/c5408a3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5408a3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5408a3a

Branch: refs/heads/trunk
Commit: c5408a3a163af593cb826bea38a46f3c86da8b1c
Parents: b819422 e097efc
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Wed Sep 9 08:52:11 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Wed Sep 9 08:52:11 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cql3/statements/SelectStatement.java        |  4 +-
 .../db/AbstractReadCommandBuilder.java          |  8 +-
 .../cassandra/db/PartitionRangeReadCommand.java | 26 ++++--
 .../org/apache/cassandra/db/ReadCommand.java    | 96 ++++++++++++++++++--
 .../org/apache/cassandra/db/ReadOrderGroup.java |  2 +-
 .../db/SinglePartitionReadCommand.java          | 14 ++-
 .../cassandra/index/SecondaryIndexManager.java  | 23 ++---
 .../apache/cassandra/schema/IndexMetadata.java  | 39 +++++++-
 .../org/apache/cassandra/schema/Indexes.java    | 51 ++++++++---
 .../cassandra/schema/UnknownIndexException.java | 39 ++++++++
 .../apache/cassandra/service/StorageProxy.java  |  2 +-
 .../service/pager/RangeSliceQueryPager.java     | 16 ++--
 .../cassandra/thrift/CassandraServer.java       | 14 +--
 14 files changed, 258 insertions(+), 77 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5408a3a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7cf3c47,ab1b4ed..3109833
--- 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
+  * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
   * Small optimizations of sstable index serialization (CASSANDRA-10232)
   * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
  Merged from 2.2:


Mime
View raw message