You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/05/07 20:49:54 UTC
cassandra git commit: short-circuit the calls to
appliesOnlyToStaticColumns when clustering columns are present
Repository: cassandra
Updated Branches:
refs/heads/trunk 8120bcf0b -> c662d876b
short-circuit the calls to appliesOnlyToStaticColumns when clustering columns are present
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c662d876
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c662d876
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c662d876
Branch: refs/heads/trunk
Commit: c662d876b95d67a911dfe549d8a0d38ee6fbb904
Parents: 8120bcf
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 7 16:49:36 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 7 16:49:36 2016 -0400
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/statements/UpdateStatement.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c662d876/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
index fcc0ca6..4675731 100644
--- a/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
@@ -176,7 +176,7 @@ public class UpdateStatement extends ModificationStatement
}
}
- boolean applyOnlyToStaticColumns = appliesOnlyToStaticColumns(operations, conditions) && !hasClusteringColumnsSet;
+ boolean applyOnlyToStaticColumns = !hasClusteringColumnsSet && appliesOnlyToStaticColumns(operations, conditions);
StatementRestrictions restrictions = new StatementRestrictions(type,
cfm,
@@ -245,7 +245,7 @@ public class UpdateStatement extends ModificationStatement
}
}
- boolean applyOnlyToStaticColumns = appliesOnlyToStaticColumns(operations, conditions) && !hasClusteringColumnsSet;
+ boolean applyOnlyToStaticColumns = !hasClusteringColumnsSet && appliesOnlyToStaticColumns(operations, conditions);
StatementRestrictions restrictions = new StatementRestrictions(type,
cfm,