fixups after rebasing

normen662 · normen662 · commit 5fde97b022f1 · 2025-07-09T17:49:28.000+01:00
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/AggregateIndexMatchCandidate.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/AggregateIndexMatchCandidate.java
@@ -434,7 +434,7 @@ public RecordQueryPlan toEquivalentPlan(@Nonnull final PartialMatch partialMatch
             //
             // We need to perform a roll up.
             //
-            final var aggregateIndexScanReference = memoizer.memoizePlans(plan);
+            final var aggregateIndexScanReference = memoizer.memoizePlan(plan);
             final var aggregateIndexScanAlias = Quantifier.uniqueId();
 
             //final var recordValues = Values.deconstructRecord(recordValue);
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/MatchInfo.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/MatchInfo.java
@@ -531,7 +531,7 @@ private static ImmutableBiMap<Value, Value> pullUpMatchedValueMap(@Nonnull final
 
                 final var candidateAggregateValue = entry.getValue();
                 final var candidateLowerExpression =
-                        Iterables.getOnlyElement(partialMatch.getCandidateRef().getMembers());
+                        Iterables.getOnlyElement(partialMatch.getCandidateRef().getAllMemberExpressions());
                 final var candidateLowerResultValue = candidateLowerExpression.getResultValue();
                 final var candidatePullUpMap =
                         candidateLowerResultValue.pullUp(ImmutableList.of(candidateAggregateValue),
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/PlanningRuleSet.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/PlanningRuleSet.java
@@ -24,9 +24,7 @@
 import com.apple.foundationdb.annotation.SpotBugsSuppressWarnings;
 import com.apple.foundationdb.record.query.plan.cascades.expressions.RelationalExpression;
 import com.apple.foundationdb.record.query.plan.cascades.rules.AdjustMatchRule;
-import com.apple.foundationdb.record.query.plan.cascades.rules.DataAccessRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.AggregateDataAccessRule;
-import com.apple.foundationdb.record.query.plan.cascades.rules.CombineFilterRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.WithPrimaryKeyDataAccessRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementDeleteRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementDistinctRule;
@@ -43,7 +41,6 @@
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementStreamingAggregationRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementTableFunctionRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementTempTableInsertRule;
-import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementTempTableInsertRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementTempTableScanRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementTypeFilterRule;
 import com.apple.foundationdb.record.query.plan.cascades.rules.ImplementUniqueRule;
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/properties/CardinalitiesProperty.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/properties/CardinalitiesProperty.java
@@ -80,6 +80,7 @@
 import com.apple.foundationdb.record.query.plan.plans.RecordQueryIntersectionOnValuesPlan;
 import com.apple.foundationdb.record.query.plan.plans.RecordQueryLoadByKeysPlan;
 import com.apple.foundationdb.record.query.plan.plans.RecordQueryMapPlan;
+import com.apple.foundationdb.record.query.plan.plans.RecordQueryMultiIntersectionOnValuesPlan;
 import com.apple.foundationdb.record.query.plan.plans.RecordQueryPredicatesFilterPlan;
 import com.apple.foundationdb.record.query.plan.plans.RecordQueryRangePlan;
 import com.apple.foundationdb.record.query.plan.plans.RecordQueryRecursiveUnionPlan;
@@ -440,12 +441,12 @@ public Cardinalities visitRecordQueryInUnionPlan(@Nonnull final RecordQueryInUni
         }
 
         @Nonnull
-    @Override
-    public Cardinalities visitRecordQueryMultiIntersectionOnValuesPlan(@Nonnull final RecordQueryMultiIntersectionOnValuesPlan recordQueryMultiIntersectionOnValuesPlan) {
-        return intersectCardinalities(fromChildren(recordQueryMultiIntersectionOnValuesPlan));
-    }
+        @Override
+        public Cardinalities visitRecordQueryMultiIntersectionOnValuesPlan(@Nonnull final RecordQueryMultiIntersectionOnValuesPlan recordQueryMultiIntersectionOnValuesPlan) {
+            return intersectCardinalities(fromChildren(recordQueryMultiIntersectionOnValuesPlan));
+        }
 
-    @Nonnull
+        @Nonnull
         @Override
         public Cardinalities visitRecordQueryInParameterJoinPlan(@Nonnull final RecordQueryInParameterJoinPlan element) {
             return Cardinalities.unknownMaxCardinality();
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/properties/DerivationsProperty.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/properties/DerivationsProperty.java
@@ -30,10 +30,8 @@
 import com.apple.foundationdb.record.query.plan.cascades.AliasMap;
 import com.apple.foundationdb.record.query.plan.cascades.ExpressionProperty;
 import com.apple.foundationdb.record.query.plan.cascades.Reference;
-import com.apple.foundationdb.record.query.plan.cascades.PlanProperty;
 import com.apple.foundationdb.record.query.plan.cascades.Quantifier;
 import com.apple.foundationdb.record.query.plan.cascades.expressions.RelationalExpressionVisitor;
-import com.apple.foundationdb.record.query.plan.cascades.Reference;
 import com.apple.foundationdb.record.query.plan.cascades.TreeLike;
 import com.apple.foundationdb.record.query.plan.cascades.expressions.RelationalExpression;
 import com.apple.foundationdb.record.query.plan.cascades.predicates.PredicateWithComparisons;
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/AbstractDataAccessRule.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/AbstractDataAccessRule.java
@@ -146,7 +146,8 @@ public void onMatch(@Nonnull final CascadesRuleCall call) {
         //
         // return if there is no pre-determined interesting ordering
         //
-        final var requestedOrderingsOptional = call.getPlannerConstraint(RequestedOrderingConstraint.REQUESTED_ORDERING);
+        final var requestedOrderingsOptional =
+                call.getPlannerConstraintMaybe(RequestedOrderingConstraint.REQUESTED_ORDERING);
         if (requestedOrderingsOptional.isEmpty()) {
             return;
         }
@@ -219,7 +220,7 @@ public void onMatch(@Nonnull final CascadesRuleCall call) {
                         dataAccessForMatchPartition(call,
                                 requestedOrderings,
                                 matchPartition);
-                call.yieldExpression(dataAccessExpressions);
+                call.yieldMixedUnknownExpressions(dataAccessExpressions);
             }
         }
     }
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/AggregateDataAccessRule.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/AggregateDataAccessRule.java
@@ -209,7 +209,7 @@ protected IntersectionResult createIntersectionAndCompensation(@Nonnull final Me
                         final var singleMatchedAccess = singleMatchedAccessWithIndex.getElement();
                         final var plan = Objects.requireNonNull(matchToPlanMap.get(
                                 singleMatchedAccess.getPartialMatch()));
-                        final var reference = memoizer.memoizePlans(plan);
+                        final var reference = memoizer.memoizePlan(plan);
                         newQuantifiersBuilder.add(Quantifier.physical(reference));
                         candidateTopAliasesBuilder.add(singleMatchedAccess.getCandidateTopAlias());
                     }
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/WithPrimaryKeyDataAccessRule.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/cascades/rules/WithPrimaryKeyDataAccessRule.java
@@ -173,7 +173,7 @@ protected IntersectionResult createIntersectionAndCompensation(@Nonnull final Me
                                     .stream()
                                     .map(pair ->
                                             Objects.requireNonNull(matchToPlanMap.get(pair.getElement().getPartialMatch())))
-                                    .map(memoizer::memoizePlans)
+                                    .map(memoizer::memoizePlan)
                                     .map(Quantifier::physical)
                                     .collect(ImmutableList.toImmutableList());
 
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryAggregateIndexPlan.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryAggregateIndexPlan.java
@@ -54,7 +54,6 @@
 import com.apple.foundationdb.record.query.plan.cascades.typing.TypeRepository;
 import com.apple.foundationdb.record.query.plan.cascades.values.Value;
 import com.apple.foundationdb.record.query.plan.cascades.values.translation.TranslationMap;
-import com.apple.foundationdb.record.query.plan.explain.ExplainPlanVisitor;
 import com.google.auto.service.AutoService;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryIndexPlan.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryIndexPlan.java
@@ -61,7 +61,6 @@
 import com.apple.foundationdb.record.provider.foundationdb.UnsupportedRemoteFetchIndexException;
 import com.apple.foundationdb.record.query.plan.AvailableFields;
 import com.apple.foundationdb.record.query.plan.cascades.AggregateIndexMatchCandidate;
-import com.apple.foundationdb.record.query.plan.explain.ExplainPlanVisitor;
 import com.apple.foundationdb.record.query.plan.QueryPlanConstraint;
 import com.apple.foundationdb.record.query.plan.ScanComparisons;
 import com.apple.foundationdb.record.query.plan.cascades.AliasMap;
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryIntersectionPlan.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryIntersectionPlan.java
@@ -50,7 +50,6 @@
 import com.apple.foundationdb.record.query.plan.cascades.expressions.RelationalExpression;
 import com.apple.foundationdb.record.query.plan.cascades.explain.ExplainPlanVisitor;
 import com.apple.foundationdb.record.query.plan.cascades.values.Value;
-import com.apple.foundationdb.record.query.plan.explain.ExplainPlanVisitor;
 import com.google.common.base.Suppliers;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryMultiIntersectionOnValuesPlan.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/plan/plans/RecordQueryMultiIntersectionOnValuesPlan.java
@@ -32,7 +32,7 @@
 import com.apple.foundationdb.record.provider.foundationdb.FDBRecordStoreBase;
 import com.apple.foundationdb.record.provider.foundationdb.cursors.IntersectionMultiCursor;
 import com.apple.foundationdb.record.query.plan.cascades.CorrelationIdentifier;
-import com.apple.foundationdb.record.query.plan.cascades.Memoizer;
+import com.apple.foundationdb.record.query.plan.cascades.FinalMemoizer;
 import com.apple.foundationdb.record.query.plan.cascades.OrderingPart.ProvidedOrderingPart;
 import com.apple.foundationdb.record.query.plan.cascades.Quantifier;
 import com.apple.foundationdb.record.query.plan.cascades.Quantifiers;
@@ -200,7 +200,7 @@ public RecordQueryMultiIntersectionOnValuesPlan withChildrenReferences(@Nonnull
     }
 
     @Override
-    public RecordQueryMultiIntersectionOnValuesPlan strictlySorted(@Nonnull final Memoizer memoizer) {
+    public RecordQueryMultiIntersectionOnValuesPlan strictlySorted(@Nonnull final FinalMemoizer finalMemoizer) {
         return this;
     }
 
diff --git a/fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/query/TempTableTest.java b/fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/query/TempTableTest.java
@@ -87,7 +87,7 @@ void scanTempTableWithPredicateWorksCorrectly() throws Exception {
         try (FDBRecordContext context = openContext()) {
             final var tempTable = tempTableInstance();
             addSampleDataToTempTable(tempTable);
-            final var tempTableId = CorrelationIdentifier.uniqueID();
+            final var tempTableId = CorrelationIdentifier.uniqueId();
             final var tempTableScanQun = Quantifier.forEach(Reference.initialOf(TempTableScanExpression.ofCorrelated(tempTableId, getTempTableType())));
             final var selectExpressionBuilder = GraphExpansion.builder()
                     .addAllResultColumns(ImmutableList.of(getIdCol(tempTableScanQun), getValueCol(tempTableScanQun)))
@@ -132,7 +132,7 @@ void insertIntoTempTableWorksCorrectly() throws Exception {
     }
 
     @DualPlannerTest(planner = DualPlannerTest.Planner.CASCADES)
-    void insertIntoTempTableWorksCorrectlyAcrossContinuations() throws Exception {
+    void insertIntoTempTableWorksCorrectlyAcrossContinuations() {
         // insert into <tempTable> values ((1, 'first'), stop, resume, then insert (2, 'second'))
         byte[] continuation = null;
         RecordQueryPlan planToResume = null;

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,8 @@ public void onMatch(@Nonnull final CascadesRuleCall call) {`
`146`	`146`	`//`
`147`	`147`	`// return if there is no pre-determined interesting ordering`
`148`	`148`	`//`
`149`		`- final var requestedOrderingsOptional = call.getPlannerConstraint(RequestedOrderingConstraint.REQUESTED_ORDERING);`
	`149`	`+ final var requestedOrderingsOptional =`
	`150`	`+ call.getPlannerConstraintMaybe(RequestedOrderingConstraint.REQUESTED_ORDERING);`
`150`	`151`	`if (requestedOrderingsOptional.isEmpty()) {`
`151`	`152`	`return;`
`152`	`153`	`}`
`@@ -219,7 +220,7 @@ public void onMatch(@Nonnull final CascadesRuleCall call) {`
`219`	`220`	`dataAccessForMatchPartition(call,`
`220`	`221`	`requestedOrderings,`
`221`	`222`	`matchPartition);`
`222`		`- call.yieldExpression(dataAccessExpressions);`
	`223`	`+ call.yieldMixedUnknownExpressions(dataAccessExpressions);`
`223`	`224`	`}`
`224`	`225`	`}`
`225`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ protected IntersectionResult createIntersectionAndCompensation(@Nonnull final Me`
`209`	`209`	`final var singleMatchedAccess = singleMatchedAccessWithIndex.getElement();`
`210`	`210`	`final var plan = Objects.requireNonNull(matchToPlanMap.get(`
`211`	`211`	`singleMatchedAccess.getPartialMatch()));`
`212`		`- final var reference = memoizer.memoizePlans(plan);`
	`212`	`+ final var reference = memoizer.memoizePlan(plan);`
`213`	`213`	`newQuantifiersBuilder.add(Quantifier.physical(reference));`
`214`	`214`	`candidateTopAliasesBuilder.add(singleMatchedAccess.getCandidateTopAlias());`
`215`	`215`	`}`