You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/28 15:37:41 UTC
[1/4] git commit: Forbid re-adding dropped counter columns
Repository: cassandra
Updated Branches:
refs/heads/trunk b31787435 -> 2cc6313b8
Forbid re-adding dropped counter columns
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7831
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36ecc69c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36ecc69c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36ecc69c
Branch: refs/heads/trunk
Commit: 36ecc69cbf3cc3734cf0602c60f101de95032a44
Parents: 0e272c2
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 28 16:30:23 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 28 16:31:07 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/cql3/statements/AlterTableStatement.java | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36ecc69c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index abdd561..20874ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.11:
+ * 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/36ecc69c/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index dfcd601..698c8b8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@ -109,6 +109,10 @@ public class AlterTableStatement extends SchemaAlteringStatement
}
}
+ // Cannot re-add a dropped counter column. See #7831.
+ if (meta.getDefaultValidator().isCommutative() && meta.getDroppedColumns().containsKey(columnName.key))
+ throw new InvalidRequestException(String.format("Cannot re-add previously dropped counter column %s", columnName));
+
AbstractType<?> type = validator.getType();
if (type instanceof CollectionType)
{
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7932119d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7932119d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7932119d
Branch: refs/heads/trunk
Commit: 7932119d1c1a300e52e80234a7c66cadc73b9e6a
Parents: d01250d 69a25cd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 28 16:37:00 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 28 16:37:00 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/cql3/statements/AlterTableStatement.java | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7932119d/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7932119d/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
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/trunk
Commit: 69a25cd0538246c061886c19ee55bdf272fcbc15
Parents: 58c09cb 36ecc69
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 28 16:36:40 2014 +0300
Committer: Aleksey Yeschenko <al...@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)
{
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cc6313b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cc6313b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cc6313b
Branch: refs/heads/trunk
Commit: 2cc6313b8e3db4caf85606937000678f1a822e67
Parents: b317874 7932119
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Aug 28 16:37:30 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Aug 28 16:37:30 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/cql3/statements/AlterTableStatement.java | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc6313b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc6313b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
----------------------------------------------------------------------