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 Mon, 15 Feb 2016 13:17:25 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/f7d6ac7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7d6ac7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7d6ac7e

Branch: refs/heads/trunk
Commit: f7d6ac7e40c66b0ee00d796f2667a4810deb665e
Parents: 72cb851 9cfbc31
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Mon Feb 15 13:12:43 2016 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Mon Feb 15 13:12:43 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cql3/statements/SelectStatement.java        | 22 +++++-
 .../org/apache/cassandra/db/ReadCommand.java    | 13 ++++
 src/java/org/apache/cassandra/index/Index.java  | 24 ++++--
 .../service/pager/RangeSliceQueryPager.java     |  8 +-
 .../cassandra/thrift/CassandraServer.java       |  8 ++
 .../org/apache/cassandra/cql3/CQLTester.java    | 32 +++++---
 .../apache/cassandra/index/CustomIndexTest.java | 82 +++++++++++++-------
 8 files changed, 144 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2e0c6aa,52fc3ab..c337825
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 -3.0.4
 +3.4
 + * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130)
 + * Support long name output for nodetool commands (CASSANDRA-7950)
 + * Encrypted hints (CASSANDRA-11040)
 + * SASI index options validation (CASSANDRA-11136)
 + * Optimize disk seek using min/max column name meta data when the LIMIT clause is used
 +   (CASSANDRA-8180)
 + * Add LIKE support to CQL3 (CASSANDRA-11067)
 + * Generic Java UDF types (CASSANDRA-10819)
 + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428)
 + * Set javac encoding to utf-8 (CASSANDRA-11077)
 + * Integrate SASI index into Cassandra (CASSANDRA-10661)
 + * Add --skip-flush option to nodetool snapshot
 + * Skip values for non-queried columns (CASSANDRA-10657)
 + * Add support for secondary indexes on static columns (CASSANDRA-8103)
 + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051)
 + * Add metric for number of dropped mutations (CASSANDRA-10866)
 + * Simplify row cache invalidation code (CASSANDRA-10396)
 + * Support user-defined compaction through nodetool (CASSANDRA-10660)
 + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
 +Merged from 3.0:
+  * Add query time validation method on Index (CASSANDRA-11043)
   * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
   * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
   * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index 3adee9f,c792a5a..3d044f2
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -324,9 -321,22 +324,22 @@@ public abstract class ReadCommand exten
      }
  
      /**
+      * If the index manager for the CFS determines that there's an applicable
+      * 2i that can be used to execute this command, call its (optional)
+      * validation method to check that nothing in this command's parameters
+      * violates the implementation specific validation rules.
+      */
+     public void maybeValidateIndex()
+     {
+         Index index = getIndex(Keyspace.openAndGetStore(metadata));
+         if (null != index)
+             index.validate(this);
+     }
+ 
+     /**
       * Executes this command on the local host.
       *
 -     * @param orderGroup the operation group spanning this command
 +     * @param executionController the execution controller spanning this command
       *
       * @return an iterator over the result of executing this command locally.
       */

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/test/unit/org/apache/cassandra/cql3/CQLTester.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7d6ac7e/test/unit/org/apache/cassandra/index/CustomIndexTest.java
----------------------------------------------------------------------


Mime
View raw message