Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add check for used Cassandra partition columns #11082

Merged
merged 1 commit into from
Feb 21, 2022
Merged

Add check for used Cassandra partition columns #11082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions ...in/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraPartitionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;

import static com.google.common.base.Predicates.in;
import static com.google.common.base.Predicates.not;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;

Expand All @@ -51,7 +54,6 @@ public CassandraPartitionManager(CassandraSession cassandraSession)
public CassandraPartitionResult getPartitions(CassandraTableHandle cassandraTableHandle, TupleDomain<ColumnHandle> tupleDomain)
{
CassandraTable table = cassandraSession.getTable(cassandraTableHandle.getSchemaTableName());
List<CassandraColumnHandle> partitionKeys = table.getPartitionKeyColumns();

// fetch the partitions
List<CassandraPartition> allPartitions = getCassandraPartitions(table, tupleDomain);
Expand All @@ -69,8 +71,14 @@ public CassandraPartitionResult getPartitions(CassandraTableHandle cassandraTabl
remainingTupleDomain = tupleDomain;
}
else {
List<ColumnHandle> partitionColumns = ImmutableList.copyOf(partitionKeys);
remainingTupleDomain = tupleDomain.filter((column, domain) -> !partitionColumns.contains(column));
Set<ColumnHandle> usedPartitionColumns = partitions.stream()
.flatMap(partition -> Optional.ofNullable(partition.getTupleDomain())
.flatMap(partitionTupleDomain -> partitionTupleDomain.getDomains()
.map(Map::keySet)
.map(Set::stream))
.orElse(Stream.empty()))
.collect(toImmutableSet());
remainingTupleDomain = tupleDomain.filter((column, domain) -> !usedPartitionColumns.contains(column));
}
}

Expand Down
15 changes: 15 additions & 0 deletions ...n/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,21 @@ public void testPushdownAllTypesPartitionKeyPredicate()
assertEquals(result.getRowCount(), 1);
}

@Test
public void testPartitionPushdownsWithNotMatchingPredicate()
throws Exception
{
String table = "partition_not_pushed_down_keys";
session.execute(format("DROP TABLE IF EXISTS %s.%s", KEYSPACE, table));
session.execute(format("CREATE TABLE %s.%s ( id varchar, trino_filter_col int, PRIMARY KEY (id))", KEYSPACE, table));
session.execute(format("INSERT INTO %s.%s(id, trino_filter_col) VALUES ('2', 0)", KEYSPACE, table));
server.refreshSizeEstimates(KEYSPACE, table);

String sql = "SELECT 1 FROM " + table + " WHERE id = '1' AND trino_filter_col = 0";

assertThat(execute(sql).getMaterializedRows().size()).isEqualTo(0);
}

@Test
public void testPartitionKeyPredicate()
{
Expand Down