cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Thu, 28 Aug 2014 13:36:51 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/cassandra-2.1.0
Commit: 69a25cd0538246c061886c19ee55bdf272fcbc15
Parents: 58c09cb 36ecc69
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Aug 28 16:36:40 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Aug 28 16:36:40 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 conf/cassandra-env.sh                                            | 2 +-
 .../apache/cassandra/cql3/statements/AlterTableStatement.java    | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 18c0a96,20874ac..d7a4536
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.0.11:
 +2.1.0
 + * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
 + * Fix failure to stream ranges when moving (CASSANDRA-7836)
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Forbid re-adding dropped counter columns (CASSANDRA-7831)
   * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
   * Always reject inequality on the partition key without token()
     (CASSANDRA-7722)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/conf/cassandra-env.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/69a25cd0/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index be28943,698c8b8..f286f31
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -108,6 -109,10 +108,10 @@@ public class AlterTableStatement extend
                      }
                  }
  
+                 // Cannot re-add a dropped counter column. See #7831.
 -                if (meta.getDefaultValidator().isCommutative() && meta.getDroppedColumns().containsKey(columnName.key))
++                if (meta.isCounter() && meta.getDroppedColumns().containsKey(columnName))
+                     throw new InvalidRequestException(String.format("Cannot re-add previously
dropped counter column %s", columnName));
+ 
                  AbstractType<?> type = validator.getType();
                  if (type instanceof CollectionType)
                  {


Mime
View raw message