Fix Cassandra incorrect query results when applyFilter repeated

trinodb · Mar 11, 2022 · a8f1d67 · a8f1d67
1 parent fe16de1
commit a8f1d67
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraMetadata.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraMetadata.java
@@ -202,6 +202,10 @@ public ColumnMetadata getColumnMetadata(ConnectorSession session, ConnectorTable
     public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(ConnectorSession session, ConnectorTableHandle tableHandle, Constraint constraint)
     {
         CassandraTableHandle handle = (CassandraTableHandle) tableHandle;
+        if (handle.getPartitions().isPresent() || !handle.getClusteringKeyPredicates().isEmpty()) {
+            // TODO support repeated applyFilter
+            return Optional.empty();
+        }
 
         CassandraPartitionResult partitionResult = partitionManager.getPartitions(handle, constraint.getSummary());
 
@@ -232,6 +236,7 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
                         handle.getSchemaName(),
                         handle.getTableName(),
                         Optional.of(partitionResult.getPartitions()),
+                        // TODO this should probably be AND-ed with handle.getClusteringKeyPredicates()
                         clusteringKeyPredicates),
                         unenforcedConstraint,
                         false));

diff --git a/...in/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java b/...in/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java
@@ -33,6 +33,7 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Predicates.in;
 import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
@@ -53,6 +54,9 @@ public CassandraPartitionManager(CassandraSession cassandraSession)
 
     public CassandraPartitionResult getPartitions(CassandraTableHandle cassandraTableHandle, TupleDomain<ColumnHandle> tupleDomain)
     {
+        // TODO support repeated applyFilter
+        checkArgument(cassandraTableHandle.getPartitions().isEmpty(), "getPartitions() currently does not take into account table handle's partitions");
+
         CassandraTable table = cassandraSession.getTable(cassandraTableHandle.getSchemaTableName());
 
         // fetch the partitions