address post merge conflicts, fix code style violations.

Author: hatyo

fdb-java-annotations/src/main/java/com/apple/foundationdb/annotation/GenerateVisitorAnnotationHelper.java

@@ -20,7 +20,6 @@
 
 package com.apple.foundationdb.annotation;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.squareup.javapoet.AnnotationSpec;
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
@@ -44,21 +43,18 @@
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Types;
 import javax.tools.Diagnostic;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * A separate class to support (@link GenerateVisitorAnnotationProcessor) so that dependency on javapoet does not leak to anyone
@@ -106,8 +102,8 @@ static boolean process(final ProcessingEnvironment processingEnv, Set<? extends
                     .getEnclosedElements()
                     .stream()
                     .flatMap(packageElement -> packageElement.getEnclosedElements().stream())
-                    .flatMap(element -> element.getKind() == ElementKind.CLASS && element.getModifiers().contains(Modifier.ABSTRACT) ? element.getEnclosedElements().stream() :  Stream.of(element) )
-                    .filter(element -> element.getKind() == ElementKind.CLASS && !element.getModifiers().contains(Modifier.ABSTRACT))
+                    .filter(element -> element.getKind() == ElementKind.CLASS &&
+                            !element.getModifiers().contains(Modifier.ABSTRACT))
                     .map(Element::asType)
                     .filter(mirror -> mirror.getKind() == TypeKind.DECLARED)
                     .filter(mirror -> typeUtils.isSubtype(mirror, rootTypeMirror))
@@ -156,19 +152,18 @@ private static void generateInterface(@Nonnull final Types typeUtils,
                         .addModifiers(Modifier.PUBLIC)
                         .addTypeVariable(typeVariableName);
 
-        final var packageName = packageElement.getQualifiedName().toString();
         final var jumpMapBuilder = FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(Map.class),
                         ParameterizedTypeName.get(ClassName.get(Class.class), WildcardTypeName.subtypeOf(Object.class)),
                         ParameterizedTypeName.get(ClassName.get(BiFunction.class),
-                                ParameterizedTypeName.get(ClassName.get(packageName, interfaceName), WildcardTypeName.subtypeOf(Object.class)),
+                                ParameterizedTypeName.get(ClassName.get(packageElement.getQualifiedName().toString(), interfaceName), WildcardTypeName.subtypeOf(Object.class)),
                                 TypeName.get(rootTypeMirror),
                                 WildcardTypeName.subtypeOf(Object.class))),
                 "jumpMap", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL);
 
         final var initializerStrings = subClassTypeMirrors.stream()
                 .map(typeMirror -> {
                     final var typeElement = (TypeElement)typeUtils.asElement(typeMirror);
-                    return "Map.entry(" + getRawTypeName(typeMirror, packageName) + ".class, (visitor, element) -> visitor." + methodNameOfVisitMethod(generateVisitor, typeElement) + "((" + getWildcardTypeName(typeMirror, packageName) + ")element))";
+                    return "Map.entry(" + typeElement.getSimpleName() + ".class, (visitor, element) -> visitor." + methodNameOfVisitMethod(generateVisitor, typeElement) + "((" + typeElement.getSimpleName() + ")element))";
                 })
                 .collect(Collectors.joining(", \n"));
 
@@ -177,7 +172,6 @@ private static void generateInterface(@Nonnull final Types typeUtils,
                 .build();
 
         typeBuilder.addField(jumpMapBuilder
-                .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "$S", "unchecked").build())
                 .initializer(initializerBlock)
                 .build());
 
@@ -189,7 +183,7 @@ private static void generateInterface(@Nonnull final Types typeUtils,
                             .methodBuilder(methodName)
                             .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
                             .addAnnotation(Nonnull.class)
-                            .addParameter(ParameterSpec.builder(getWildcardTypeName(typeMirror, packageName), parameterName).addAnnotation(Nonnull.class).build())
+                            .addParameter(ParameterSpec.builder(TypeName.get(typeMirror), parameterName).addAnnotation(Nonnull.class).build())
                             .returns(typeVariableName);
             typeBuilder.addMethod(specificVisitMethodBuilder.build());
         }
@@ -199,7 +193,7 @@ private static void generateInterface(@Nonnull final Types typeUtils,
                         .methodBuilder(defaultMethodName)
                         .addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT)
                         .addAnnotation(Nonnull.class)
-                        .addParameter(ParameterSpec.builder(getWildcardTypeName(rootTypeMirror, packageName), parameterName).addAnnotation(Nonnull.class).build())
+                        .addParameter(ParameterSpec.builder(TypeName.get(rootTypeMirror), parameterName).addAnnotation(Nonnull.class).build())
                         .returns(typeVariableName);
         typeBuilder.addMethod(visitDefaultMethodBuilder.build());
 
@@ -222,105 +216,6 @@ private static void generateInterface(@Nonnull final Types typeUtils,
                 .writeTo(Objects.requireNonNull(filer));
     }
 
-    /**
-     * Converts a type mirror to a raw TypeName without type parameters.
-     * <p>
-     * For generic types, this method returns the raw type without any type arguments
-     * (e.g., {@code List<String>} becomes {@code List}). For non-generic types, the type
-     * is returned as-is. If the type belongs to the same package as {@code currentPackage},
-     * the package prefix is omitted from the generated type name.
-     * <p>
-     * This is particularly useful when generating code that needs to reference the
-     * {@code .class} literal of a generic type, as class literals must use raw types.
-     *
-     * @param typeMirror the type mirror to convert
-     * @param currentPackage the current package name, used to determine whether to omit
-     *                       package prefixes for types in the same package
-     * @return a TypeName representing the raw type (without type parameters) if the type
-     *         is generic, or the original type name if not generic
-     */
-    @Nonnull
-    private static TypeName getRawTypeName(@Nonnull TypeMirror typeMirror, @Nonnull String currentPackage) {
-        if (typeMirror.getKind() == TypeKind.DECLARED) {
-            final var declaredType = (DeclaredType) typeMirror;
-            final var typeElement = (TypeElement) declaredType.asElement();
-            final boolean isGeneric = !typeElement.getTypeParameters().isEmpty();
-
-            if (isGeneric) {
-                final ClassName className = ClassName.get(typeElement);
-                return removePackagePrefix(className, currentPackage);
-            }
-        }
-
-        // return as-is, remove the package if it is the same as the currentPackage.
-        final TypeName typeName = TypeName.get(typeMirror);
-        if (typeName instanceof ClassName) {
-            return removePackagePrefix((ClassName) typeName, currentPackage);
-        }
-
-        return typeName;
-    }
-
-    /**
-     * Converts a type mirror to a TypeName with wildcard type arguments for generic types.
-     * <p>
-     * For generic types, this method creates a parameterized type with wildcard bounds
-     * (e.g., {@code List<String>} becomes {@code List<?>}). For non-generic types, the type
-     * is returned as-is. If the type belongs to the same package as {@code currentPackage},
-     * the package prefix is omitted from the generated type name.
-     *
-     * @param typeMirror the type mirror to convert
-     * @param currentPackage the current package name, used to determine whether to omit
-     *                       package prefixes for types in the same package
-     * @return a TypeName representing the type with wildcard type arguments if the type
-     *         is generic, or the original type name if not generic
-     */
-    @Nonnull
-    private static TypeName getWildcardTypeName(@Nonnull final TypeMirror typeMirror, @Nonnull final String currentPackage) {
-        if (typeMirror.getKind() == TypeKind.DECLARED) {
-            final var declaredType = (DeclaredType) typeMirror;
-            final var typeElement = (TypeElement) declaredType.asElement();
-            final boolean isGeneric = !typeElement.getTypeParameters().isEmpty();
-
-            if (isGeneric) {
-                ClassName rawType = ClassName.get(typeElement);
-                rawType = removePackagePrefix(rawType, currentPackage);
-
-                final WildcardTypeName[] wildcards = new WildcardTypeName[typeElement.getTypeParameters().size()];
-                Arrays.fill(wildcards, WildcardTypeName.subtypeOf(Object.class));
-                return ParameterizedTypeName.get(rawType, wildcards);
-            }
-        }
-
-        // return as-is, remove the package if it is the same as the currentPackage.
-        final TypeName typeName = TypeName.get(typeMirror);
-        if (typeName instanceof ClassName) {
-            return removePackagePrefix((ClassName) typeName, currentPackage);
-        }
-
-        return typeName;
-    }
-
-    /**
-     * Removes the package prefix from a ClassName if it belongs to the same package as currentPackage.
-     * <p>
-     * This is useful when generating code references to types that are in the same package,
-     * as the package prefix can be omitted for brevity.
-     *
-     * @param className the ClassName to potentially strip the package prefix from
-     * @param currentPackage the current package name to compare against
-     * @return a ClassName without the package prefix if it's in the same package,
-     *         otherwise returns the original ClassName unchanged
-     */
-    @Nonnull
-    private static ClassName removePackagePrefix(@Nonnull final ClassName className, @Nonnull final String currentPackage) {
-        if (className.packageName().equals(currentPackage)) {
-            return ClassName.get("", className.topLevelClassName().simpleName(),
-                    className.simpleNames().subList(1, className.simpleNames().size()).toArray(new String[0]));
-        }
-        return className;
-    }
-
     private static void generateImplementationWithDefaults(@Nonnull final Types typeUtils,
                                                            @Nonnull final Filer filer,
                                                            @Nonnull final GenerateVisitor generateVisitor,
@@ -345,7 +240,7 @@ private static void generateImplementationWithDefaults(@Nonnull final Types type
                             .addModifiers(Modifier.PUBLIC, Modifier.DEFAULT)
                             .addAnnotation(Nonnull.class)
                             .addAnnotation(Override.class)
-                            .addParameter(ParameterSpec.builder(getWildcardTypeName(typeMirror, packageElement.getQualifiedName().toString()), parameterName).addAnnotation(Nonnull.class).build())
+                            .addParameter(ParameterSpec.builder(TypeName.get(typeMirror), parameterName).addAnnotation(Nonnull.class).build())
                             .returns(typeVariableName)
                             .addCode(CodeBlock.builder()
                                     .addStatement("return " + defaultMethodName + "(" + parameterName + ")")

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

@@ -21,7 +21,6 @@
 package com.apple.foundationdb.record.query.plan.cascades.values;
 
 import com.apple.foundationdb.annotation.API;
-import com.apple.foundationdb.annotation.GenerateVisitor;
 import com.apple.foundationdb.record.EvaluationContext;
 import com.apple.foundationdb.record.PlanHashable;
 import com.apple.foundationdb.record.PlanSerializable;
@@ -92,7 +91,6 @@
  * A scalar value type.
  */
 @API(API.Status.EXPERIMENTAL)
-@GenerateVisitor
 public interface Value extends Correlated<Value>, TreeLike<Value>, UsesValueEquivalence<Value>, PlanHashable, Typed, Narrowable<Value>, PlanSerializable {
 
     @Nonnull
@@ -311,31 +309,6 @@ default Value translateCorrelations(@Nonnull final TranslationMap translationMap
         }, false).orElseThrow(() -> new RecordCoreException("unable to map tree"));
     }
 
-    @Nonnull
-    @SuppressWarnings("PMD.CompareObjectsWithEquals")
-    default Value translateCorrelationsRecursively(@Nonnull final TranslationMap translationMap) {
-        if (translationMap.definesOnlyIdentities()) {
-            return this;
-        }
-        return replaceLeavesMaybe(value -> {
-            if (value instanceof LeafValue) {
-                final var leafValue = (LeafValue)value;
-                final var correlatedTo = value.getCorrelatedTo();
-                if (correlatedTo.isEmpty()) {
-                    return leafValue;
-                }
-
-                Verify.verify(correlatedTo.size() == 1);
-                final var sourceAlias = Iterables.getOnlyElement(correlatedTo);
-                return translationMap.containsSourceAlias(sourceAlias)
-                       ? translationMap.applyTranslationFunction(sourceAlias, leafValue)
-                       : leafValue;
-            }
-            Verify.verify(value.getCorrelatedTo().isEmpty());
-            return value;
-        }, true).orElseThrow(() -> new RecordCoreException("unable to map tree"));
-    }
-
     @Nonnull
     default <V extends Value> V narrow(@Nonnull Class<V> narrowedClass) {
         return narrowedClass.cast(this);

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/metadata/RecordLayerIndex.java

@@ -123,17 +123,6 @@ public Map<String, String> getOptions() {
         return options;
     }
 
-    @Nonnull
-    public Builder toBuilder() {
-        return newBuilder().setName(getName())
-                .setIndexType(getIndexType())
-                .setTableName(getTableName())
-                .setUnique(isUnique())
-                .setKeyExpression(getKeyExpression())
-                .setPredicate(getPredicate())
-                .setOptions(getOptions());
-    }
-
     @Nonnull
     public static RecordLayerIndex from(@Nonnull final String tableName, @Nonnull String tableStorageName, @Nonnull final com.apple.foundationdb.record.metadata.Index index) {
         final var indexProto = index.toProto();

fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/ddl/MaterializedViewIndexGenerator.java

@@ -144,7 +144,8 @@ private MaterializedViewIndexGenerator(@Nonnull RelationalExpression relationalE
     }
 
     @Nonnull
-    public RecordLayerIndex.Builder generate(@Nonnull RecordLayerSchemaTemplate.Builder schemaTemplateBuilder, @Nonnull String indexName, boolean isUnique, boolean containsNullableArray) {
+    public RecordLayerIndex.Builder generate(@Nonnull RecordLayerSchemaTemplate.Builder schemaTemplateBuilder, @Nonnull String indexName,
+                                             boolean isUnique, boolean containsNullableArray, boolean generateKeyValueExpressionWithEmptyKey) {
         final String recordTypeName = getRecordTypeName();
         // Have to use the storage name here because the index generator uses it
         final Type.Record tableType = schemaTemplateBuilder.findTableByStorageName(recordTypeName).getType();
@@ -189,7 +190,10 @@ public RecordLayerIndex.Builder generate(@Nonnull RecordLayerSchemaTemplate.Buil
             }
             final var reordered = reorderValues(fieldValues, orderByValues);
             final var expression = generate(reordered, orderingFunctions);
-            final var splitPoint = orderByValues.isEmpty() ? -1 : orderByValues.size();
+            var splitPoint = orderByValues.size();
+            if (orderByValues.isEmpty() && !generateKeyValueExpressionWithEmptyKey) {
+                splitPoint = -1;
+            }
             if (splitPoint != -1 && splitPoint < fieldValues.size()) {
                 indexBuilder.setKeyExpression(KeyExpression.fromProto(NullableArrayUtils.wrapArray(keyWithValue(expression, splitPoint).toKeyExpression(), tableType, containsNullableArray)));
             } else {
@@ -232,7 +236,7 @@ public RecordLayerIndex.Builder generate(@Nonnull RecordLayerSchemaTemplate.Buil
             if (IndexTypes.PERMUTED_MIN.equals(indexType) || IndexTypes.PERMUTED_MAX.equals(indexType)) {
                 int permutedSize = aggregateOrderIndex < 0 ? 0 : (fieldValues.size() - aggregateOrderIndex);
                 indexBuilder.setOption(IndexOptions.PERMUTED_SIZE_OPTION, permutedSize);
-            } else if (aggregateOrderIndex >= 0) {
+            } else if (aggregateOrderIndex > 0) {
                 Assert.failUnchecked(ErrorCode.UNSUPPORTED_OPERATION, "Unsupported index definition. Cannot order " + indexType + " index by aggregate value");
             }
         }