Extract table predicates during planning

Author: sopel39

presto-main/src/main/java/io/prestosql/sql/planner/PlanOptimizers.java

@@ -275,7 +275,7 @@ public PlanOptimizers(
                         .addAll(new CanonicalizeExpressions(metadata, typeAnalyzer).rules())
                         .build());
 
-        PlanOptimizer predicatePushDown = new StatsRecordingPlanOptimizer(optimizerStats, new PredicatePushDown(metadata, typeAnalyzer, false));
+        PlanOptimizer predicatePushDown = new StatsRecordingPlanOptimizer(optimizerStats, new PredicatePushDown(metadata, typeAnalyzer, true));
 
         builder.add(
                 // Clean up all the sugar in expressions, e.g. AtTimeZone, must be run before all the other optimizers
@@ -399,7 +399,9 @@ public PlanOptimizers(
                                 new TransformCorrelatedSingleRowSubqueryToProject(),
                                 new RemoveAggregationInSemiJoin())),
                 new CheckSubqueryNodesAreRewritten(),
-                predicatePushDown,
+                new StatsRecordingPlanOptimizer(
+                        optimizerStats,
+                        new PredicatePushDown(metadata, typeAnalyzer, false)),
                 new IterativeOptimizer(
                         ruleStats,
                         statsCalculator,

presto-main/src/test/java/io/prestosql/sql/planner/TestPredicatePushdown.java

@@ -503,4 +503,22 @@ public void testRemovesRedundantTableScanPredicate()
                                 anyTree(
                                         values("COL")))));
     }
+
+    @Test
+    public void testTablePredicateIsExtracted()
+    {
+        assertPlan(
+                "SELECT * FROM orders, nation WHERE orderstatus = CAST(nation.name AS varchar(1)) AND orderstatus BETWEEN 'A' AND 'O'",
+                anyTree(
+                        node(JoinNode.class,
+                                anyTree(
+                                        tableScan(
+                                                "orders",
+                                                ImmutableMap.of("ORDERSTATUS", "orderstatus"))),
+                                anyTree(
+                                        filter("CAST(NAME AS varchar(1)) IN ('F', 'O')",
+                                                tableScan(
+                                                        "nation",
+                                                        ImmutableMap.of("NAME", "name")))))));
+    }
 }