cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [1/3] git commit: Validat correctly selects on composite partition key
Date Tue, 08 Jan 2013 00:02:27 GMT
Validat correctly selects on composite partition key

patch by slebresne; reviewed by jbellis for CASSANDRA-5122


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

Branch: refs/heads/trunk
Commit: 0d6131c400cc296796f132f802f4156408e84ace
Parents: dac6048
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Jan 7 17:22:49 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Jan 7 17:22:49 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../cassandra/cql3/statements/SelectStatement.java |   18 ++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d6131c4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 78643d5..e038599 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,7 @@
  * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
  * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
  * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
+ * Validate correctly selects on composite partition key (CASSANDRA-5122)
 Merged from 1.1:
  * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d6131c4/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index b41659c..e88784c 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -271,10 +271,10 @@ public class SelectStatement implements CQLStatement
             RowPosition finishKey = RowPosition.forKey(finishKeyBytes, p);
             if (startKey.compareTo(finishKey) > 0 && !finishKey.isMinimum(p))
             {
-                if (p instanceof RandomPartitioner)
-                    throw new InvalidRequestException("Start key sorts after end key. This
is not allowed; you probably should not specify end key at all, under RandomPartitioner");
-                else
+                if (p.preservesOrder())
                     throw new InvalidRequestException("Start key must sort before (or equal
to) finish key in your partitioner!");
+                else
+                    throw new InvalidRequestException("Start key sorts after end key. This
is not allowed; you probably should not specify end key at all under random partitioner");
             }
             if (includeKeyBound(Bound.START))
             {
@@ -991,6 +991,7 @@ public class SelectStatement implements CQLStatement
             CFDefinition cfDef = cfm.getCfDef();
             SelectStatement stmt = new SelectStatement(cfDef, getBoundsTerms(), parameters);
             CFDefinition.Name[] names = new CFDefinition.Name[getBoundsTerms()];
+            IPartitioner partitioner = StorageService.getPartitioner();
 
             // Select clause
             if (parameters.isCount)
@@ -1044,8 +1045,6 @@ public class SelectStatement implements CQLStatement
                 switch (name.kind)
                 {
                     case KEY_ALIAS:
-                        if (rel.operator() != Relation.Type.EQ && rel.operator()
!= Relation.Type.IN && !rel.onToken && !StorageService.getPartitioner().preservesOrder())
-                            throw new InvalidRequestException("Only EQ and IN relation are
supported on the partition key for RandomPartitioner (unless you use the token() function)");
                         stmt.keyRestrictions[name.position] = updateRestriction(name, stmt.keyRestrictions[name.position],
rel);
                         break;
                     case COLUMN_ALIAS:
@@ -1111,7 +1110,11 @@ public class SelectStatement implements CQLStatement
                 if (restriction == null)
                 {
                     if (stmt.onToken)
-                        throw new InvalidRequestException(String.format("The token() function
must be applied to all partition key components or none of them"));
+                        throw new InvalidRequestException("The token() function must be applied
to all partition key components or none of them");
+
+                    // Under a non order perserving partitioner, the only time not restricting
a key part is allowed is if none are restricted
+                    if (!partitioner.preservesOrder() && i > 0 && stmt.keyRestrictions[i-1]
!= null)
+                        throw new InvalidRequestException(String.format("Partition key part
%s must be restricted since preceding part is", cname));
 
                     stmt.isKeyRange = true;
                     shouldBeDone = true;
@@ -1145,6 +1148,9 @@ public class SelectStatement implements CQLStatement
                 }
                 else
                 {
+                    if (!partitioner.preservesOrder())
+                        throw new InvalidRequestException("Only EQ and IN relation are supported
on the partition key for random partitioners (unless you use the token() function)");
+
                     stmt.isKeyRange = true;
                     shouldBeDone = true;
                 }


Mime
View raw message