Hook in the optimizer rules (elastic#52172)

astefan · web-flow · commit 1f90d8cc5605 · 2020-02-12T06:57:43.000+02:00
diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/optimizer/Optimizer.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/optimizer/Optimizer.java
@@ -6,10 +6,18 @@
 
 package org.elasticsearch.xpack.eql.optimizer;
 
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.BooleanLiteralsOnTheRight;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.BooleanSimplification;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.CombineBinaryComparisons;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.ConstantFolding;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.PropagateEquals;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.PruneFilters;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.PruneLiteralsInOrderBy;
+import org.elasticsearch.xpack.ql.optimizer.OptimizerRules.SetAsOptimized;
 import org.elasticsearch.xpack.ql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.ql.rule.RuleExecutor;
 
-import static java.util.Collections.emptyList;
+import java.util.Arrays;
 
 public class Optimizer extends RuleExecutor<LogicalPlan> {
 
@@ -19,6 +27,22 @@ public LogicalPlan optimize(LogicalPlan verified) {
 
     @Override
     protected Iterable<RuleExecutor<LogicalPlan>.Batch> batches() {
-        return emptyList();
+        Batch operators = new Batch("Operator Optimization",
+                new ConstantFolding(),
+                // boolean
+                new BooleanSimplification(),
+                new BooleanLiteralsOnTheRight(),
+                // needs to occur before BinaryComparison combinations
+                new PropagateEquals(),
+                new CombineBinaryComparisons(),
+                // prune/elimination
+                new PruneFilters(),
+                new PruneLiteralsInOrderBy()
+                );
+
+        Batch label = new Batch("Set as Optimized", Limiter.ONCE,
+                new SetAsOptimized());
+
+        return Arrays.asList(operators, label);
     }
 }
