intersection complete

Author: normen662

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

@@ -55,7 +55,7 @@ public static AggregateMappings empty() {
     }
 
     @Nonnull
-    public static AggregateMappings of(@Nonnull final BiMap<Value, Value> matchedAggregateMap,
+    public static AggregateMappings of(@Nonnull final Map<Value, Value> matchedAggregateMap,
                                        @Nonnull final BiMap<CorrelationIdentifier, Value> unmatchedAggregateMap) {
         return new AggregateMappings(ImmutableMap.copyOf(matchedAggregateMap), ImmutableBiMap.copyOf(unmatchedAggregateMap));
     }

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

@@ -27,8 +27,10 @@
 import com.apple.foundationdb.record.query.plan.cascades.expressions.RelationalExpression;
 import com.apple.foundationdb.record.query.plan.cascades.predicates.QueryPredicate;
 import com.apple.foundationdb.record.query.plan.cascades.rules.DataAccessRule;
+import com.apple.foundationdb.record.query.plan.cascades.values.Value;
 import com.google.common.base.Suppliers;
 import com.google.common.base.Verify;
+import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -583,6 +585,19 @@ default Compensation intersect(@Nonnull Compensation otherCompensation) {
                             .collect(ImmutableMap.toImmutableMap(Map.Entry::getKey,
                                     Map.Entry::getValue,
                                     (l, r) -> l));
+            final var newUnmatchedAggregateMapBuilder =
+                    ImmutableBiMap.<CorrelationIdentifier, Value>builder();
+            for (final var entry : getAggregateMappings().getUnmatchedAggregateMap().entrySet()) {
+                if (!newMatchedAggregateMap.containsKey(entry.getValue())) {
+                    newUnmatchedAggregateMapBuilder.put(entry);
+                }
+            }
+            for (final var entry : otherWithSelectCompensation.getAggregateMappings().getUnmatchedAggregateMap().entrySet()) {
+                if (!newMatchedAggregateMap.containsKey(entry.getValue())) {
+                    newUnmatchedAggregateMapBuilder.put(entry);
+                }
+            }
+            final var newAggregateMappings = AggregateMappings.of(newMatchedAggregateMap, newUnmatchedAggregateMapBuilder.build());
 
             final ResultCompensationFunction newResultResultCompensationFunction;
             final var resultCompensationFunction = getResultCompensationFunction();
@@ -594,7 +609,7 @@ default Compensation intersect(@Nonnull Compensation otherCompensation) {
                 Verify.verify(resultCompensationFunction.isNeeded());
                 Verify.verify(otherResultCompensationFunction.isNeeded());
                 // pick the one from this side -- it does not matter as both candidates have the same shape
-                newResultResultCompensationFunction = resultCompensationFunction;
+                newResultResultCompensationFunction = resultCompensationFunction.amend(newAggregateMappings);
             }
 
             final var otherCompensationMap = otherWithSelectCompensation.getPredicateCompensationMap();
@@ -608,7 +623,8 @@ default Compensation intersect(@Nonnull Compensation otherCompensation) {
                     // reapplication we need to generate plan variants with either compensation and let the planner
                     // figure out which one wins.
                     // We just pick one side here.
-                    combinedPredicateMap.put(entry.getKey(), entry.getValue());
+                    combinedPredicateMap.put(entry.getKey(),
+                            entry.getValue().amend(newAggregateMappings));
                 }
             }
 
@@ -642,7 +658,7 @@ default Compensation intersect(@Nonnull Compensation otherCompensation) {
                     intersectedUnmatchedQuantifiers,
                     getCompensatedAliases(), // both compensated aliases must be identical, but too expensive to check
                     newResultResultCompensationFunction,
-                    AggregateMappings.empty());
+                    newAggregateMappings);
         }
     }
 
@@ -905,5 +921,22 @@ public RelationalExpression applyFinal(@Nonnull final Memoizer memoizer,
                     .build()
                     .buildSelectWithResultValue(resultValue);
         }
+
+        @Nonnull
+        @Override
+        public String toString() {
+            final var result = new StringBuilder();
+            if (isNeeded()) {
+                result.append("needed; ");
+            } else {
+                result.append("not needed; ");
+            }
+            if (isImpossible()) {
+                result.append("impossible");
+            } else {
+                result.append("possible");
+            }
+            return result.toString();
+        }
     }
 }

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

@@ -85,7 +85,7 @@ default AdjustedBuilder adjustedBuilder() {
     @Nonnull
     default AggregateMappings adjustAggregateMappings(@Nonnull final PartialMatch partialMatch,
                                                       @Nonnull final Quantifier candidateQuantifier) {
-        final var adjustedMatchedAggregateMapBuilder = ImmutableBiMap.<Value, Value>builder();
+        final var adjustedMatchedAggregateMapBuilder = ImmutableMap.<Value, Value>builder();
         final var aggregateMappings = getAggregateMappings();
         final var matchedAggregateMap = aggregateMappings.getMatchedAggregateMap();
         for (final var matchedAggregateMapEntry : matchedAggregateMap.entrySet()) {
@@ -370,7 +370,7 @@ public static Optional<Map<CorrelationIdentifier, ComparisonRange>> tryMergePara
         private static AggregateMappings pullUpAndMergeAggregateMappings(@Nonnull final AliasMap bindingAliasMap,
                                                                          @Nonnull final IdentityBiMap<Quantifier, PartialMatch> partialMatchMap,
                                                                          @Nonnull final AggregateMappings additionalAggregateMappings) {
-            final var matchedAggregateMapBuilder = ImmutableBiMap.<Value, Value>builder();
+            final var matchedAggregateMapBuilder = ImmutableMap.<Value, Value>builder();
             matchedAggregateMapBuilder.putAll(additionalAggregateMappings.getMatchedAggregateMap());
             final var unatchedAggregateMapBuilder = ImmutableBiMap.<CorrelationIdentifier, Value>builder();
             unatchedAggregateMapBuilder.putAll(additionalAggregateMappings.getUnmatchedAggregateMap());
@@ -405,7 +405,7 @@ public static AggregateMappings pullUpAggregateMappings(@Nonnull final PartialMa
             final var queryExpression = partialMatch.getQueryExpression();
             final var resultValue = queryExpression.getResultValue();
             final var aggregateMappings = matchInfo.getAggregateMappings();
-            final var matchedAggregateMapBuilder = ImmutableBiMap.<Value, Value>builder();
+            final var matchedAggregateMapBuilder = ImmutableMap.<Value, Value>builder();
             for (final var matchedAggregateMapEntry : aggregateMappings.getMatchedAggregateMap().entrySet()) {
                 final var queryAggregateValue = matchedAggregateMapEntry.getKey();
                 final Value pulledUpQueryAggregateValue;

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

@@ -343,7 +343,7 @@ public Iterable<MatchInfo> subsumedBy(@Nonnull final RelationalExpression candid
                 ImmutableBiMap.<CorrelationIdentifier, Value>builder();
         final var unmatchedTranslatedAggregateValueMapBuilder =
                 ImmutableMap.<Value, CorrelationIdentifier>builder();
-        var subsumedAggregations = BooleanWithConstraint.alwaysTrue();
+        var subsumedAggregations = BooleanWithConstraint.falseValue();
         for (final var primitiveAggregateValue : aggregateValues) {
             final var translatedPrimitiveAggregateValue =
                     primitiveAggregateValue.translateCorrelations(translationMap, true);