cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject git commit: fix for broken auto-merge of CASSANDRA-3612
Date Wed, 28 Mar 2012 17:17:41 GMT
Updated Branches:
  refs/heads/cassandra-1.1.0 2b44e5460 -> 68032e940


fix for broken auto-merge of CASSANDRA-3612


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

Branch: refs/heads/cassandra-1.1.0
Commit: 68032e9409fc4af4135f4958a52711a0ef3db1e4
Parents: 2b44e54
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Wed Mar 28 20:17:15 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Wed Mar 28 20:17:15 2012 +0300

----------------------------------------------------------------------
 .../org/apache/cassandra/cql/QueryProcessor.java   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/68032e94/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java
index 71142cd..28ee353 100644
--- a/src/java/org/apache/cassandra/cql/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java
@@ -612,7 +612,7 @@ public class QueryProcessor
                                 "Timestamp must be set either on BATCH or individual statements");
                 }
 
-                List<IMutation> mutations = batch.getMutations(keyspace, clientState);
+                List<IMutation> mutations = batch.getMutations(keyspace, clientState,
variables);
                 for (IMutation mutation : mutations)
                 {
                     validateKey(mutation.key());
@@ -667,7 +667,7 @@ public class QueryProcessor
                 DeleteStatement delete = (DeleteStatement)statement.statement;
 
                 keyspace = delete.keyspace == null ? clientState.getKeyspace() : delete.keyspace;
-                List<IMutation> deletions = delete.prepareRowMutations(keyspace, clientState);
+                List<IMutation> deletions = delete.prepareRowMutations(keyspace, clientState,
variables);
                 for (IMutation deletion : deletions)
                 {
                     validateKey(deletion.key());


Mime
View raw message