Simplify building of DynamicFilterEvaluator in DynamicPageFilter

Author: raunaqmorarka

core/trino-main/src/main/java/io/trino/sql/gen/columnar/DynamicPageFilter.java

@@ -106,29 +106,31 @@ public synchronized Supplier<FilterEvaluator> createDynamicPageFilterEvaluator(C
         if (compiledDynamicFilter == null || isBlocked.isDone()) {
             isBlocked = dynamicFilter.isBlocked();
             boolean isAwaitable = dynamicFilter.isAwaitable();
-            TupleDomain<Symbol> currentPredicate = dynamicFilter.getCurrentPredicate().transformKeys(columnHandles::get);
-            List<Expression> expressionConjuncts = domainTranslator.toPredicateConjuncts(currentPredicate)
-                    .stream()
-                    // Run the expression derived from TupleDomain through IR optimizer to simplify predicates. E.g. SimplifyContinuousInValues
-                    .map(expression -> irExpressionOptimizer.process(expression, session, ImmutableMap.of()).orElse(expression))
-                    .collect(toImmutableList());
-            // We translate each conjunct into separate RowExpression to make it easy to profile selectivity
-            // of dynamic filter per column and drop them if they're ineffective
-            List<RowExpression> rowExpression = expressionConjuncts.stream()
-                    .map(expression -> translate(expression, sourceLayout, metadata, typeManager))
-                    .collect(toImmutableList());
-            compiledDynamicFilter = createDynamicFilterEvaluator(rowExpression, compiler, selectivityThreshold);
+            compiledDynamicFilter = createDynamicFilterEvaluator(compiler, dynamicFilter.getCurrentPredicate());
             if (!isAwaitable) {
                 isBlocked = null; // Dynamic filter will not narrow down anymore
             }
         }
         return compiledDynamicFilter;
     }
 
-    private static Supplier<FilterEvaluator> createDynamicFilterEvaluator(List<RowExpression> rowExpressions, ColumnarFilterCompiler compiler, double selectivityThreshold)
+    private Supplier<FilterEvaluator> createDynamicFilterEvaluator(ColumnarFilterCompiler compiler, TupleDomain<ColumnHandle> currentPredicate)
     {
-        List<Supplier<FilterEvaluator>> subExpressionEvaluators = rowExpressions.stream()
-                .map(expression -> createColumnarFilterEvaluator(expression, compiler))
+        if (currentPredicate.isNone()) {
+            return SelectNoneEvaluator::new;
+        }
+        // We translate each conjunct into separate FilterEvaluator to make it easy to profile selectivity
+        // of dynamic filter per column and drop them if they're ineffective
+        List<Supplier<FilterEvaluator>> subExpressionEvaluators = currentPredicate.getDomains().orElseThrow()
+                .entrySet().stream()
+                .map(entry -> {
+                    Symbol symbol = columnHandles.get(entry.getKey());
+                    Expression expression = domainTranslator.toPredicate(entry.getValue(), symbol.toSymbolReference());
+                    // Run the expression derived from TupleDomain through IR optimizer to simplify predicates. E.g. SimplifyContinuousInValues
+                    expression = irExpressionOptimizer.process(expression, session, ImmutableMap.of()).orElse(expression);
+                    RowExpression rowExpression = translate(expression, sourceLayout, metadata, typeManager);
+                    return createColumnarFilterEvaluator(rowExpression, compiler);
+                })
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(toImmutableList());

core/trino-main/src/main/java/io/trino/sql/planner/DomainTranslator.java

@@ -119,7 +119,7 @@ public Expression toPredicate(TupleDomain<Symbol> tupleDomain)
         return IrUtils.combineConjuncts(toPredicateConjuncts(tupleDomain));
     }
 
-    public List<Expression> toPredicateConjuncts(TupleDomain<Symbol> tupleDomain)
+    private List<Expression> toPredicateConjuncts(TupleDomain<Symbol> tupleDomain)
     {
         if (tupleDomain.isNone()) {
             return ImmutableList.of(FALSE);
@@ -132,7 +132,7 @@ public List<Expression> toPredicateConjuncts(TupleDomain<Symbol> tupleDomain)
                 .collect(toImmutableList());
     }
 
-    private Expression toPredicate(Domain domain, Reference reference)
+    public Expression toPredicate(Domain domain, Reference reference)
     {
         if (domain.getValues().isNone()) {
             return domain.isNullAllowed() ? new IsNull(reference) : FALSE;