Skip to content

Intersect pushdown predicates #13505

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
rschlussel merged 1 commit into from
Oct 16, 2019
Merged

Intersect pushdown predicates #13505

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
38 changes: 28 additions & 10 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
import java.util.stream.IntStream;

import static com.facebook.presto.expressions.LogicalRowExpressions.TRUE_CONSTANT;
import static com.facebook.presto.expressions.LogicalRowExpressions.and;
import static com.facebook.presto.hive.HiveAnalyzeProperties.getPartitionList;
import static com.facebook.presto.hive.HiveBasicStatistics.createEmptyStatistics;
import static com.facebook.presto.hive.HiveBasicStatistics.createZeroStatistics;
Expand Down Expand Up @@ -1739,24 +1740,26 @@ public ConnectorPushdownFilterResult pushdownFilter(ConnectorSession session, Co
return new ConnectorPushdownFilterResult(getTableLayout(session, currentLayoutHandle.get()), TRUE_CONSTANT);
}

if (currentLayoutHandle.isPresent()) {
throw new UnsupportedOperationException("Partial filter pushdown is not supported");
}

// Split the filter into 3 groups of conjuncts:
// - range filters that apply to entire columns,
// - range filters that apply to subfields,
// - the rest
ExtractionResult<Subfield> decomposedFilter = rowExpressionService.getDomainTranslator().fromPredicate(
session,
filter,
new SubfieldExtractor(functionResolution, rowExpressionService.getExpressionOptimizer(), session).toColumnExtractor());
// - the rest. Intersect these with possibly pre-existing filters.
ExtractionResult<Subfield> decomposedFilter = rowExpressionService.getDomainTranslator()
.fromPredicate(session, filter, new SubfieldExtractor(functionResolution, rowExpressionService.getExpressionOptimizer(), session).toColumnExtractor());
if (currentLayoutHandle.isPresent()) {
HiveTableLayoutHandle currentHiveLayout = (HiveTableLayoutHandle) currentLayoutHandle.get();
decomposedFilter = intersectExtractionResult(decomposedFilter, new ExtractionResult(currentHiveLayout.getDomainPredicate(), currentHiveLayout.getRemainingPredicate()));
}
Copy link
Copy Markdown

@highker highker Oct 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put an empty line after this.


Map<String, ColumnHandle> columnHandles = getColumnHandles(session, tableHandle);
TupleDomain<ColumnHandle> entireColumnDomain = decomposedFilter.getTupleDomain()
.transform(subfield -> isEntireColumn(subfield) ? subfield.getRootName() : null)
.transform(columnHandles::get);
// TODO Extract deterministic conjuncts that apply to partition columns and specify these as Contraint#predicate
if (currentLayoutHandle.isPresent()) {
entireColumnDomain = entireColumnDomain.intersect(((HiveTableLayoutHandle) (currentLayoutHandle.get())).getPartitionColumnPredicate());
}
Copy link
Copy Markdown

@highker highker Oct 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put an empty line after this.


// TODO Extract deterministic conjuncts that apply to partition columns and specify these as Constraint#predicate
HivePartitionResult hivePartitionResult = partitionManager.getPartitions(metastore, tableHandle, new Constraint<>(entireColumnDomain), session);

TupleDomain<Subfield> domainPredicate = withColumnDomains(ImmutableMap.<Subfield, Domain>builder()
Expand Down Expand Up @@ -1804,6 +1807,21 @@ public ConnectorPushdownFilterResult pushdownFilter(ConnectorSession session, Co
TRUE_CONSTANT);
}

private static ExtractionResult intersectExtractionResult(ExtractionResult left, ExtractionResult right)
{
RowExpression newRemainingExpression;
if (right.getRemainingExpression().equals(TRUE_CONSTANT)) {
newRemainingExpression = left.getRemainingExpression();
}
else if (left.getRemainingExpression().equals(TRUE_CONSTANT)) {
newRemainingExpression = right.getRemainingExpression();
}
else {
newRemainingExpression = and(left.getRemainingExpression(), right.getRemainingExpression());
}
return new ExtractionResult(left.getTupleDomain().intersect(right.getTupleDomain()), newRemainingExpression);
}

private String createTableLayoutString(
ConnectorSession session,
SchemaTableName tableName,
Expand Down
13 changes: 13 additions & 0 deletions presto-hive/src/test/java/com/facebook/presto/hive/TestHivePushdownFilterQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,19 @@ public void testFilterFunctions()
assertFilterProject("nested_keys[1][5] > 0 AND orderkey % 5 > 10", "keys");
}

@Test
public void testPushdownComposition()
{
// Tests composing two pushdowns each with a range filter and filter function.
assertQuery(
"WITH data AS (" +
" SELECT l.suppkey, l.linenumber, l.shipmode, MAX(o.orderdate)" +
" FROM lineitem l, orders o WHERE" +
" o.orderkey = l.orderkey AND linenumber IN (2, 3, 4, 6) AND shipmode LIKE '%AIR%'" +
" GROUP BY l.suppkey, l.linenumber, l.shipmode)" +
"SELECT COUNT(*) FROM data WHERE suppkey BETWEEN 10 AND 30 AND shipmode LIKE '%REG%'");
}

@Test
public void testPartitionColumns()
{
Expand Down