Second Last Batch of Rules

Author: WKaiZ

src/main/java/org/qed/Backends/Cockroach/CockroachGenerator.java

@@ -58,8 +58,8 @@ public static Seq<RRule> ruleList() {
             for (java.io.File file : files) {
                 String className = file.getName().replace(".java", "");
                 if (className.contains("Distinct") || className.contains("Pull") ||
-                    className.contains("JoinConditionPush") || className.contains("ProjectAggregateMerge") ||
-                    className.contains("AggregativeJoinRemove") || className.contains("AggregateProjectConstantToDummyJoin") || className.contains("AggregateProjectMerge")) {
+                    className.contains("ProjectAggregateMerge") ||
+                    className.contains("AggregativeJoinRemove") || className.contains("AggregateProjectConstantToDummyJoin")) {
                     continue;
                 }
 

src/main/java/org/qed/Backends/Cockroach/CockroachTester.java

@@ -0,0 +1,16 @@
+[AggregateProjectMerge, Normalize]
+(GroupBy
+    (Project
+        $input_0:*
+        $projections_1:*
+        $passthrough_2:*
+    )
+    $aggregations_3:*
+    $groupingPrivate_4:* & (CanRemapGroupingColsThroughProject $groupingPrivate_4 $projections_1 $passthrough_2)
+)
+=>
+(GroupBy
+    $input_0
+    (RemapAggregationsThroughProject $aggregations_3 $projections_1)
+    (RemapGroupingColsThroughProject $groupingPrivate_4 $projections_1 $passthrough_2)
+)

src/main/java/org/qed/Backends/Cockroach/Generated/AggregateProjectMerge.opt

@@ -8,4 +8,4 @@
     ]
 )
 =>
-(ConstructEmptyValues (OutputCols $input_0_0))
+(ConstructEmptyValues (OutputCols $input_0))

src/main/java/org/qed/Backends/Cockroach/Generated/FilterReduceFalse.opt

@@ -0,0 +1,17 @@
+[JoinConditionPush, Normalize]
+(InnerJoin
+    $left_0:* & ^(HasOuterCols $left_0)
+    $right_1:* & ^(HasOuterCols $right_1)
+    $on_2:*
+    $private_3:*
+)
+=>
+(InnerJoin
+    (Select $left_0 (ExtractBoundConditions $on_2 (OutputCols $left_0)))
+    (Select $right_1 (ExtractBoundConditions $on_2 (OutputCols $right_1)))
+    (ExtractUnboundConditions
+        (ExtractUnboundConditions $on_2 (OutputCols $left_0))
+        (OutputCols $right_1)
+    )
+    $private_3
+)

src/main/java/org/qed/Backends/Cockroach/Generated/JoinConditionPush.opt

@@ -1,7 +1,7 @@
 [PruneEmptyFilter, Normalize]
 (Select
     $input_2:* & (HasZeroRows $input_2)
-    $filters_3:*
+    $filters:*
 )
 =>
 $input_2

src/main/java/org/qed/Backends/Cockroach/Generated/PruneEmptyFilter.opt

@@ -5,4 +5,4 @@
     $private_2:*
 )
 =>
-(ConstructEmptyValues (OutputCols $empty_0))
+(ConstructEmptyValues (OutputCols $input_0))

src/main/java/org/qed/Backends/Cockroach/Generated/PruneEmptyMinus.opt

@@ -1,8 +1,8 @@
 [PruneEmptyProject, Normalize]
 (Project
     $input_0:* & (HasZeroRows $input_0)
-    $projections_1:*
-    $passthrough_2:*
+    $projections:*
+    $passthrough:*
 )
 =>
 $input_0