Merge cassandra-1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51c05554 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51c05554 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51c05554 Branch: refs/heads/cassandra-1.1 Commit: 51c05554a564766a730b65b2c05d3350d3c8f519 Parents: baf1300 281af5e Author: Brandon Williams <[email protected]> Authored: Wed Mar 28 11:59:00 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Mar 28 11:59:00 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cql/QueryProcessor.java | 20 +++++++++++++- 1 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51c05554/src/java/org/apache/cassandra/cql/QueryProcessor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql/QueryProcessor.java index 912315c,9900f47..71142cd --- a/src/java/org/apache/cassandra/cql/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java @@@ -251,9 -281,14 +251,14 @@@ public class QueryProcesso cfamsSeen.add(update.getColumnFamily()); } - rowMutations.addAll(update.prepareRowMutations(keyspace, clientState)); + rowMutations.addAll(update.prepareRowMutations(keyspace, clientState, variables)); } + for (IMutation mutation : rowMutations) + { + validateKey(mutation.key()); + } + try { StorageProxy.mutate(rowMutations, consistency);
