Fix for Some Rules

pom.xml

@@ -51,8 +51,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>23</source>
-                    <target>23</target>
+                    <source>25</source>
+                    <target>25</target>
                     <compilerArgs>
                         <arg>--enable-preview</arg>
                     </compilerArgs>

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

@@ -57,7 +57,9 @@ public static Seq<RRule> ruleList() {
         if (files != null) {
             for (java.io.File file : files) {
                 String className = file.getName().replace(".java", "");
-                if (className.contains("Distinct") || className.contains("Extract") || className.contains("Pull") || className.contains("False") || className.contains("Prune") || className.contains("Minus") || className.contains("AggregateMerge")) {
+                if (className.contains("Distinct") || className.contains("Pull") ||
+                    className.contains("ProjectAggregateMerge") ||
+                    className.contains("AggregativeJoinRemove") || className.contains("AggregateProjectConstantToDummyJoin")) {
                     continue;
                 }
 

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

@@ -0,0 +1,19 @@
+[AggregateExtractProject, Normalize]
+(GroupBy
+    $input_5:*
+    $aggregations_6:*
+    $groupingPrivate_7:*
+)
+=>
+(GroupBy
+    (Project
+        $input_5
+        []
+        (UnionCols
+            (GroupingCols $groupingPrivate_7)
+            (AggregationOuterCols $aggregations_6)
+        )
+    )
+    $aggregations_6
+    $groupingPrivate_7
+)

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

@@ -0,0 +1,54 @@
+[AggregateJoinJoinRemove, Normalize]
+(DistinctOn
+    $topJoin_0:(LeftJoin
+        $bottomJoin_1:(LeftJoin $left_2:* $middle_3:* * *) &
+            (JoinPreservesLeftRows $bottomJoin_1) &
+            (JoinDoesNotDuplicateLeftRows $bottomJoin_1)
+        $right_4:*
+        $topOn_5:*
+        $topPrivate_6:*
+    ) &
+        (JoinPreservesLeftRows $topJoin_0) &
+        (JoinDoesNotDuplicateLeftRows $topJoin_0)
+    $aggregations_7:[]
+    $groupingPrivate_8:(GroupingPrivate $groupingCols_9:* $ordering_10:*) &
+        (ColsAreSubset
+            (UnionCols
+                $groupingCols_9
+                (AggregationOuterCols $aggregations_7)
+            )
+            (UnionCols
+                (OutputCols $left_2)
+                (OutputCols $right_4)
+            )
+        ) &
+        ^(ColsIntersect
+            (UnionCols
+                $groupingCols_9
+                (AggregationOuterCols $aggregations_7)
+            )
+            (OutputCols $middle_3)
+        ) &
+        (OrderingCanProjectCols
+            $ordering_10
+            (UnionCols
+                (OutputCols $left_2)
+                (OutputCols $right_4)
+            )
+        )
+)
+=>
+(DistinctOn
+    (LeftJoin $left_2 $right_4 $topOn_5 $topPrivate_6)
+    $aggregations_7
+    (MakeGrouping
+        $groupingCols_9
+        (PruneOrdering
+            $ordering_10
+            (UnionCols
+                (OutputCols $left_2)
+                (OutputCols $right_4)
+            )
+        )
+    )
+)

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

@@ -0,0 +1,28 @@
+[AggregateJoinRemove, Normalize]
+(DistinctOn
+    $input_0:(LeftJoin $left_1:* * * *) &
+        (JoinPreservesLeftRows $input_0) &
+        (JoinDoesNotDuplicateLeftRows $input_0)
+    $aggregations_2:[]
+    $groupingPrivate_3:(GroupingPrivate $groupingCols_4:* $ordering_5:*) &
+        (ColsAreSubset
+            (UnionCols
+                $groupingCols_4
+                (AggregationOuterCols $aggregations_2)
+            )
+            (OutputCols $left_1)
+        ) &
+        (OrderingCanProjectCols
+            $ordering_5
+            (OutputCols $left_1)
+        )
+)
+=>
+(DistinctOn
+    $left_1
+    $aggregations_2
+    (MakeGrouping
+        $groupingCols_4
+        (PruneOrdering $ordering_5 (OutputCols $left_1))
+    )
+)

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

@@ -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/FilterReduceFalse.opt

@@ -0,0 +1,11 @@
+[FilterReduceFalse, Normalize]
+(Select
+    $input_0:*
+    $on_1:[
+        ...
+        $item_2:(FiltersItem (False))
+        ...
+    ]
+)
+=>
+(ConstructEmptyValues (OutputCols $input_0))

src/main/java/org/qed/Backends/Cockroach/Generated/JoinConditionPush.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/JoinExtractFilter.opt

@@ -0,0 +1,17 @@
+[JoinExtractFilter, Normalize]
+(InnerJoin
+    $input_0:*
+    $input_1:*
+    $cond_2:*
+    $private_3:*
+)
+=>
+(Select
+    (InnerJoin
+    $input_0
+    $input_1
+    $true
+    $private_3
+)
+    $cond_2
+)

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

@@ -0,0 +1,18 @@
+[JoinReduceFalse, Normalize]
+(InnerJoin
+    $input_0:*
+    $input_1:*
+    $on_2:[
+        ...
+        $item_3:(FiltersItem (False))
+        ...
+    ]
+    $private_4:*
+)
+=>
+(InnerJoin
+    $input_0
+    $input_1
+    [ (FiltersItem (False)) ]
+    $private_4
+)

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

@@ -0,0 +1,18 @@
+[JoinReduceTrue, Normalize]
+(InnerJoin
+    $input_0:*
+    $input_1:*
+    $on_2:[
+        ...
+        $item_3:(FiltersItem (True))
+        ...
+    ]
+    $private_4:*
+)
+=>
+(InnerJoin
+    $input_0
+    $input_1
+    (RemoveFiltersItem $on_2 $item_3)
+    $private_4
+)

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

@@ -0,0 +1,20 @@
+[MinusMerge, Normalize]
+(Except
+    (Except
+        $left_0:*
+        $rightB_1:*
+        $pInner_2:*
+    )
+    $rightC_3:*
+    $pOuter_4:*
+)
+=>
+(Except
+    $left_0
+    (Union
+        $rightB_1
+        $rightC_3
+        (MakeUnionPrivateForExcept $pInner_2 $pOuter_4)
+    )
+    $pOuter_4
+)

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

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

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

@@ -0,0 +1,7 @@
+[PruneEmptyIntersect, Normalize]
+(Intersect
+    $left_0:*
+    $right_1:* & (HasZeroRows $right_1)
+)
+=>
+(ConstructEmptyValues (OutputCols $left_0))

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

@@ -0,0 +1,8 @@
+[PruneEmptyMinus, Normalize]
+(Except
+    $empty_0:(Values)
+    $input_1:*
+    $private_2:*
+)
+=>
+(ConstructEmptyValues (OutputCols $input_0))

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

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

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

@@ -0,0 +1,7 @@
+[PruneEmptyUnion, Normalize]
+(Union
+    $left_0:* & (HasZeroRows $left_0)
+    $right_1:* & (HasZeroRows $right_1)
+)
+=>
+(ConstructEmptyValues (OutputCols $left_0))