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, 28 Oct 2015 09:45:04 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/81183d6e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81183d6e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81183d6e

Branch: refs/heads/trunk
Commit: 81183d6e2ff2501b43c68b0add16e7b4120cd2d4
Parents: 5995de3 5bc3c4b
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Wed Oct 28 09:41:01 2015 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Wed Oct 28 09:41:01 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/ReadCommand.java    |  2 +-
 src/java/org/apache/cassandra/index/Index.java  |  6 -----
 .../cassandra/index/SecondaryIndexManager.java  | 23 +++++++++++---------
 .../index/internal/CassandraIndex.java          | 19 ++++++----------
 .../apache/cassandra/db/RangeTombstoneTest.java |  2 +-
 .../org/apache/cassandra/index/StubIndex.java   |  5 -----
 .../index/internal/CustomCassandraIndex.java    | 20 ++++++-----------
 8 files changed, 30 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 90db555,dd7949e..238d6b6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595)
   * Fix batches on multiple tables (CASSANDRA-10554)
   * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569)
   * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index f50a8cf,2eb1d1d..6675428
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -340,11 -337,11 +340,11 @@@ public abstract class ReadCommand exten
          Index.Searcher searcher = index == null ? null : index.searcherFor(this);
  
          if (index != null)
-             Tracing.trace("Executing read on {}.{} using index {}", cfs.metadata.ksName,
cfs.metadata.cfName, index.getIndexName());
+             Tracing.trace("Executing read on {}.{} using index {}", cfs.metadata.ksName,
cfs.metadata.cfName, index.getIndexMetadata().name);
  
          UnfilteredPartitionIterator resultIterator = searcher == null
 -                                         ? queryStorage(cfs, orderGroup)
 -                                         : searcher.search(orderGroup);
 +                                         ? queryStorage(cfs, executionController)
 +                                         : searcher.search(executionController);
  
          try
          {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/src/java/org/apache/cassandra/index/Index.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/81183d6e/test/unit/org/apache/cassandra/index/StubIndex.java
----------------------------------------------------------------------


Mime
View raw message