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/07/22 23:36:48 UTC
cassandra git commit: bypass key column restriction tests if
allowFiltering is true
Repository: cassandra
Updated Branches:
refs/heads/trunk 52c81d7b6 -> 8d317b1d3
bypass key column restriction tests if allowFiltering is true
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d317b1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d317b1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d317b1d
Branch: refs/heads/trunk
Commit: 8d317b1d305e173cd432518218e38d3cc9e6fc5e
Parents: 52c81d7
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri Jul 22 19:33:43 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri Jul 22 19:33:43 2016 -0400
----------------------------------------------------------------------
.../cassandra/cql3/restrictions/StatementRestrictions.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d317b1d/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
index f8a39ee..62b48b3 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
@@ -478,7 +478,7 @@ public final class StatementRestrictions
{
usesSecondaryIndexing = true;
}
- else
+ else if (!allowFiltering)
{
List<ColumnDefinition> clusteringColumns = cfm.clusteringColumns();
List<ColumnDefinition> restrictedColumns = new LinkedList<>(clusteringColumnsRestrictions.getColumnDefs());
@@ -488,7 +488,7 @@ public final class StatementRestrictions
ColumnDefinition clusteringColumn = clusteringColumns.get(i);
ColumnDefinition restrictedColumn = restrictedColumns.get(i);
- if (!clusteringColumn.equals(restrictedColumn) && !allowFiltering)
+ if (!clusteringColumn.equals(restrictedColumn))
{
throw invalidRequest("PRIMARY KEY column \"%s\" cannot be restricted as preceding column \"%s\" is not restricted",
restrictedColumn.name,