adding tests

Author: normen662

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

@@ -250,7 +250,8 @@ protected NonnullPair<Quantifier, List<Placeholder>> constructGroupBy(@Nonnull f
             throw new RecordCoreException("unable to plan group by with non-field value")
                     .addLogInfo(LogMessageKeys.VALUE, groupedValue);
         }
-        final var aggregateValue = (Value)aggregateMap.get().get(index.getType()).encapsulate(ImmutableList.of(argument));
+        final var aggregateValue =
+                aggregateValue(index, argument).orElseThrow(() -> new RecordCoreException("unknown aggregation type"));
         // add an RCV column representing the grouping columns as the first result set column
         // also, make sure to set the field type names correctly for each field value in the grouping keys RCV.
 

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

@@ -162,6 +162,11 @@ public RelationalExpression applyFinal(@Nonnull final Memoizer memoizer,
                                                @Nonnull Function<CorrelationIdentifier, TranslationMap> matchedToRealizedTranslationMapFunction) {
             throw new RecordCoreException("this method should not be called");
         }
+
+        @Override
+        public String toString() {
+            return "no-compensation";
+        }
     };
 
     /**
@@ -369,7 +374,7 @@ default Compensation intersect(@Nonnull Compensation otherCompensation) {
             @Override
             public RelationalExpression apply(@Nonnull final Memoizer memoizer,
                                               @Nonnull final RelationalExpression relationalExpression,
-                                              @Nonnull Function<CorrelationIdentifier, TranslationMap> matchedToRealizedTranslationMapFunction) {
+                                              @Nonnull final Function<CorrelationIdentifier, TranslationMap> matchedToRealizedTranslationMapFunction) {
                 return Compensation.this.apply(memoizer,
                         otherCompensation.apply(memoizer, relationalExpression,
                                 matchedToRealizedTranslationMapFunction), matchedToRealizedTranslationMapFunction);
@@ -379,7 +384,7 @@ public RelationalExpression apply(@Nonnull final Memoizer memoizer,
             @Override
             public RelationalExpression applyFinal(@Nonnull final Memoizer memoizer,
                                                    @Nonnull final RelationalExpression relationalExpression,
-                                                   @Nonnull Function<CorrelationIdentifier, TranslationMap> matchedToRealizedTranslationMapFunction) {
+                                                   @Nonnull final Function<CorrelationIdentifier, TranslationMap> matchedToRealizedTranslationMapFunction) {
                 return Compensation.this.applyFinal(memoizer,
                         otherCompensation.applyFinal(memoizer, relationalExpression,
                                 matchedToRealizedTranslationMapFunction), matchedToRealizedTranslationMapFunction);

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

@@ -198,6 +198,11 @@ public Reference reference() {
                     }
                 };
             }
+
+            @Override
+            public String toString() {
+                return "no-memo";
+            }
         };
     }
 

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

@@ -368,11 +368,6 @@ public Map<QueryPredicate, PredicateMapping> getPulledUpPredicateMappings(@Nonnu
         return resultMap;
     }
 
-    @Nonnull
-    public Compensation compensateCompleteMatch(@Nonnull final CorrelationIdentifier candidateTopAlias) {
-        return compensateCompleteMatch(null, candidateTopAlias);
-    }
-
     @Nonnull
     public Compensation compensateCompleteMatch(@Nullable PullUp unificationPullUp,
                                                 @Nonnull final CorrelationIdentifier candidateTopAlias) {

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

@@ -767,7 +767,7 @@ public Message toProto(@Nonnull final PlanSerializationContext serializationCont
         @Override
         public Value withChildren(final Iterable<? extends Value> newChildren) {
             Verify.verify(Iterables.isEmpty(newChildren));
-            return new UnmatchedAggregateValue(getUnmatchedId());
+            return this;
         }
 
         @Nonnull

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/query/AggregateValueTest.java

@@ -20,7 +20,10 @@
 
 package com.apple.foundationdb.record.provider.foundationdb.query;
 
+import com.apple.foundationdb.record.PlanSerializationContext;
 import com.apple.foundationdb.record.RecordCoreArgumentException;
+import com.apple.foundationdb.record.query.plan.cascades.CorrelationIdentifier;
+import com.apple.foundationdb.record.query.plan.cascades.expressions.GroupByExpression;
 import com.apple.foundationdb.record.query.plan.cascades.typing.TypeRepository;
 import com.apple.foundationdb.record.query.plan.cascades.values.AggregateValue;
 import com.apple.foundationdb.record.query.plan.cascades.values.CountValue;
@@ -42,6 +45,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
+import static com.apple.foundationdb.record.PlanHashable.CURRENT_FOR_CONTINUATION;
 import static com.apple.foundationdb.record.query.plan.cascades.values.LiteralValue.ofScalar;
 
 /**
@@ -239,6 +243,18 @@ void testTupleSumCount() {
         });
     }
 
+    @Test
+    void testUnmatchedAggregateValueTest() {
+        final var value = new GroupByExpression.UnmatchedAggregateValue(CorrelationIdentifier.of("a"));
+        Assertions.assertEquals("unmatched(a)", value.toString());
+
+        final var serializationContext = PlanSerializationContext.newForCurrentMode();
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> value.toValueProto(serializationContext));
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> value.planHash(CURRENT_FOR_CONTINUATION));
+        Assertions.assertThrows(UnsupportedOperationException.class, () -> value.toProto(serializationContext));
+        Assertions.assertEquals(value, value.withChildren(ImmutableList.of()));
+    }
+
     @Nullable
     public static List<Long> collectOnBits(@Nullable byte[] bitmap, int expectedArrayLength) {
         if (bitmap == null) {