some polishing

Author: normen662

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/query/combinatorics/TopologicalSort.java

@@ -537,10 +537,6 @@ public static <T, P> Iterable<List<T>> satisfyingPermutations(@Nonnull final Par
                                                                   @Nonnull final List<P> targetPermutation,
                                                                   @Nonnull final Function<T, P> domainMapper,
                                                                   @Nonnull final Function<List<T>, Integer> satisfiabilityFunction) {
-//        if (partiallyOrderedSet.isEmpty()) {
-//            return ImmutableList.of();
-//        }
-        
         if (partiallyOrderedSet.size() < targetPermutation.size()) {
             return ImmutableList.of();
         }

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

@@ -44,7 +44,6 @@
 import com.apple.foundationdb.record.query.plan.cascades.values.RecordConstructorValue;
 import com.apple.foundationdb.record.query.plan.cascades.values.Value;
 import com.apple.foundationdb.record.query.plan.cascades.values.Values;
-import com.apple.foundationdb.record.query.plan.cascades.values.translation.TranslationMap;
 import com.apple.foundationdb.record.util.pair.NonnullPair;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Suppliers;
@@ -162,8 +161,7 @@ public MatchCandidate expand(@Nonnull final Supplier<Quantifier.ForEach> baseQua
                 recordTypes,
                 baseQuantifier.getFlowedObjectType(),
                 groupByQun.getRangesOver().get().getResultValue(),
-                selectHaving,
-                constructSelectHavingResult.getGroupByValues());
+                selectHaving);
     }
 
     @Nonnull
@@ -334,12 +332,8 @@ private ConstructSelectHavingResult constructSelectHaving(@Nonnull final Quantif
             finalPlaceholders = placeholderAliases.build();
         }
 
-        final var currentGroupingValues = groupingValues.stream()
-                .map(groupingValue -> groupingValue.translateCorrelations(TranslationMap.ofAliases(groupByQun.getAlias(), Quantifier.current())))
-                .collect(ImmutableList.toImmutableList());
-
         return new ConstructSelectHavingResult(selectHavingGraphExpansionBuilder.build().buildSelect(),
-                finalPlaceholders, currentGroupingValues);
+                finalPlaceholders);
     }
 
     @Nonnull
@@ -390,15 +384,11 @@ private static class ConstructSelectHavingResult {
         private final SelectExpression selectExpression;
         @Nonnull
         private final List<CorrelationIdentifier> placeholderAliases;
-        @Nonnull
-        private final List<Value> groupByValues;
 
         private ConstructSelectHavingResult(@Nonnull final SelectExpression selectExpression,
-                                            @Nonnull final List<CorrelationIdentifier> placeholderAliases,
-                                            @Nonnull final List<Value> groupByValues) {
+                                            @Nonnull final List<CorrelationIdentifier> placeholderAliases) {
             this.selectExpression = selectExpression;
             this.placeholderAliases = placeholderAliases;
-            this.groupByValues = groupByValues;
         }
 
         @Nonnull
@@ -410,10 +400,5 @@ public SelectExpression getSelectExpression() {
         public List<CorrelationIdentifier> getPlaceholderAliases() {
             return placeholderAliases;
         }
-
-        @Nonnull
-        public List<Value> getGroupByValues() {
-            return groupByValues;
-        }
     }
 }

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

@@ -99,9 +99,6 @@ public class AggregateIndexMatchCandidate implements MatchCandidate, WithBaseQua
     @Nonnull
     private final SelectExpression selectHavingExpression;
 
-    @Nonnull
-    private final List<Value> groupByValues;
-
     /**
      * Creates a new instance of {@link AggregateIndexMatchCandidate}.
      *
@@ -119,8 +116,7 @@ public AggregateIndexMatchCandidate(@Nonnull final Index index,
                                         @Nonnull final Collection<RecordType> recordTypes,
                                         @Nonnull final Type baseType,
                                         @Nonnull final Value groupByResultValue,
-                                        @Nonnull final SelectExpression selectHavingExpression,
-                                        @Nonnull final List<Value> groupByValues) {
+                                        @Nonnull final SelectExpression selectHavingExpression) {
         Preconditions.checkArgument(!recordTypes.isEmpty());
         this.index = index;
         this.traversal = traversal;
@@ -129,7 +125,6 @@ public AggregateIndexMatchCandidate(@Nonnull final Index index,
         this.baseType = baseType;
         this.groupByResultValue = groupByResultValue;
         this.selectHavingExpression = selectHavingExpression;
-        this.groupByValues = ImmutableList.copyOf(groupByValues);
     }
 
     @Nonnull
@@ -156,16 +151,6 @@ public List<CorrelationIdentifier> getOrderingAliases() {
         return sargableAndOrderAliases;
     }
 
-    @Nonnull
-    public SelectExpression getSelectHavingExpression() {
-        return selectHavingExpression;
-    }
-
-    @Nonnull
-    public List<Value> getGroupByValues() {
-        return groupByValues;
-    }
-
     @Nonnull
     @Override
     public KeyExpression getFullKeyExpression() {

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

@@ -66,9 +66,9 @@ public class PredicateMultiMap {
     private final ImmutableSetMultimap<QueryPredicate, PredicateMapping> map;
 
     @Nonnull
-    private static Value amendValue(@Nonnull final BiMap<CorrelationIdentifier, Value> unmatchedAggregateMap,
-                                    @Nonnull final Map<Value, Value> amendedMatchedAggregateMap,
-                                    @Nonnull final Value rootValue) {
+    private static Value replaceNewlyMatchedValues(@Nonnull final BiMap<CorrelationIdentifier, Value> unmatchedAggregateMap,
+                                                   @Nonnull final Map<Value, Value> amendedMatchedAggregateMap,
+                                                   @Nonnull final Value rootValue) {
         return Objects.requireNonNull(rootValue.replace(currentValue -> {
             if (currentValue instanceof GroupByExpression.UnmatchedAggregateValue) {
                 final var unmatchedId =
@@ -191,7 +191,7 @@ public PredicateCompensationFunction amend(@Nonnull final BiMap<CorrelationIdent
                                                            @Nonnull final Map<Value, Value> amendedMatchedAggregateMap) {
                     final var amendedTranslatedPredicateOptional =
                             predicate.replaceValuesMaybe(rootValue ->
-                                    Optional.of(amendValue(unmatchedAggregateMap, amendedMatchedAggregateMap,
+                                    Optional.of(replaceNewlyMatchedValues(unmatchedAggregateMap, amendedMatchedAggregateMap,
                                             rootValue)));
                     Verify.verify(amendedTranslatedPredicateOptional.isPresent());
                     return ofPredicate(amendedTranslatedPredicateOptional.get(), true);
@@ -398,7 +398,7 @@ public boolean isImpossible() {
                 public ResultCompensationFunction amend(@Nonnull final BiMap<CorrelationIdentifier, Value> unmatchedAggregateMap,
                                                         @Nonnull final Map<Value, Value> amendedMatchedAggregateMap) {
                     final var amendedTranslatedQueryValue =
-                            amendValue(unmatchedAggregateMap, amendedMatchedAggregateMap, value);
+                            replaceNewlyMatchedValues(unmatchedAggregateMap, amendedMatchedAggregateMap, value);
                     return ofValue(amendedTranslatedQueryValue, true);
                 }
 

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

@@ -2316,10 +2316,11 @@ void deleteWhereOnMultiTypeFailsWithAmbiguousParent() {
 
     @Test
     void deleteWhereOnMultiTypeFailsWithRecordTypePrefix() {
-        // Create a multi-type index on two different unnested types. Each one has a parent constituent named and an inner constituent, so the index is well-defined.
-        // The multi-type index in this case has a record type prefix. In theory, we actually could perform the delete records where, but the record type key in the
-        // index matches the synthetic type's record type key, not the base type. This means we'd need to translateCorrelations the record type key before deleting data from the
-        // index. Until we get that working, just assert that this fails.
+        // Create a multi-type index on two different unnested types. Each one has a parent constituent named and an
+        // inner constituent, so the index is well-defined. The multi-type index in this case has a record type prefix.
+        // In theory, we actually could perform the delete records where, but the record type key in the index matches
+        // the synthetic type's record type key, not the base type. This means we'd need to translate the record type
+        // key before deleting data from the index. Until we get that working, just assert that this fails.
         final RecordMetaDataHook hook = addMultiTypeDoubleUnnestedIndex(concat(recordType(), field(PARENT_CONSTITUENT).nest(field("middle").nest("other_int")), field("inner").nest("foo")))
                 .andThen(setOuterAndMiddlePrimaryKey(concat(recordType(), field("middle").nest("other_int"), field("rec_no"))));
         final RecordMetaData metaData = doubleNestedMetaData(hook);

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

@@ -722,7 +722,7 @@ translation of (t.a.q, t.a.r, (t.b.t), t.j.s) with correlation mapping of t -> t
         Assertions.assertEquals(expectedL1TranslatedQueryNValue, l1m3ForNValue.getQueryValue());
         Assertions.assertEquals(n_v, l1m3ForNValue.getCandidateValue());
 
-        // translateCorrelations a complex join condition, each quantifier in the join condition is assumed to match a corresponding
+        // translate a complex join condition, each quantifier in the join condition is assumed to match a corresponding
         // quantifier in a non-joined index candidate.
 
         /*
@@ -952,7 +952,7 @@ translation of (t.a.q, t.a.r, (t.b.t), t.j.s) with correlation mapping of t -> t
         final var l1m3ForMValue = calculate(l1TranslatedQueryMValue, m_v);
         final var l1m3ForNValue = calculate(l1TranslatedQueryNValue, n_v);
 
-        // translateCorrelations a complex join condition, each quantifier in the join condition is assumed to match a corresponding
+        // translate a complex join condition, each quantifier in the join condition is assumed to match a corresponding
         // quantifier in a non-joined index candidate.
 
         /*

fdb-record-layer-lucene/src/main/java/com/apple/foundationdb/record/lucene/search/BooleanPointsConfig.java

@@ -26,7 +26,7 @@
 import java.text.NumberFormat;
 
 /**
- * A subclass of PointsConfig to allow the Parser the ability to translateCorrelations boolean terms to binary ones.
+ * A subclass of PointsConfig to allow the Parser the ability to translate boolean terms to binary ones.
  */
 public class BooleanPointsConfig extends PointsConfig {
 

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/metrics/NoOpMetricRegistry.java

@@ -31,7 +31,7 @@
  * <p>
  * NOTE(stack): Consider NOT using codahale but prometheus metrics. If server is exporting metrics
  * on an prometheus endpoint, codahale will require translation (there are translators but better not
- * to translateCorrelations at all). What is the story for clients? RL is codahale?
+ * to translate at all). What is the story for clients? RL is codahale?
  */
 @API(API.Status.EXPERIMENTAL)
 public final class NoOpMetricRegistry {