Updated Branches: refs/heads/trunk 2dcbf0673 -> 793d58a19
Fix CQL3 CAS conditions check Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/793d58a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/793d58a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/793d58a1 Branch: refs/heads/trunk Commit: 793d58a197eded203a7bae5ec49c60d347eb2d14 Parents: 2dcbf06 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed May 15 01:05:20 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed May 15 01:05:20 2013 +0300 ---------------------------------------------------------------------- .../cql3/statements/ModificationStatement.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/793d58a1/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 7ca0000..45fbecc 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -476,7 +476,7 @@ public abstract class ModificationStatement implements CQLStatement ModificationStatement stmt = prepareInternal(cfDef, boundNames); - if (stmt.hasConditions()) + if (ifNotExists || (conditions != null && !conditions.isEmpty())) { if (stmt.isCounter()) throw new InvalidRequestException("Conditional updates are not supported on counter tables");
