cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Fri, 15 Jan 2016 11:44:41 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/501f75bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/501f75bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/501f75bf

Branch: refs/heads/cassandra-3.3
Commit: 501f75bf99b62f94839de995a8e778aabb500523
Parents: b48d71c 5e5ea772
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Jan 15 11:29:22 2016 +0000
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Jan 15 11:29:22 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  2 +-
 src/java/org/apache/cassandra/index/Index.java  | 21 +++++---
 .../apache/cassandra/schema/IndexMetadata.java  | 20 +++++--
 .../apache/cassandra/index/CustomIndexTest.java | 57 ++++++++++++++++++++
 5 files changed, 88 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/501f75bf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9bc1349,ff607a5..991077d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,10 @@@
 -3.0.3
 +3.3
 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
 +Merged from 3.0:
+  * Support passing base table metadata to custom 2i validation (CASSANDRA-10924)
   * Ensure stale index entries are purged during reads (CASSANDRA-11013)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
   * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
   * Fix UnsupportedOperationException when reading old sstable with range
     tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/501f75bf/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/501f75bf/src/java/org/apache/cassandra/schema/IndexMetadata.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/schema/IndexMetadata.java
index 59ac1cf,7c60a64..04e06ab
--- a/src/java/org/apache/cassandra/schema/IndexMetadata.java
+++ b/src/java/org/apache/cassandra/schema/IndexMetadata.java
@@@ -138,12 -133,12 +138,12 @@@ public final class IndexMetadat
      public static String getDefaultIndexName(String cfName, String root)
      {
          if (root == null)
 -            return (cfName + "_" + "idx").replaceAll("\\W", "");
 +            return PATTERN_NON_WORD_CHAR.matcher(cfName + "_" + "idx").replaceAll("");
          else
 -            return (cfName + "_" + root + "_idx").replaceAll("\\W", "");
 +            return PATTERN_NON_WORD_CHAR.matcher(cfName + "_" + root + "_idx").replaceAll("");
      }
  
-     public void validate()
+     public void validate(CFMetaData cfm)
      {
          if (!isNameValid(name))
              throw new ConfigurationException("Illegal index name " + name);

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


Mime
View raw message