Skip to content

Fix bucket pruning when value is null and the predicate is 'IS NULL'. #14276

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

Merged
rongrong merged 1 commit into from
Mar 24, 2020
Merged

Fix bucket pruning when value is null and the predicate is 'IS NULL'. #14276

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
24 changes: 24 additions & 0 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHiveIntegrationSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,6 +2102,30 @@ public void testBucketPruning()
}
}

@Test
public void testNullBucket()
{
Session session = getSession();
QueryRunner queryRunner = getQueryRunner();
queryRunner.execute("CREATE TABLE table_with_null_buckets WITH (bucket_count=2, bucketed_by = ARRAY['key']) AS " +
"SELECT 10 x, CAST(NULL AS INTEGER) AS key UNION ALL SELECT 20 x, 1 key");

try {
assertQuery(session, "SELECT COUNT() FROM table_with_null_buckets WHERE key IS NULL", "SELECT 1");
assertQuery(session, "SELECT x FROM table_with_null_buckets WHERE key IS NULL", "SELECT 10");
assertQuery(session, "SELECT key FROM table_with_null_buckets WHERE x = 10", "SELECT NULL");
assertQuery(session, "SELECT x FROM table_with_null_buckets WHERE key = 1", "SELECT 20");
assertQuery(session, "SELECT key FROM table_with_null_buckets WHERE key IS NULL AND x = 10", "SELECT NULL");
assertQuery(session, "SELECT COUNT() FROM table_with_null_buckets WHERE key IS NULL AND x = 1", "SELECT 0");
assertQuery(session, "SELECT COUNT() FROM table_with_null_buckets WHERE key = 10", "SELECT 0");
assertQuery(session, "SELECT COUNT() FROM table_with_null_buckets WHERE key IN (NULL, 1)", "SELECT 1");
assertQuery(session, "SELECT COUNT() FROM table_with_null_buckets WHERE key IS NULL OR key = 1", "SELECT 2");
}
finally {
queryRunner.execute("DROP TABLE table_with_null_buckets");
}
}

@Test
public void testWriteSortedTable()
{
Expand Down
9 changes: 7 additions & 2 deletions presto-spi/src/main/java/com/facebook/presto/spi/predicate/TupleDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,14 @@ private static Optional<Set<NullableValue>> extractFixedValueSet(Domain domain)
return Optional.empty();
}

return Optional.of(ranges.stream()
Set<NullableValue> fixedValueSet = ranges.stream()
.map(range -> new NullableValue(domain.getType(), range.getSingleValue()))
.collect(Collectors.toSet()));
.collect(Collectors.toSet());
if (domain.isNullAllowed()) {
fixedValueSet.add(new NullableValue(domain.getType(), null));
}

return Optional.of(fixedValueSet);
}

/**
Expand Down