You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/11/14 18:47:01 UTC
git commit: Fix AssertionError when doing set element deletion
Updated Branches:
refs/heads/cassandra-1.2 9a594c3a5 -> 4c08800b4
Fix AssertionError when doing set element deletion
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6341
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c08800b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c08800b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c08800b
Branch: refs/heads/cassandra-1.2
Commit: 4c08800b4ca3ded8653686fc2cc99e3056a8a606
Parents: 9a594c3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Nov 14 18:46:12 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Nov 14 18:46:12 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Operation.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c08800b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f186c37..39a88f8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
* Fix json2sstable handling of range tombstones (CASSANDRA-6316)
* Fix missing one row in reverse query (CASSANDRA-6330)
* Fix reading expired row value from row cache (CASSANDRA-6325)
+ * Fix AssertionError when doing set element deletion (CASSANDRA-6341)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c08800b/src/java/org/apache/cassandra/cql3/Operation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Operation.java b/src/java/org/apache/cassandra/cql3/Operation.java
index 2e16cea..8a659df 100644
--- a/src/java/org/apache/cassandra/cql3/Operation.java
+++ b/src/java/org/apache/cassandra/cql3/Operation.java
@@ -400,7 +400,7 @@ public abstract class Operation
return new Lists.DiscarderByIndex(id, idx);
case SET:
Term elt = element.prepare(Sets.valueSpecOf(receiver));
- return new Lists.Discarder(id, elt);
+ return new Sets.Discarder(id, elt);
case MAP:
Term key = element.prepare(Maps.keySpecOf(receiver));
return new Maps.DiscarderByKey(id, key);