cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject git commit: Fix cas() arguments order in MS.executeWithCondition
Date Sat, 27 Jul 2013 00:44:12 GMT
Updated Branches:
  refs/heads/trunk e22025e09 -> 2548e5aca


Fix cas() arguments order in MS.executeWithCondition

follow-up to CASSANDRA-5797


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

Branch: refs/heads/trunk
Commit: 2548e5aca3a1ddc0c8b1e9ebe345d4be7d4a54c8
Parents: e22025e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Jul 27 03:43:22 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Jul 27 03:43:22 2013 +0300

----------------------------------------------------------------------
 .../cassandra/cql3/statements/ModificationStatement.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2548e5ac/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index d08d0ee..88a80e0 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -379,7 +379,14 @@ public abstract class ModificationStatement implements CQLStatement
         ColumnFamily updates = updateForKey(key, clusteringPrefix, params);
         ColumnFamily expected = buildConditions(key, clusteringPrefix, params);
 
-        ColumnFamily result = StorageProxy.cas(keyspace(), columnFamily(), key, clusteringPrefix,
expected, updates, options.getConsistency(), options.getSerialConsistency());
+        ColumnFamily result = StorageProxy.cas(keyspace(),
+                                               columnFamily(),
+                                               key,
+                                               clusteringPrefix,
+                                               expected,
+                                               updates,
+                                               options.getSerialConsistency(),
+                                               options.getConsistency());
         return new ResultMessage.Rows(buildCasResultSet(key, result));
     }
 


Mime
View raw message