cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Fri, 18 Sep 2015 07:54:33 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 1de63e9516a672780192588f7cc6dc228c5b9b79
Parents: 93745c0 98c4a7c
Author: Robert Stupp <snazy@snazy.de>
Authored: Fri Sep 18 09:48:53 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Fri Sep 18 09:48:53 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cql3/statements/AlterTypeStatement.java     |  6 ++-
 .../cassandra/db/marshal/AbstractType.java      |  8 ++++
 .../cassandra/db/marshal/CompositeType.java     | 11 +++++
 .../apache/cassandra/db/marshal/ListType.java   |  6 +++
 .../apache/cassandra/db/marshal/MapType.java    |  6 +++
 .../cassandra/db/marshal/ReversedType.java      |  5 ++
 .../apache/cassandra/db/marshal/SetType.java    |  6 +++
 .../apache/cassandra/db/marshal/TupleType.java  | 11 +++++
 .../cql3/validation/entities/UserTypesTest.java | 49 ++++++++++++++++++++
 10 files changed, 108 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 59a50a5,166106d..97858c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 -2.1.10
 +2.2.2
 + * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
 + * Cancel transaction for sstables we wont redistribute index summary
 +   for (CASSANDRA-10270)
 + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) 
 + * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
 + * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
 + * Fix repair hang when snapshot failed (CASSANDRA-10057)
 + * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
 +   (CASSANDRA-10199)
 +Merged from 2.1:
+  * Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
   * Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
   * Fix NPE in nodetool compactionhistory (CASSANDRA-9758)
   * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/AbstractType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/ListType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/MapType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/ReversedType.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/marshal/ReversedType.java
index 2aea3cd,0389a32..68a7e02
--- a/src/java/org/apache/cassandra/db/marshal/ReversedType.java
+++ b/src/java/org/apache/cassandra/db/marshal/ReversedType.java
@@@ -128,13 -109,12 +128,18 @@@ public class ReversedType<T> extends Ab
          return baseType.getSerializer();
      }
  
+     public boolean references(AbstractType<?> check)
+     {
+         return super.references(check) || baseType.references(check);
+     }
+ 
      @Override
 +    public boolean isReversed()
 +    {
 +        return true;
 +    }
 +
 +    @Override
      public String toString()
      {
          return getClass().getName() + "(" + baseType + ")";

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/SetType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/src/java/org/apache/cassandra/db/marshal/TupleType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de63e95/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java
----------------------------------------------------------------------


Mime
View raw message