Merge branch 'main' into udo

Author: pengpeng-lu

.idea/gradle.xml

@@ -31,4 +31,4 @@ runs:
   - name: Copy Test Reports
     shell: bash
     if: always()
-    run: mkdir -p test-reports && for d in fdb-java-annotations fdb-extensions fdb-record-layer-core fdb-record-layer-icu fdb-record-layer-spatial fdb-record-layer-lucene fdb-record-layer-jmh examples fdb-relational-api fdb-relational-core fdb-relational-cli fdb-relational-grpc fdb-relational-jdbc fdb-relational-server yaml-tests; do ln -s ../$d/.out/reports test-reports/$d; done
+    run: mkdir -p test-reports && for d in fdb-java-annotations fdb-extensions fdb-test-utils fdb-record-layer-core fdb-record-layer-icu fdb-record-layer-spatial fdb-record-layer-lucene fdb-record-layer-jmh examples fdb-relational-api fdb-relational-core fdb-relational-cli fdb-relational-grpc fdb-relational-jdbc fdb-relational-server yaml-tests; do ln -s ../$d/.out/reports test-reports/$d; done

actions/gradle-test/action.yml

@@ -30,6 +30,7 @@ dependencies {
     implementation(libs.slf4j.api)
     compileOnly(libs.jsr305)
 
+    testImplementation project(':fdb-test-utils')
     testImplementation(libs.bundles.test.impl)
     testRuntimeOnly(libs.bundles.test.runtime)
     testCompileOnly(libs.bundles.test.compileOnly)

fdb-extensions/fdb-extensions.gradle

@@ -35,7 +35,7 @@ dependencies {
     compileOnly(libs.autoService)
     annotationProcessor(libs.autoService)
 
-    testImplementation testFixtures(project(':fdb-extensions'))
+    testImplementation project(':fdb-test-utils')
     testImplementation(libs.bundles.test.impl)
     testRuntimeOnly(libs.bundles.test.runtime)
     testCompileOnly(libs.bundles.test.compileOnly)

fdb-record-layer-core/fdb-record-layer-core.gradle

@@ -120,9 +120,6 @@ public Optional<QueryPredicate> toQueryPredicate(@Nullable final TypeRepository
             return compileTimeEvalMaybe(typeRepository);
         }
 
-        final var isLiteralList = inArrayValue.getCorrelatedTo().isEmpty();
-        SemanticException.check(isLiteralList, SemanticException.ErrorCode.UNSUPPORTED);
-
         if (typeRepository != null) {
             final var literalValue = Preconditions.checkNotNull(inArrayValue.evalWithoutStore(EvaluationContext.forTypeRepository(typeRepository)));
             return Optional.of(new ValuePredicate(probeValue, new Comparisons.ListComparison(Comparisons.Type.IN, (List<?>)literalValue)));
@@ -221,26 +218,31 @@ private static Value encapsulateInternal(@Nonnull final List<? extends Typed> ar
 
             final Typed arg1 = arguments.get(1);
             final Type res1 = arg1.getResultType();
-            SemanticException.check(res1.isArray(), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
+            SemanticException.check(res1.isArray() || res0.isArray(), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
+
+            final Type arrayType = res0.isArray() ? res0 : res1;
+            final Typed arrayArg = res0.isArray() ? arg0 : arg1;
+            final Type operandType = res0.isArray() ? res1 : res0;
+            final Typed operandArg = res0.isArray() ? arg1 : arg0;
 
-            final var arrayElementType = Objects.requireNonNull(((Type.Array) res1).getElementType());
-            if (!arrayElementType.isUnresolved() && res0.getTypeCode() != arrayElementType.getTypeCode()) {
-                final var maximumType = Type.maximumType(arg0.getResultType(), arrayElementType);
+            final var arrayElementType = Objects.requireNonNull(((Type.Array) arrayType).getElementType());
+            if (!arrayElementType.isUnresolved() && operandType.getTypeCode() != arrayElementType.getTypeCode()) {
+                final var maximumType = Type.maximumType(operandType, arrayElementType);
                 // Incompatible types
                 SemanticException.check(maximumType != null, SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
 
                 // Promote arg0 if the resulting type is different
-                if (!arg0.getResultType().equals(maximumType)) {
-                    return new InOpValue(PromoteValue.inject((Value)arg0, maximumType), (Value)arg1);
+                if (!operandType.equals(maximumType)) {
+                    return new InOpValue(PromoteValue.inject((Value)operandArg, maximumType), (Value)arrayArg);
                 } else {
-                    return new InOpValue((Value)arg0, PromoteValue.inject((Value)arg1, new Type.Array(maximumType)));
+                    return new InOpValue((Value)operandArg, PromoteValue.inject((Value)arrayArg, new Type.Array(maximumType)));
                 }
             }
 
-            if (res0.isRecord()) {
+            if (operandType.isRecord()) {
                 // we cannot yet promote this properly
                 SemanticException.check(arrayElementType.isRecord(), SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
-                final var probeElementTypes = Objects.requireNonNull(((Type.Record)res0).getElementTypes());
+                final var probeElementTypes = Objects.requireNonNull(((Type.Record)operandType).getElementTypes());
                 final var inElementTypes = Objects.requireNonNull(((Type.Record)arrayElementType).getElementTypes());
                 for (int i = 0; i < inElementTypes.size(); i++) {
                     final var probeElementType = probeElementTypes.get(i);
@@ -251,7 +253,7 @@ private static Value encapsulateInternal(@Nonnull final List<? extends Typed> ar
                             SemanticException.ErrorCode.INCOMPATIBLE_TYPE);
                 }
             }
-            return new InOpValue((Value)arg0, (Value)arg1);
+            return new InOpValue((Value)operandArg, (Value)arrayArg);
         }
     }
 

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

@@ -88,7 +88,7 @@ private static FDB getInitedFDB() {
             synchronized (FDBDatabaseExtension.class) {
                 if (fdb == null) {
                     // Note: in some ways, this mirrors the TestDatabaseExtension abstraction in the
-                    // fdb-extensions project. We could re-use this here, except that if we did, we'd
+                    // fdb-test-utils project. We could re-use this here, except that if we did, we'd
                     // never test the FDBDatabaseFactory's methods for initializing FDB
                     FDBDatabaseFactory baseFactory = FDBDatabaseFactory.instance();
                     if (TRACE) {

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

@@ -28,7 +28,7 @@ dependencies {
     compileOnly(libs.autoService)
     annotationProcessor(libs.autoService)
 
-    testImplementation testFixtures(project(':fdb-extensions'))
+    testImplementation project(':fdb-test-utils')
     testImplementation project(path: coreProject, configuration: 'tests')
     testImplementation(libs.bundles.test.impl)
     testRuntimeOnly(libs.bundles.test.runtime)

fdb-record-layer-icu/fdb-record-layer-icu.gradle

@@ -33,7 +33,7 @@ dependencies {
     compileOnly(libs.autoService)
     annotationProcessor(libs.autoService)
 
-    testImplementation testFixtures(project(':fdb-extensions'))
+    testImplementation project(':fdb-test-utils')
     testImplementation project(path: coreProject, configuration: 'tests')
     testImplementation(libs.bundles.test.impl)
     testImplementation(libs.lucene.testFramework)

fdb-record-layer-lucene/fdb-record-layer-lucene.gradle

@@ -36,7 +36,7 @@ dependencies {
     testImplementation(libs.bundles.test.impl)
     testRuntimeOnly(libs.bundles.test.runtime)
     testCompileOnly(libs.bundles.test.compileOnly)
-    testImplementation testFixtures(project(':fdb-extensions'))
+    testImplementation project(':fdb-test-utils')
     testImplementation project(path: coreProject, configuration: 'tests')
 }
 

fdb-record-layer-spatial/fdb-record-layer-spatial.gradle

@@ -1165,6 +1165,7 @@ expressionAtom
 inList
     : '(' (queryExpressionBody | expressions) ')'
     | preparedStatementParameter
+    | fullColumnName
     ;
 
 preparedStatementParameter