rebased; regular intersections work; pre rollup

Author: normen662

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/AbstractDataAccessRule.java

@@ -983,10 +983,10 @@ private static Ordering orderingFromOrderingParts(final @Nonnull List<MatchedOrd
     protected static boolean isCompatibleComparisonKey(@Nonnull Collection<Value> comparisonKeyValues,
                                                        @Nonnull List<Value> commonPrimaryKeyValues,
                                                        @Nonnull ImmutableSet<Value> equalityBoundKeyValues) {
-        if (comparisonKeyValues.isEmpty()) {
-            // everything is in one row
-            return true;
-        }
+//        if (comparisonKeyValues.isEmpty()) {
+//            // everything is in one row
+//            return true;
+//        }
 
         return commonPrimaryKeyValues
                 .stream()

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/query/plan/cascades/MacroFunctionTest.java

@@ -43,7 +43,7 @@ void testColumnProjection() {
                 Type.Record.Field.of(Type.primitiveType(Type.TypeCode.STRING), Optional.of("name")),
                 Type.Record.Field.of(Type.primitiveType(Type.TypeCode.LONG), Optional.of("id")));
         Type record = Type.Record.fromFields(false, fields);
-        QuantifiedObjectValue param = QuantifiedObjectValue.of(CorrelationIdentifier.uniqueID(), record);
+        QuantifiedObjectValue param = QuantifiedObjectValue.of(CorrelationIdentifier.uniqueId(), record);
         FieldValue bodyValue = FieldValue.ofFieldName(param, "name");
         MacroFunction macroFunction = new MacroFunction("getName", ImmutableList.of(param), bodyValue);
 
@@ -60,8 +60,8 @@ void testAdd() {
         ImmutableList<Type.Record.Field> fields = ImmutableList.of(
                 Type.Record.Field.of(Type.primitiveType(Type.TypeCode.LONG), Optional.of("id")));
         Type record = Type.Record.fromFields(false, fields);
-        QuantifiedObjectValue param1 = QuantifiedObjectValue.of(CorrelationIdentifier.uniqueID(), record);
-        QuantifiedObjectValue param2 = QuantifiedObjectValue.of(CorrelationIdentifier.uniqueID(), record);
+        QuantifiedObjectValue param1 = QuantifiedObjectValue.of(CorrelationIdentifier.uniqueId(), record);
+        QuantifiedObjectValue param2 = QuantifiedObjectValue.of(CorrelationIdentifier.uniqueId(), record);
 
         ArithmeticValue bodyValue = new ArithmeticValue(ArithmeticValue.PhysicalOperator.ADD_LL, param1, param2);
         MacroFunction macroFunction = new MacroFunction("add", ImmutableList.of(param1, param2), bodyValue);

yaml-tests/src/test/java/YamlIntegrationTests.java

@@ -253,4 +253,10 @@ public void recursiveCte(YamlTest.Runner runner) throws Exception {
     public void enumTest(YamlTest.Runner runner) throws Exception {
         runner.runYamsql("enum.yamsql");
     }
+
+    @TestTemplate
+    @MaintainYamlTestConfig(YamlTestConfigFilters.CORRECT_EXPLAIN_AND_METRICS)
+    public void compositeAggregates(YamlTest.Runner runner) throws Exception {
+        runner.runYamsql("composite-aggregates.yamsql");
+    }
 }

yaml-tests/src/test/resources/composite-aggregates.metrics.binpb

@@ -0,0 +1,13 @@
+agg-empty-table-tests:
+-   query: EXPLAIN select sum(col2) / count(col2) from T2 group by col1;
+    explain: 'AISCAN(T2_I6 <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) ∩ AISCAN(T2_I4
+        <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) COMPARE BY (_._0._0) WITH q0,
+        q1 RETURN (q0._0 AS _0, q0._1 AS _1, q1._1 AS _2) | MAP (_._1 / _._2 AS _0)'
+    task_count: 317
+    task_total_time_ms: 11
+    transform_count: 115
+    transform_time_ms: 10
+    transform_yield_count: 51
+    insert_time_ms: 0
+    insert_new_count: 16
+    insert_reused_count: 0

yaml-tests/src/test/resources/composite-aggregates.metrics.yaml

@@ -0,0 +1,57 @@
+#
+# composite-aggregates.yamsql
+#
+# This source file is part of the FoundationDB open source project
+#
+# Copyright 2021-2025 Apple Inc. and the FoundationDB project authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+schema_template:
+    create table t1(id bigint, col1 bigint, col2 bigint, primary key(id))
+    create table t2(id bigint, col1 bigint, col2 bigint, primary key(id))
+    create table t3(id bigint, col1 bigint, col2 bigint, primary key(id))
+    create index t2_i1 as select count(*) from t2
+    create index t2_i2 as select count(*) from t2 group by col1
+    create index t2_i3 as select count(col2) from t2
+    create index t2_i4 as select count(col2) from t2 group by col1
+    create index t2_i5 as select sum(col1) from t2
+    create index t2_i6 as select sum(col2) from t2 group by col1
+    create index t2_i7 as select count(*) from t2 group by col1, col2
+    create index t3_i1 as select col1 from t3
+    create index t3_i2 as select col2 from t3
+
+---
+test_block:
+  name: agg-empty-table-tests
+  preset: single_repetition_ordered
+  tests:
+    #-
+    #  - query: select count(*) from T2 group by col1, col2;
+    #  - explain: "AISCAN(T2_I7 <,> BY_GROUP -> [_0: KEY:[0], _1: KEY:[1], _2: VALUE:[0]]) | MAP (_._2 AS _0)"
+    #  - result: []
+    #-
+    #  - query: select count(*) from T2 group by col2, col1;
+    #  - explain: "AISCAN(T2_I7 <,> BY_GROUP -> [_0: KEY:[0], _1: KEY:[1], _2: VALUE:[0]]) | MAP (_._2 AS _0)"
+    #  - result: []
+    #-
+    #  - query: select count(*) from T2 where col1 = 3 group by col2;
+    #  - explain: "AISCAN(T2_I7 [EQUALS promote(@c11 AS LONG)] BY_GROUP -> [_0: KEY:[0], _1: KEY:[1], _2: VALUE:[0]]) | MAP (_._2 AS _0)"
+    #  - result: []
+    -
+      - query: select sum(col2) / count(col2) from T2 group by col1;
+      - explain: "AISCAN(T2_I6 <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) ∩ AISCAN(T2_I4 <,> BY_GROUP -> [_0: KEY:[0], _1: VALUE:[0]]) COMPARE BY (_._0._0) WITH q0, q1 RETURN (q0._0 AS _0, q0._1 AS _1, q1._1 AS _2) | MAP (_._1 / _._2 AS _0)"
+      - result: []
+...
+