Merge pull request FoundationDB#1900 from normen662/main

introduce `ResolvedAccessor`
alecgrieser · Nov 8, 2022 · 032f1e4 · 032f1e4
2 parents 5d87de1 + 4092b55
commit 032f1e4
Show file tree

Hide file tree

Showing 10 changed files with 244 additions and 128 deletions.
diff --git a/.../java/com/apple/foundationdb/record/query/plan/cascades/AggregateIndexMatchCandidate.java b/.../java/com/apple/foundationdb/record/query/plan/cascades/AggregateIndexMatchCandidate.java
@@ -355,7 +355,7 @@ private static void addCoveringField(@Nonnull IndexKeyValueToPartialRecord.Build
                                          @Nonnull AvailableFields.FieldData fieldData) {
         // TODO field names are for debugging purposes only, we should probably use field ordinals here instead.
         final var simplifiedFieldValue = (FieldValue)fieldValue.simplify(AliasMap.emptyMap(), ImmutableSet.of());
-        for (final var maybeFieldName : simplifiedFieldValue.getFieldPrefix().getFieldNamesMaybe()) {
+        for (final var maybeFieldName : simplifiedFieldValue.getFieldPrefix().getOptionalFieldNames()) {
             Verify.verify(maybeFieldName.isPresent());
             builder = builder.getFieldBuilder(maybeFieldName.get());
         }

diff --git a/.../java/com/apple/foundationdb/record/query/plan/cascades/ValueIndexScanMatchCandidate.java b/.../java/com/apple/foundationdb/record/query/plan/cascades/ValueIndexScanMatchCandidate.java
@@ -333,7 +333,7 @@ private static boolean addCoveringField(@Nonnull IndexKeyValueToPartialRecord.Bu
                                             @Nonnull FieldValue fieldValue,
                                             @Nonnull AvailableFields.FieldData fieldData) {
         // TODO field names are for debugging purposes only, we should probably use field ordinals here instead.
-        for (final var maybeFieldName : fieldValue.getFieldPrefix().getFieldNamesMaybe()) {
+        for (final var maybeFieldName : fieldValue.getFieldPrefix().getOptionalFieldNames()) {
             if (maybeFieldName.isEmpty()) {
                 return false;
             }

diff --git a/...va/com/apple/foundationdb/record/query/plan/cascades/WindowedIndexScanMatchCandidate.java b/...va/com/apple/foundationdb/record/query/plan/cascades/WindowedIndexScanMatchCandidate.java
@@ -457,7 +457,7 @@ private static boolean addCoveringField(@Nonnull IndexKeyValueToPartialRecord.Bu
                                             @Nonnull FieldValue fieldValue,
                                             @Nonnull AvailableFields.FieldData fieldData) {
         // TODO field names are for debugging purposes only, we should probably use field ordinals here instead.
-        for (final var maybeFieldName : fieldValue.getFieldPrefix().getFieldNamesMaybe()) {
+        for (final var maybeFieldName : fieldValue.getFieldPrefix().getOptionalFieldNames()) {
             if (maybeFieldName.isEmpty()) {
                 return false;
             }

diff --git a/...a/com/apple/foundationdb/record/query/plan/cascades/matching/structure/ValueMatchers.java b/...a/com/apple/foundationdb/record/query/plan/cascades/matching/structure/ValueMatchers.java
@@ -97,7 +97,7 @@ public static <V extends Value> BindingMatcher<FieldValue> fieldValueWithFieldPa
                         downstreamValue);
         final TypedMatcherWithExtractAndDownstream<FieldValue> downstreamFieldPathOrdinalsMatcher =
                 typedWithDownstream(FieldValue.class,
-                        Extractor.of(f -> f.getFieldPathOrdinals().asList(), name -> "fieldPathOrdinals(" + name + ")"),
+                        Extractor.of(f -> f.getFieldOrdinals().asList(), name -> "fieldPathOrdinals(" + name + ")"),
                         downstreamFieldPathOrdinals);
         final TypedMatcherWithExtractAndDownstream<FieldValue> downstreamFieldPathTypesMatcher =
                 typedWithDownstream(FieldValue.class,