cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [2/3] git commit: use default consistency level in counter validation if none is explicitly provided patch by Nitesh Kumar; reviewed by jbellis for CASSANDRA-4700
Date Mon, 24 Sep 2012 17:47:45 GMT
use default consistency level in counter validation if none is explicitly provided
patch by Nitesh Kumar; reviewed by jbellis for CASSANDRA-4700


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

Branch: refs/heads/trunk
Commit: 0307dca20d9d641d2c715772d3a4b33f1c6642da
Parents: 6fc4b3a
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Sep 24 12:43:26 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Sep 24 12:43:26 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 .../org/apache/cassandra/cql/UpdateStatement.java  |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0307dca2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 56422ea..4afe899 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 1.1.6
+ * use default consistency level in counter validation if none is
+   explicitly provide (CASSANDRA-4700)
  * Improve IAuthority interface by introducing fine-grained
    access permissions and grant/revoke commands (CASSANDRA-4490)
  * fix assumption error in CLI when updating/describing keyspace 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0307dca2/src/java/org/apache/cassandra/cql/UpdateStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/UpdateStatement.java b/src/java/org/apache/cassandra/cql/UpdateStatement.java
index b444da3..2491ef7 100644
--- a/src/java/org/apache/cassandra/cql/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql/UpdateStatement.java
@@ -148,7 +148,7 @@ public class UpdateStatement extends AbstractModification
 
         CFMetaData metadata = validateColumnFamily(keyspace, columnFamily, hasCommutativeOperation);
         if (hasCommutativeOperation)
-            validateCommutativeForWrite(metadata, cLevel);
+            validateCommutativeForWrite(metadata, getConsistencyLevel());
 
         QueryProcessor.validateKeyAlias(metadata, keyName);
 


Mime
View raw message