Pulled equiv-experimental into branch

Author: Erik Sargent

src/include/optimizer/rule.h

@@ -114,11 +114,8 @@ struct RuleWithPromise {
 enum class RewriteRuleSetName : uint32_t {
   PREDICATE_PUSH_DOWN = 0,
   UNNEST_SUBQUERY,
-  COMPARATOR_ELIMINATION,
   EQUIVALENT_TRANSFORM,
-  TRANSITIVE_TRANSFORM,
-  BOOLEAN_SHORT_CIRCUIT,
-  NULL_LOOKUP
+  GENERIC_RULES
 };
 
 /**

src/optimizer/rewriter.cpp

@@ -65,12 +65,10 @@ void Rewriter::RewriteLoop(int root_group_id) {
   auto task_stack = std::unique_ptr<OptimizerTaskStackTemplate>(new OptimizerTaskStackTemplate());
   metadata_.SetTaskPool(task_stack.get());
 
-  // Perform rewrite first
-  task_stack->Push(new TopDownRewriteTemplate(root_group_id, root_context, RewriteRuleSetName::BOOLEAN_SHORT_CIRCUIT));
-  task_stack->Push(new BottomUpRewriteTemplate(root_group_id, root_context, RewriteRuleSetName::TRANSITIVE_TRANSFORM, false));
-  task_stack->Push(new BottomUpRewriteTemplate(root_group_id, root_context, RewriteRuleSetName::COMPARATOR_ELIMINATION, false));
+  // Rewrite using all rules (which will be applied based on priority)
+  task_stack->Push(new BottomUpRewriteTemplate(root_group_id, root_context, RewriteRuleSetName::GENERIC_RULES, false));
 
-  task_stack->Push(new BottomUpRewriteTemplate(root_group_id, root_context, RewriteRuleSetName::NULL_LOOKUP, false));
+  // Generate equivalences first
   auto equiv_task = new TopDownRewriteTemplate(root_group_id, root_context, RewriteRuleSetName::EQUIVALENT_TRANSFORM);
   equiv_task->SetReplaceOnTransform(false); // generate equivalent
   task_stack->Push(equiv_task);

src/optimizer/rule.cpp

@@ -67,7 +67,7 @@ RuleSet<AbsExpr_Container,ExpressionType,AbsExpr_Expression>::RuleSet() {
 
   for (auto &pair : comp_elim_pairs) {
     AddRewriteRule(
-      RewriteRuleSetName::COMPARATOR_ELIMINATION,
+      RewriteRuleSetName::GENERIC_RULES,
       new ComparatorElimination(pair.first, pair.second)
     );
   }
@@ -86,14 +86,14 @@ RuleSet<AbsExpr_Container,ExpressionType,AbsExpr_Expression>::RuleSet() {
   }
 
   // Additional rules
-  AddRewriteRule(RewriteRuleSetName::TRANSITIVE_TRANSFORM, new TVEqualityWithTwoCVTransform());
-  AddRewriteRule(RewriteRuleSetName::TRANSITIVE_TRANSFORM, new TransitiveClosureConstantTransform());
+  AddRewriteRule(RewriteRuleSetName::GENERIC_RULES, new TVEqualityWithTwoCVTransform());
+  AddRewriteRule(RewriteRuleSetName::GENERIC_RULES, new TransitiveClosureConstantTransform());
 
-  AddRewriteRule(RewriteRuleSetName::BOOLEAN_SHORT_CIRCUIT, new AndShortCircuit());
-  AddRewriteRule(RewriteRuleSetName::BOOLEAN_SHORT_CIRCUIT, new OrShortCircuit());
+  AddRewriteRule(RewriteRuleSetName::GENERIC_RULES, new AndShortCircuit());
+  AddRewriteRule(RewriteRuleSetName::GENERIC_RULES, new OrShortCircuit());
 
-  AddRewriteRule(RewriteRuleSetName::NULL_LOOKUP, new NullLookupOnNotNullColumn());
-  AddRewriteRule(RewriteRuleSetName::NULL_LOOKUP, new NotNullLookupOnNotNullColumn());
+  AddRewriteRule(RewriteRuleSetName::GENERIC_RULES, new NullLookupOnNotNullColumn());
+  AddRewriteRule(RewriteRuleSetName::GENERIC_RULES, new NotNullLookupOnNotNullColumn());
 }
 
 template <>

src/optimizer/rule_rewrite.cpp

@@ -37,7 +37,7 @@ int ComparatorElimination::Promise(GroupExprTemplate *group_expr,
                                    OptimizeContextTemplate *context) const {
   (void)group_expr;
   (void)context;
-  return static_cast<int>(RulePriority::HIGH);
+  return static_cast<int>(RulePriority::MEDIUM);
 }
 
 bool ComparatorElimination::Check(std::shared_ptr<AbsExpr_Expression> plan,
@@ -202,7 +202,7 @@ TVEqualityWithTwoCVTransform::TVEqualityWithTwoCVTransform() {
 int TVEqualityWithTwoCVTransform::Promise(GroupExprTemplate *group_expr, OptimizeContextTemplate *context) const {
   (void)group_expr;
   (void)context;
-  return static_cast<int>(RulePriority::HIGH);
+  return static_cast<int>(RulePriority::LOW);
 }
 
 bool TVEqualityWithTwoCVTransform::Check(std::shared_ptr<AbsExpr_Expression> plan, OptimizeContextTemplate *context) const {
@@ -312,7 +312,7 @@ TransitiveClosureConstantTransform::TransitiveClosureConstantTransform() {
 int TransitiveClosureConstantTransform::Promise(GroupExprTemplate *group_expr, OptimizeContextTemplate *context) const {
   (void)group_expr;
   (void)context;
-  return static_cast<int>(RulePriority::HIGH);
+  return static_cast<int>(RulePriority::LOW);
 }
 
 bool TransitiveClosureConstantTransform::Check(std::shared_ptr<AbsExpr_Expression> plan, OptimizeContextTemplate *context) const {
@@ -387,6 +387,7 @@ void TransitiveClosureConstantTransform::Transform(std::shared_ptr<AbsExpr_Expre
   } else {
     // At this stage, we have knowledge that A.B = E.F
     new_right_eq->PushChild(r_tv_l);
+    new_right_eq->PushChild(right_val_copy);
   }
 
   // Create new root expression