Add toggle for disabling table properties in predicate pushdown

Author: sopel39

presto-main/src/main/java/io/prestosql/SystemSessionProperties.java

@@ -117,6 +117,7 @@ public final class SystemSessionProperties
     public static final String DEFAULT_FILTER_FACTOR_ENABLED = "default_filter_factor_enabled";
     public static final String UNWRAP_CASTS = "unwrap_casts";
     public static final String SKIP_REDUNDANT_SORT = "skip_redundant_sort";
+    public static final String PREDICATE_PUSHDOWN_USE_TABLE_PROPERTIES = "predicate_pushdown_use_table_properties";
     public static final String WORK_PROCESSOR_PIPELINES = "work_processor_pipelines";
     public static final String ENABLE_DYNAMIC_FILTERING = "enable_dynamic_filtering";
     public static final String QUERY_MAX_MEMORY_PER_NODE = "query_max_memory_per_node";
@@ -506,6 +507,11 @@ public SystemSessionProperties(
                         "Skip redundant sort operations",
                         featuresConfig.isSkipRedundantSort(),
                         false),
+                booleanProperty(
+                        PREDICATE_PUSHDOWN_USE_TABLE_PROPERTIES,
+                        "Use table properties in predicate pushdown",
+                        featuresConfig.isPredicatePushdownUseTableProperties(),
+                        false),
                 booleanProperty(
                         WORK_PROCESSOR_PIPELINES,
                         "Experimental: Use WorkProcessor pipelines",
@@ -921,6 +927,11 @@ public static boolean isSkipRedundantSort(Session session)
         return session.getSystemProperty(SKIP_REDUNDANT_SORT, Boolean.class);
     }
 
+    public static boolean isPredicatePushdownUseTableProperties(Session session)
+    {
+        return session.getSystemProperty(PREDICATE_PUSHDOWN_USE_TABLE_PROPERTIES, Boolean.class);
+    }
+
     public static boolean isWorkProcessorPipelines(Session session)
     {
         return session.getSystemProperty(WORK_PROCESSOR_PIPELINES, Boolean.class);

presto-main/src/main/java/io/prestosql/sql/analyzer/FeaturesConfig.java

@@ -122,6 +122,7 @@ public class FeaturesConfig
     private boolean optimizeTopNRowNumber = true;
     private boolean workProcessorPipelines;
     private boolean skipRedundantSort = true;
+    private boolean predicatePushdownUseTableProperties = true;
 
     private Duration iterativeOptimizerTimeout = new Duration(3, MINUTES); // by default let optimizer wait a long time in case it retrieves some data from ConnectorMetadata
     private boolean enableDynamicFiltering;
@@ -945,4 +946,16 @@ public FeaturesConfig setSkipRedundantSort(boolean value)
         this.skipRedundantSort = value;
         return this;
     }
+
+    public boolean isPredicatePushdownUseTableProperties()
+    {
+        return predicatePushdownUseTableProperties;
+    }
+
+    @Config("optimizer.predicate-pushdown-use-table-properties")
+    public FeaturesConfig setPredicatePushdownUseTableProperties(boolean predicatePushdownUseTableProperties)
+    {
+        this.predicatePushdownUseTableProperties = predicatePushdownUseTableProperties;
+        return this;
+    }
 }

presto-main/src/main/java/io/prestosql/sql/planner/optimizations/PredicatePushDown.java

@@ -79,6 +79,7 @@
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verify;
 import static io.prestosql.SystemSessionProperties.isEnableDynamicFiltering;
+import static io.prestosql.SystemSessionProperties.isPredicatePushdownUseTableProperties;
 import static io.prestosql.sql.DynamicFilters.createDynamicFilterExpression;
 import static io.prestosql.sql.ExpressionUtils.combineConjuncts;
 import static io.prestosql.sql.ExpressionUtils.extractConjuncts;
@@ -97,15 +98,15 @@ public class PredicatePushDown
 {
     private final Metadata metadata;
     private final LiteralEncoder literalEncoder;
-    private final EffectivePredicateExtractor effectivePredicateExtractor;
     private final TypeAnalyzer typeAnalyzer;
+    private final boolean useTableProperties;
 
     public PredicatePushDown(Metadata metadata, TypeAnalyzer typeAnalyzer, boolean useTableProperties)
     {
         this.metadata = requireNonNull(metadata, "metadata is null");
         this.literalEncoder = new LiteralEncoder(metadata);
-        this.effectivePredicateExtractor = new EffectivePredicateExtractor(new DomainTranslator(literalEncoder), metadata, useTableProperties);
         this.typeAnalyzer = requireNonNull(typeAnalyzer, "typeAnalyzer is null");
+        this.useTableProperties = useTableProperties;
     }
 
     @Override
@@ -116,6 +117,10 @@ public PlanNode optimize(PlanNode plan, Session session, TypeProvider types, Sym
         requireNonNull(types, "types is null");
         requireNonNull(idAllocator, "idAllocator is null");
 
+        EffectivePredicateExtractor effectivePredicateExtractor = new EffectivePredicateExtractor(
+                new DomainTranslator(literalEncoder),
+                metadata,
+                useTableProperties && isPredicatePushdownUseTableProperties(session));
         return SimplePlanRewriter.rewriteWith(
                 new Rewriter(symbolAllocator, idAllocator, metadata, literalEncoder, effectivePredicateExtractor, typeAnalyzer, session, types),
                 plan,

presto-main/src/test/java/io/prestosql/sql/analyzer/TestFeaturesConfig.java

@@ -107,6 +107,7 @@ public void testDefaults()
                 .setMaxGroupingSets(2048)
                 .setWorkProcessorPipelines(false)
                 .setSkipRedundantSort(true)
+                .setPredicatePushdownUseTableProperties(true)
                 .setEnableDynamicFiltering(false)
                 .setDynamicFilteringMaxPerDriverRowCount(100)
                 .setDynamicFilteringMaxPerDriverSize(new DataSize(10, KILOBYTE)));
@@ -176,6 +177,7 @@ public void testExplicitPropertyMappings()
                 .put("analyzer.max-grouping-sets", "2047")
                 .put("experimental.work-processor-pipelines", "true")
                 .put("optimizer.skip-redundant-sort", "false")
+                .put("optimizer.predicate-pushdown-use-table-properties", "false")
                 .put("experimental.enable-dynamic-filtering", "true")
                 .put("experimental.dynamic-filtering-max-per-driver-row-count", "256")
                 .put("experimental.dynamic-filtering-max-per-driver-size", "64kB")
@@ -242,6 +244,7 @@ public void testExplicitPropertyMappings()
                 .setDefaultFilterFactorEnabled(true)
                 .setWorkProcessorPipelines(true)
                 .setSkipRedundantSort(false)
+                .setPredicatePushdownUseTableProperties(false)
                 .setEnableDynamicFiltering(true)
                 .setDynamicFilteringMaxPerDriverRowCount(256)
                 .setDynamicFilteringMaxPerDriverSize(new DataSize(64, KILOBYTE));