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:49:00 UTC
[1/2] git commit: Fix AssertionError when doing set element deletion
Updated Branches:
refs/heads/cassandra-2.0 731f58fcd -> 6fe83cdac
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-2.0
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);
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fe83cda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fe83cda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fe83cda
Branch: refs/heads/cassandra-2.0
Commit: 6fe83cdacbd8bf8f0a24b1dffce9d15ac08ae0d0
Parents: 731f58f 4c08800
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Nov 14 18:47:50 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Nov 14 18:47:50 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/6fe83cda/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6a07720,39a88f8..17e97d5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -41,42 -17,10 +41,43 @@@ Merged from 1.2
* 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
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+ * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
+ * Add reloadtriggers command to nodetool (CASSANDRA-4949)
+ * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
+ * Fix sstable loader (CASSANDRA-6205)
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+ * Fix NPE while loading paxos state (CASSANDRA-6211)
+ * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
+Merged from 1.2:
+ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
* Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6fe83cda/src/java/org/apache/cassandra/cql3/Operation.java
----------------------------------------------------------------------