You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2017/05/12 07:39:08 UTC
[1/3] cassandra git commit: Allow CONTAINS statements filtering on the partition key and it’s parts
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.11 c2299e689 -> f0319c88f
refs/heads/trunk bf911cc6a -> 501d0441c
Allow CONTAINS statements filtering on the partition key and it’s parts
Patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-13275
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0319c88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0319c88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0319c88
Branch: refs/heads/cassandra-3.11
Commit: f0319c88fd9a0e70cd8900ba7431724285886f9e
Parents: c2299e6
Author: Alex Petrov <ol...@gmail.com>
Authored: Tue Apr 18 15:56:07 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri May 12 09:27:33 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../PartitionKeySingleRestrictionSet.java | 3 +-
.../cql3/restrictions/RestrictionSet.java | 10 +++
.../restrictions/RestrictionSetWrapper.java | 5 ++
.../cql3/restrictions/Restrictions.java | 5 ++
.../restrictions/StatementRestrictions.java | 4 +-
.../cql3/restrictions/TokenFilter.java | 5 ++
.../cql3/restrictions/TokenRestriction.java | 10 +++
.../SelectOrderedPartitionerTest.java | 26 +++++++-
.../cql3/validation/operations/SelectTest.java | 65 ++++++++++++++++++--
10 files changed, 123 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b31d48..b13b777 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
* Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
* Fix duration type validation to prevent overflow (CASSANDRA-13218)
* Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
index b34ff54..f2b427d 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
@@ -135,8 +135,9 @@ final class PartitionKeySingleRestrictionSet extends RestrictionSetWrapper imple
{
if (isEmpty())
return false;
+
// slice or has unrestricted key component
- return hasUnrestrictedPartitionKeyComponents(cfm) || hasSlice();
+ return hasUnrestrictedPartitionKeyComponents(cfm) || hasSlice() || hasContains();
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
index 3a1bcb1..a0816d2 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
@@ -281,6 +281,16 @@ final class RestrictionSet implements Restrictions, Iterable<SingleRestriction>
return false;
}
+ public boolean hasContains()
+ {
+ for (SingleRestriction restriction : this)
+ {
+ if (restriction.isContains())
+ return true;
+ }
+ return false;
+ }
+
public final boolean hasSlice()
{
for (SingleRestriction restriction : this)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
index 996a1c4..5157de0 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
@@ -89,6 +89,11 @@ class RestrictionSetWrapper implements Restrictions
return restrictions.hasIN();
}
+ public boolean hasContains()
+ {
+ return restrictions.hasContains();
+ }
+
public boolean hasSlice()
{
return restrictions.hasSlice();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
index 8a5140a..5d11e9f 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
@@ -55,6 +55,11 @@ public interface Restrictions extends Restriction
public boolean hasIN();
/**
+ * Checks if any of the underlying restrictions is a CONTAINS / CONTAINS KEY restriction.
+ * @return <code>true</code> if any of the underlying restrictions is CONTAINS, <code>false</code> otherwise
+ */
+ public boolean hasContains();
+ /**
* Checks if any of the underlying restrictions is a slice.
* @return <code>true</code> if any of the underlying restrictions is a slice, <code>false</code> otherwise
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/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 8a8ee56..15a090b 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
@@ -429,8 +429,7 @@ public final class StatementRestrictions
// components must have a EQ. Only the last partition key component can be in IN relation.
if (partitionKeyRestrictions.needFiltering(cfm))
{
- if (!allowFiltering && !forView && !hasQueriableIndex
- && (partitionKeyRestrictions.hasUnrestrictedPartitionKeyComponents(cfm) || partitionKeyRestrictions.hasSlice()))
+ if (!allowFiltering && !forView && !hasQueriableIndex)
throw new InvalidRequestException(REQUIRES_ALLOW_FILTERING_MESSAGE);
if (partitionKeyRestrictions.hasIN())
@@ -518,7 +517,6 @@ public final class StatementRestrictions
checkFalse(clusteringColumnsRestrictions.hasIN() && selectsComplexColumn,
"Cannot restrict clustering columns by IN relations when a collection is selected by the query");
checkFalse(clusteringColumnsRestrictions.hasContains() && !hasQueriableIndex && !allowFiltering,
-
"Clustering columns can only be restricted with CONTAINS with a secondary index or filtering");
if (hasClusteringColumnsRestrictions() && clusteringColumnsRestrictions.needFiltering())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java b/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
index 400706b..13b3e3e 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
@@ -67,6 +67,11 @@ final class TokenFilter implements PartitionKeyRestrictions
return isOnToken() ? false : restrictions.hasIN();
}
+ public boolean hasContains()
+ {
+ return isOnToken() ? false : restrictions.hasContains();
+ }
+
public boolean hasOnlyEqualityRestrictions()
{
return isOnToken() ? false : restrictions.hasOnlyEqualityRestrictions();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
index e90319d..82b27dd 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
@@ -225,6 +225,11 @@ public abstract class TokenRestriction implements PartitionKeyRestrictions
{
return Collections.singletonList(value.bindAndGet(options));
}
+
+ public boolean hasContains()
+ {
+ return false;
+ }
}
public static class SliceRestriction extends TokenRestriction
@@ -237,6 +242,11 @@ public abstract class TokenRestriction implements PartitionKeyRestrictions
slice = TermSlice.newInstance(bound, inclusive, term);
}
+ public boolean hasContains()
+ {
+ return false;
+ }
+
@Override
public boolean hasSlice()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
index 3957305..003258a 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
@@ -66,7 +66,6 @@ public class SelectOrderedPartitionerTest extends CQLTester
});
}
-
@Test
public void testFilteringOnAllPartitionKeysWithTokenRestriction() throws Throwable
{
@@ -123,6 +122,31 @@ public class SelectOrderedPartitionerTest extends CQLTester
}
@Test
+ public void testTokenAndCollections() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a frozen<map<int, int>>, b int, c int, PRIMARY KEY (a, b))");
+
+ for (int i = 0; i < 10; i++)
+ {
+ execute("INSERT INTO %s (a,b,c) VALUES (?, ?, ?)", map(i, i), i, i);
+ execute("INSERT INTO %s (a,b,c) VALUES (?, ?, ?)", map(i, i, 100, 200), i + 10, i + 10);
+ }
+
+ beforeAndAfterFlush(() -> {
+ assertRows(execute("SELECT * FROM %s WHERE token(a) > token({0: 0}) AND a CONTAINS KEY 9 ALLOW FILTERING"),
+ row(map(9, 9), 9, 9),
+ row(map(9, 9, 100, 200), 19, 19));
+
+ assertRows(execute("SELECT * FROM %s WHERE token(a) > token({0: 0}) AND a CONTAINS KEY 9 AND a CONTAINS 200 ALLOW FILTERING"),
+ row(map(9, 9, 100, 200), 19, 19));
+
+ assertRows(execute("SELECT * FROM %s WHERE token(a) > token({0: 0}) AND a CONTAINS KEY 9 AND b = 19 ALLOW FILTERING"),
+ row(map(9, 9, 100, 200), 19, 19));
+ });
+ }
+
+
+ @Test
public void testTokenFunctionWithSingleColumnPartitionKey() throws Throwable
{
createTable("CREATE TABLE IF NOT EXISTS %s (a int PRIMARY KEY, b text)");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
index 572d903..9a24bd0 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
@@ -549,8 +549,8 @@ public class SelectTest extends CQLTester
createTable("CREATE TABLE %s (account text, id int, categories map<text,text>, PRIMARY KEY (account, id))");
// create an index on
- createIndex("CREATE INDEX id_index ON %s(id)");
- createIndex("CREATE INDEX categories_values_index ON %s(categories)");
+ createIndex("CREATE INDEX ON %s(id)");
+ createIndex("CREATE INDEX ON %s(categories)");
beforeAndAfterFlush(() -> {
@@ -1373,7 +1373,7 @@ public class SelectTest extends CQLTester
public void testSelectCountPaging() throws Throwable
{
createTable("create table %s (field1 text, field2 timeuuid, field3 boolean, primary key(field1, field2))");
- createIndex("create index test_index on %s (field3)");
+ createIndex("create index on %s (field3)");
execute("insert into %s (field1, field2, field3) values ('hola', now(), false)");
execute("insert into %s (field1, field2, field3) values ('hola', now(), false)");
@@ -2306,8 +2306,9 @@ public class SelectTest extends CQLTester
@Test
public void testIndexQueryWithValueOver64K() throws Throwable
{
- createTable("CREATE TABLE %s (a int, b int, c blob, PRIMARY KEY (a, b))");
- createIndex("CREATE INDEX test ON %s (c)");
+ String tableName = createTable("CREATE TABLE %s (a int, b int, c blob, PRIMARY KEY (a, b))");
+ String idx = tableName + "_c_idx";
+ createIndex("CREATE INDEX " + idx + " ON %s (c)");
execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 0, bytes(1));
execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 1, bytes(2));
@@ -2315,7 +2316,7 @@ public class SelectTest extends CQLTester
assertInvalidMessage("Index expression values may not be larger than 64K",
"SELECT * FROM %s WHERE c = ? ALLOW FILTERING", TOO_BIG);
- dropIndex("DROP INDEX %s.test");
+ dropIndex("DROP INDEX %s." + idx);
assertEmpty(execute("SELECT * FROM %s WHERE c = ? ALLOW FILTERING", TOO_BIG));
}
@@ -3765,6 +3766,58 @@ public class SelectTest extends CQLTester
}
@Test
+ public void testContainsOnPartitionKey() throws Throwable
+ {
+ testContainsOnPartitionKey("CREATE TABLE %s (pk frozen<map<int, int>>, ck int, v int, PRIMARY KEY (pk, ck))");
+ }
+
+ @Test
+ public void testContainsOnPartitionKeyPart() throws Throwable
+ {
+ testContainsOnPartitionKey("CREATE TABLE %s (pk frozen<map<int, int>>, ck int, v int, PRIMARY KEY ((pk, ck)))");
+ }
+
+ private void testContainsOnPartitionKey(String schema) throws Throwable
+ {
+ createTable(schema);
+
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2), 1, 1);
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2), 2, 2);
+
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2, 3, 4), 1, 3);
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2, 3, 4), 2, 3);
+
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(5, 6), 5, 5);
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(7, 8), 6, 6);
+
+ assertInvalidMessage(StatementRestrictions.REQUIRES_ALLOW_FILTERING_MESSAGE,
+ "SELECT * FROM %s WHERE pk CONTAINS KEY 1");
+
+ beforeAndAfterFlush(() -> {
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 ALLOW FILTERING"),
+ row(map(1, 2), 1, 1),
+ row(map(1, 2), 2, 2),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND pk CONTAINS 4 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND pk CONTAINS KEY 3 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND v = 3 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND ck = 1 AND v = 3 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3));
+ });
+ }
+
+ @Test
public void filteringWithOrderClause() throws Throwable
{
createTable("CREATE TABLE %s (a int, b int, c int, d list<int>, PRIMARY KEY (a, b, c))");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/3] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by if...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/501d0441
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/501d0441
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/501d0441
Branch: refs/heads/trunk
Commit: 501d0441c26a8b7f4266a423bde4cee7b0ac6f36
Parents: bf911cc f0319c8
Author: Alex Petrov <ol...@gmail.com>
Authored: Fri May 12 09:38:44 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri May 12 09:38:44 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../PartitionKeySingleRestrictionSet.java | 3 +-
.../cql3/restrictions/RestrictionSet.java | 10 +++
.../restrictions/RestrictionSetWrapper.java | 5 ++
.../cql3/restrictions/Restrictions.java | 5 ++
.../restrictions/StatementRestrictions.java | 4 +-
.../cql3/restrictions/TokenFilter.java | 5 ++
.../cql3/restrictions/TokenRestriction.java | 10 +++
.../SelectOrderedPartitionerTest.java | 26 +++++++-
.../cql3/validation/operations/SelectTest.java | 64 ++++++++++++++++++--
10 files changed, 122 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d06b06d,b13b777..9dc50b5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,5 +1,73 @@@
+4.0
+ * RangeStreamer should be smarter when picking endpoints for streaming (CASSANDRA-4650)
+ * Avoid rewrapping an exception thrown for cache load functions (CASSANDRA-13367)
+ * Log time elapsed for each incremental repair phase (CASSANDRA-13498)
+ * Add multiple table operation support to cassandra-stress (CASSANDRA-8780)
+ * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262)
+ * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421)
+ * Improve incremental repair logging (CASSANDRA-13468)
+ * Start compaction when incremental repair finishes (CASSANDRA-13454)
+ * Add repair streaming preview (CASSANDRA-13257)
+ * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430)
+ * Change protocol to allow sending key space independent of query string (CASSANDRA-10145)
+ * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661)
+ * Take number of files in L0 in account when estimating remaining compaction tasks (CASSANDRA-13354)
+ * Skip building views during base table streams on range movements (CASSANDRA-13065)
+ * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197)
+ * Remove deprecated repair JMX APIs (CASSANDRA-11530)
+ * Fix version check to enable streaming keep-alive (CASSANDRA-12929)
+ * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289)
+ * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324)
+ * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360)
+ * Cleanup ParentRepairSession after repairs (CASSANDRA-13359)
+ * Incremental repair not streaming correct sstables (CASSANDRA-13328)
+ * Upgrade the jna version to 4.3.0 (CASSANDRA-13300)
+ * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132)
+ * Remove config option index_interval (CASSANDRA-10671)
+ * Reduce lock contention for collection types and serializers (CASSANDRA-13271)
+ * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283)
+ * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292)
+ * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520)
+ * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226)
+ * Remove unused method (CASSANDRA-13227)
+ * Fix minor bugs related to #9143 (CASSANDRA-13217)
+ * Output warning if user increases RF (CASSANDRA-13079)
+ * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081)
+ * Add support for + and - operations on dates (CASSANDRA-11936)
+ * Fix consistency of incrementally repaired data (CASSANDRA-9143)
+ * Increase commitlog version (CASSANDRA-13161)
+ * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425)
+ * Refactor ColumnCondition (CASSANDRA-12981)
+ * Parallelize streaming of different keyspaces (CASSANDRA-4663)
+ * Improved compactions metrics (CASSANDRA-13015)
+ * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031)
+ * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855)
+ * Thrift removal (CASSANDRA-11115)
+ * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+ * Use new token allocation for non bootstrap case as well (CASSANDRA-13080)
+ * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084)
+ * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510)
+ * Allow IN restrictions on column families with collections (CASSANDRA-12654)
+ * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
+ * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
+ * Add mutation size and batch metrics (CASSANDRA-12649)
+ * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Add histogram for delay to deliver hints (CASSANDRA-13234)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720)
+
+
3.11.0
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
* Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
* Fix duration type validation to prevent overflow (CASSANDRA-13218)
* Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
index 5113667,f2b427d..ac589be
--- a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
@@@ -135,8 -135,9 +135,9 @@@ final class PartitionKeySingleRestricti
{
if (isEmpty())
return false;
+
// slice or has unrestricted key component
- return hasUnrestrictedPartitionKeyComponents(table) || hasSlice();
- return hasUnrestrictedPartitionKeyComponents(cfm) || hasSlice() || hasContains();
++ return hasUnrestrictedPartitionKeyComponents(table) || hasSlice() || hasContains();
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
index 8431490,15a090b..b368c22
--- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
@@@ -422,10 -427,9 +422,9 @@@ public final class StatementRestriction
// - Is it queriable without 2ndary index, which is always more efficient
// If a component of the partition key is restricted by a relation, all preceding
// components must have a EQ. Only the last partition key component can be in IN relation.
- if (partitionKeyRestrictions.needFiltering(cfm))
+ if (partitionKeyRestrictions.needFiltering(table))
{
- if (!allowFiltering && !forView && !hasQueriableIndex
- && (partitionKeyRestrictions.hasUnrestrictedPartitionKeyComponents(table) || partitionKeyRestrictions.hasSlice()))
+ if (!allowFiltering && !forView && !hasQueriableIndex)
throw new InvalidRequestException(REQUIRES_ALLOW_FILTERING_MESSAGE);
if (partitionKeyRestrictions.hasIN())
@@@ -508,8 -514,9 +507,7 @@@
}
else
{
- checkFalse(clusteringColumnsRestrictions.hasIN() && selectsComplexColumn,
- "Cannot restrict clustering columns by IN relations when a collection is selected by the query");
checkFalse(clusteringColumnsRestrictions.hasContains() && !hasQueriableIndex && !allowFiltering,
-
"Clustering columns can only be restricted with CONTAINS with a secondary index or filtering");
if (hasClusteringColumnsRestrictions() && clusteringColumnsRestrictions.needFiltering())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/501d0441/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
index 8aec899,9a24bd0..c0a8a9c
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
@@@ -2306,8 -2306,9 +2306,8 @@@ public class SelectTest extends CQLTest
@Test
public void testIndexQueryWithValueOver64K() throws Throwable
{
- createTable("CREATE TABLE %s (a int, b int, c blob, PRIMARY KEY (a, b))");
- createIndex("CREATE INDEX test ON %s (c)");
+ String tableName = createTable("CREATE TABLE %s (a int, b int, c blob, PRIMARY KEY (a, b))");
- String idx = tableName + "_c_idx";
- createIndex("CREATE INDEX " + idx + " ON %s (c)");
++ String idx = createIndex("CREATE INDEX ON %s (c)");
execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 0, bytes(1));
execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 1, bytes(2));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/3] cassandra git commit: Allow CONTAINS statements filtering on the partition key and it’s parts
Posted by if...@apache.org.
Allow CONTAINS statements filtering on the partition key and it’s parts
Patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-13275
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0319c88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0319c88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0319c88
Branch: refs/heads/trunk
Commit: f0319c88fd9a0e70cd8900ba7431724285886f9e
Parents: c2299e6
Author: Alex Petrov <ol...@gmail.com>
Authored: Tue Apr 18 15:56:07 2017 +0200
Committer: Alex Petrov <ol...@gmail.com>
Committed: Fri May 12 09:27:33 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../PartitionKeySingleRestrictionSet.java | 3 +-
.../cql3/restrictions/RestrictionSet.java | 10 +++
.../restrictions/RestrictionSetWrapper.java | 5 ++
.../cql3/restrictions/Restrictions.java | 5 ++
.../restrictions/StatementRestrictions.java | 4 +-
.../cql3/restrictions/TokenFilter.java | 5 ++
.../cql3/restrictions/TokenRestriction.java | 10 +++
.../SelectOrderedPartitionerTest.java | 26 +++++++-
.../cql3/validation/operations/SelectTest.java | 65 ++++++++++++++++++--
10 files changed, 123 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b31d48..b13b777 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.11.0
+ * Allow CONTAINS statements filtering on the partition key and it’s parts (CASSANDRA-13275)
* Fall back to even ranges calculation in clusters with vnodes when tokens are distributed unevenly (CASSANDRA-13229)
* Fix duration type validation to prevent overflow (CASSANDRA-13218)
* Forbid unsupported creation of SASI indexes over partition key columns (CASSANDRA-13228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
index b34ff54..f2b427d 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/PartitionKeySingleRestrictionSet.java
@@ -135,8 +135,9 @@ final class PartitionKeySingleRestrictionSet extends RestrictionSetWrapper imple
{
if (isEmpty())
return false;
+
// slice or has unrestricted key component
- return hasUnrestrictedPartitionKeyComponents(cfm) || hasSlice();
+ return hasUnrestrictedPartitionKeyComponents(cfm) || hasSlice() || hasContains();
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
index 3a1bcb1..a0816d2 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSet.java
@@ -281,6 +281,16 @@ final class RestrictionSet implements Restrictions, Iterable<SingleRestriction>
return false;
}
+ public boolean hasContains()
+ {
+ for (SingleRestriction restriction : this)
+ {
+ if (restriction.isContains())
+ return true;
+ }
+ return false;
+ }
+
public final boolean hasSlice()
{
for (SingleRestriction restriction : this)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
index 996a1c4..5157de0 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/RestrictionSetWrapper.java
@@ -89,6 +89,11 @@ class RestrictionSetWrapper implements Restrictions
return restrictions.hasIN();
}
+ public boolean hasContains()
+ {
+ return restrictions.hasContains();
+ }
+
public boolean hasSlice()
{
return restrictions.hasSlice();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
index 8a5140a..5d11e9f 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/Restrictions.java
@@ -55,6 +55,11 @@ public interface Restrictions extends Restriction
public boolean hasIN();
/**
+ * Checks if any of the underlying restrictions is a CONTAINS / CONTAINS KEY restriction.
+ * @return <code>true</code> if any of the underlying restrictions is CONTAINS, <code>false</code> otherwise
+ */
+ public boolean hasContains();
+ /**
* Checks if any of the underlying restrictions is a slice.
* @return <code>true</code> if any of the underlying restrictions is a slice, <code>false</code> otherwise
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/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 8a8ee56..15a090b 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
@@ -429,8 +429,7 @@ public final class StatementRestrictions
// components must have a EQ. Only the last partition key component can be in IN relation.
if (partitionKeyRestrictions.needFiltering(cfm))
{
- if (!allowFiltering && !forView && !hasQueriableIndex
- && (partitionKeyRestrictions.hasUnrestrictedPartitionKeyComponents(cfm) || partitionKeyRestrictions.hasSlice()))
+ if (!allowFiltering && !forView && !hasQueriableIndex)
throw new InvalidRequestException(REQUIRES_ALLOW_FILTERING_MESSAGE);
if (partitionKeyRestrictions.hasIN())
@@ -518,7 +517,6 @@ public final class StatementRestrictions
checkFalse(clusteringColumnsRestrictions.hasIN() && selectsComplexColumn,
"Cannot restrict clustering columns by IN relations when a collection is selected by the query");
checkFalse(clusteringColumnsRestrictions.hasContains() && !hasQueriableIndex && !allowFiltering,
-
"Clustering columns can only be restricted with CONTAINS with a secondary index or filtering");
if (hasClusteringColumnsRestrictions() && clusteringColumnsRestrictions.needFiltering())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java b/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
index 400706b..13b3e3e 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/TokenFilter.java
@@ -67,6 +67,11 @@ final class TokenFilter implements PartitionKeyRestrictions
return isOnToken() ? false : restrictions.hasIN();
}
+ public boolean hasContains()
+ {
+ return isOnToken() ? false : restrictions.hasContains();
+ }
+
public boolean hasOnlyEqualityRestrictions()
{
return isOnToken() ? false : restrictions.hasOnlyEqualityRestrictions();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
index e90319d..82b27dd 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/TokenRestriction.java
@@ -225,6 +225,11 @@ public abstract class TokenRestriction implements PartitionKeyRestrictions
{
return Collections.singletonList(value.bindAndGet(options));
}
+
+ public boolean hasContains()
+ {
+ return false;
+ }
}
public static class SliceRestriction extends TokenRestriction
@@ -237,6 +242,11 @@ public abstract class TokenRestriction implements PartitionKeyRestrictions
slice = TermSlice.newInstance(bound, inclusive, term);
}
+ public boolean hasContains()
+ {
+ return false;
+ }
+
@Override
public boolean hasSlice()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
index 3957305..003258a 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java
@@ -66,7 +66,6 @@ public class SelectOrderedPartitionerTest extends CQLTester
});
}
-
@Test
public void testFilteringOnAllPartitionKeysWithTokenRestriction() throws Throwable
{
@@ -123,6 +122,31 @@ public class SelectOrderedPartitionerTest extends CQLTester
}
@Test
+ public void testTokenAndCollections() throws Throwable
+ {
+ createTable("CREATE TABLE %s (a frozen<map<int, int>>, b int, c int, PRIMARY KEY (a, b))");
+
+ for (int i = 0; i < 10; i++)
+ {
+ execute("INSERT INTO %s (a,b,c) VALUES (?, ?, ?)", map(i, i), i, i);
+ execute("INSERT INTO %s (a,b,c) VALUES (?, ?, ?)", map(i, i, 100, 200), i + 10, i + 10);
+ }
+
+ beforeAndAfterFlush(() -> {
+ assertRows(execute("SELECT * FROM %s WHERE token(a) > token({0: 0}) AND a CONTAINS KEY 9 ALLOW FILTERING"),
+ row(map(9, 9), 9, 9),
+ row(map(9, 9, 100, 200), 19, 19));
+
+ assertRows(execute("SELECT * FROM %s WHERE token(a) > token({0: 0}) AND a CONTAINS KEY 9 AND a CONTAINS 200 ALLOW FILTERING"),
+ row(map(9, 9, 100, 200), 19, 19));
+
+ assertRows(execute("SELECT * FROM %s WHERE token(a) > token({0: 0}) AND a CONTAINS KEY 9 AND b = 19 ALLOW FILTERING"),
+ row(map(9, 9, 100, 200), 19, 19));
+ });
+ }
+
+
+ @Test
public void testTokenFunctionWithSingleColumnPartitionKey() throws Throwable
{
createTable("CREATE TABLE IF NOT EXISTS %s (a int PRIMARY KEY, b text)");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0319c88/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
index 572d903..9a24bd0 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java
@@ -549,8 +549,8 @@ public class SelectTest extends CQLTester
createTable("CREATE TABLE %s (account text, id int, categories map<text,text>, PRIMARY KEY (account, id))");
// create an index on
- createIndex("CREATE INDEX id_index ON %s(id)");
- createIndex("CREATE INDEX categories_values_index ON %s(categories)");
+ createIndex("CREATE INDEX ON %s(id)");
+ createIndex("CREATE INDEX ON %s(categories)");
beforeAndAfterFlush(() -> {
@@ -1373,7 +1373,7 @@ public class SelectTest extends CQLTester
public void testSelectCountPaging() throws Throwable
{
createTable("create table %s (field1 text, field2 timeuuid, field3 boolean, primary key(field1, field2))");
- createIndex("create index test_index on %s (field3)");
+ createIndex("create index on %s (field3)");
execute("insert into %s (field1, field2, field3) values ('hola', now(), false)");
execute("insert into %s (field1, field2, field3) values ('hola', now(), false)");
@@ -2306,8 +2306,9 @@ public class SelectTest extends CQLTester
@Test
public void testIndexQueryWithValueOver64K() throws Throwable
{
- createTable("CREATE TABLE %s (a int, b int, c blob, PRIMARY KEY (a, b))");
- createIndex("CREATE INDEX test ON %s (c)");
+ String tableName = createTable("CREATE TABLE %s (a int, b int, c blob, PRIMARY KEY (a, b))");
+ String idx = tableName + "_c_idx";
+ createIndex("CREATE INDEX " + idx + " ON %s (c)");
execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 0, bytes(1));
execute("INSERT INTO %s (a, b, c) VALUES (?, ?, ?)", 0, 1, bytes(2));
@@ -2315,7 +2316,7 @@ public class SelectTest extends CQLTester
assertInvalidMessage("Index expression values may not be larger than 64K",
"SELECT * FROM %s WHERE c = ? ALLOW FILTERING", TOO_BIG);
- dropIndex("DROP INDEX %s.test");
+ dropIndex("DROP INDEX %s." + idx);
assertEmpty(execute("SELECT * FROM %s WHERE c = ? ALLOW FILTERING", TOO_BIG));
}
@@ -3765,6 +3766,58 @@ public class SelectTest extends CQLTester
}
@Test
+ public void testContainsOnPartitionKey() throws Throwable
+ {
+ testContainsOnPartitionKey("CREATE TABLE %s (pk frozen<map<int, int>>, ck int, v int, PRIMARY KEY (pk, ck))");
+ }
+
+ @Test
+ public void testContainsOnPartitionKeyPart() throws Throwable
+ {
+ testContainsOnPartitionKey("CREATE TABLE %s (pk frozen<map<int, int>>, ck int, v int, PRIMARY KEY ((pk, ck)))");
+ }
+
+ private void testContainsOnPartitionKey(String schema) throws Throwable
+ {
+ createTable(schema);
+
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2), 1, 1);
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2), 2, 2);
+
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2, 3, 4), 1, 3);
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(1, 2, 3, 4), 2, 3);
+
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(5, 6), 5, 5);
+ execute("INSERT INTO %s (pk, ck, v) VALUES (?, ?, ?)", map(7, 8), 6, 6);
+
+ assertInvalidMessage(StatementRestrictions.REQUIRES_ALLOW_FILTERING_MESSAGE,
+ "SELECT * FROM %s WHERE pk CONTAINS KEY 1");
+
+ beforeAndAfterFlush(() -> {
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 ALLOW FILTERING"),
+ row(map(1, 2), 1, 1),
+ row(map(1, 2), 2, 2),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND pk CONTAINS 4 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND pk CONTAINS KEY 3 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND v = 3 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3),
+ row(map(1, 2, 3, 4), 2, 3));
+
+ assertRowsIgnoringOrder(execute("SELECT * FROM %s WHERE pk CONTAINS KEY 1 AND ck = 1 AND v = 3 ALLOW FILTERING"),
+ row(map(1, 2, 3, 4), 1, 3));
+ });
+ }
+
+ @Test
public void filteringWithOrderClause() throws Throwable
{
createTable("CREATE TABLE %s (a int, b int, c int, d list<int>, PRIMARY KEY (a, b, c))");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org