Merge branch 'main' into support-legacy-spliterator-for-streaming-scan-queries

nvamelichev · web-flow · commit 0a1b001d497e · 2025-07-25T19:42:09.000+02:00
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ If you wish to contribute to YOJ, see the [Notice to external contributors](CONT
 <dependency>
     <groupId>tech.ydb.yoj</groupId>
     <artifactId>yoj-bom</artifactId>
-    <version>2.6.22</version>
+    <version>2.6.23</version>
     <type>pom</type>
     <scope>import</scope>
 </dependency>
diff --git a/aspect/pom.xml b/aspect/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>tech.ydb.yoj</groupId>
     <artifactId>yoj-bom</artifactId>
-    <version>2.6.22</version>
+    <version>2.6.24-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>YOJ - Bill of Materials</name>
diff --git a/databind/pom.xml b/databind/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/schema/GlobalIndex.java b/databind/src/main/java/tech/ydb/yoj/databind/schema/GlobalIndex.java
@@ -38,6 +38,7 @@
 
     enum Type {
         GLOBAL,
+        GLOBAL_ASYNC,
         UNIQUE
     }
 }
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/schema/Schema.java b/databind/src/main/java/tech/ydb/yoj/databind/schema/Schema.java
@@ -4,6 +4,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.SneakyThrows;
@@ -186,7 +187,12 @@ name, getType(), fieldPath)
                 }
                 columns.add(field.getName());
             }
-            outputIndexes.add(new Index(name, List.copyOf(columns), index.type() == GlobalIndex.Type.UNIQUE));
+            outputIndexes.add(Index.builder()
+                .indexName(name)
+                .fieldNames(List.copyOf(columns))
+                .unique(index.type() == GlobalIndex.Type.UNIQUE)
+                .async(index.type() == GlobalIndex.Type.GLOBAL_ASYNC)
+                .build());
         }
         return outputIndexes;
     }
@@ -831,9 +837,10 @@ public FieldValueType getFieldValueType() {
 
     @Value
     @AllArgsConstructor
+    @Builder
     public static class Index {
         public Index(@NonNull String indexName, @NonNull List<String> fieldNames) {
-            this(indexName, fieldNames, false);
+            this(indexName, fieldNames, false, false);
         }
 
         @NonNull
@@ -844,6 +851,8 @@ public Index(@NonNull String indexName, @NonNull List<String> fieldNames) {
         List<String> fieldNames;
 
         boolean unique;
+
+        boolean async;
     }
 
     @Value
diff --git a/ext-meta-generator/pom.xml b/ext-meta-generator/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
     </parent>
 
     <name>YOJ - Meta generator</name>
diff --git a/json-jackson-v2/pom.xml b/json-jackson-v2/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>tech.ydb.yoj</groupId>
     <artifactId>yoj-parent</artifactId>
-    <version>2.6.22</version>
+    <version>2.6.24-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>YDB ORM for Java (YOJ)</name>
diff --git a/repository-inmemory/pom.xml b/repository-inmemory/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/repository-test/pom.xml b/repository-test/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/repository-ydb-common/pom.xml b/repository-ydb-common/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/repository-ydb-v2/pom.xml b/repository-ydb-v2/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>tech.ydb.yoj</groupId>
         <artifactId>yoj-parent</artifactId>
-        <version>2.6.22</version>
+        <version>2.6.24-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/client/YdbSchemaOperations.java b/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/client/YdbSchemaOperations.java
@@ -107,6 +107,8 @@ public void createTable(String name, List<EntitySchema.JavaField> columns, List<
         globalIndexes.forEach(index -> {
             if (index.isUnique()) {
                 builder.addGlobalUniqueIndex(index.getIndexName(), index.getFieldNames());
+            } else if (index.isAsync()) {
+                builder.addGlobalAsyncIndex(index.getIndexName(), index.getFieldNames());
             } else {
                 builder.addGlobalIndex(index.getIndexName(), index.getFieldNames());
             }
@@ -223,7 +225,7 @@ public Table describeTable(String name, List<EntitySchema.JavaField> columns, Li
                 })
                 .toList();
         List<Index> ydbIndexes = indexes.stream()
-                .map(i -> new Index(i.getIndexName(), i.getFieldNames(), i.isUnique()))
+                .map(i -> new Index(i.getIndexName(), i.getFieldNames(), i.isUnique(), i.isAsync()))
                 .toList();
         TtlModifier tableTtl = ttlModifier == null
                 ? null
@@ -342,7 +344,7 @@ private Table describeTableInternal(String path) {
                         })
                         .toList(),
                 table.getIndexes().stream()
-                        .map(i -> new Index(i.getName(), i.getColumns(), i.getType() == TableIndex.Type.GLOBAL_UNIQUE))
+                        .map(i -> new Index(i.getName(), i.getColumns(), i.getType() == TableIndex.Type.GLOBAL_UNIQUE, i.getType() == TableIndex.Type.GLOBAL_ASYNC))
                         .toList(),
                 table.getTableTtl() == null || table.getTableTtl().getTtlMode() == TableTtl.TtlMode.NOT_SET
                         ? null
@@ -484,6 +486,7 @@ public static class Index {
         String name;
         List<String> columns;
         boolean unique;
+        boolean async;
     }
 
     @Value
diff --git a/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/compatibility/YdbSchemaCompatibilityChecker.java b/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/compatibility/YdbSchemaCompatibilityChecker.java
@@ -292,7 +292,7 @@ private static String builderDDLPrimaryKey(YdbSchemaOperations.Table table) {
 
     private static String builderDDLIndexes(YdbSchemaOperations.Table table) {
         return table.getIndexes().stream()
-                .map(idx -> "\t\t.addGlobalIndex(" + javaLiteral(idx.getName()) + ", " +
+                .map(idx -> (idx.isAsync() ? "\t\t.addGlobalAsyncIndex(" : "\t\t.addGlobalIndex(") + javaLiteral(idx.getName()) + ", " +
                         idx.getColumns().stream()
                                 .map(YdbSchemaCompatibilityChecker::javaLiteral)
                                 .collect(joining(", "))
@@ -352,8 +352,13 @@ private static String indexes(YdbSchemaOperations.Table table) {
             return "\n";
         }
         return ",\n" + indexes.stream()
-                .map(idx -> "\tINDEX `" + idx.getName() + "` GLOBAL " + (idx.isUnique() ? "UNIQUE " : "") + "ON (" + indexColumns(idx.getColumns()) + ")")
-                .collect(Collectors.joining(",\n")) + "\n";
+            .map(idx -> "\t" + indexStatement(idx))
+            .collect(Collectors.joining(",\n")) + "\n";
+    }
+
+    private static String indexStatement(YdbSchemaOperations.Index idx) {
+        return String.format("INDEX `%s` GLOBAL %sON (%s)",
+            idx.getName(), idx.isUnique() ? "UNIQUE " : idx.isAsync() ? "ASYNC " : "", indexColumns(idx.getColumns()));
     }
 
     private static String indexColumns(List<String> columns) {
@@ -408,9 +413,7 @@ private void makeMigrationTableIndexInstructions(YdbSchemaOperations.Table from,
                 .collect(toMap(YdbSchemaOperations.Index::getName, Function.identity()));
 
         Function<YdbSchemaOperations.Index, String> createIndex = i ->
-                String.format("ALTER TABLE `%s` ADD INDEX `%s` GLOBAL " + (i.isUnique() ? "UNIQUE " : "") + "ON (%s);",
-                        to.getName(), i.getName(), i.getColumns().stream().map(c -> "`" + c + "`").collect(joining(","))
-                );
+            String.format("ALTER TABLE `%s` ADD %s;", to.getName(), indexStatement(i));
 
         Function<YdbSchemaOperations.Index, String> dropIndex = i ->
                 String.format("ALTER TABLE `%s` DROP INDEX `%s`;", from.getName(), i.getName());
diff --git a/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/yql/YqlPredicate.java b/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/yql/YqlPredicate.java
@@ -13,6 +13,7 @@
 import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Spliterator;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.BiFunction;
@@ -124,7 +125,16 @@ public static <T> YqlPredicate in(@NonNull String fieldPath,
     }
 
     public static <T> YqlPredicate in(@NonNull String fieldPath, @NonNull Collection<@NonNull ? extends T> values) {
-        return values.isEmpty() ? alwaysFalse() : inPredicate(fieldPath, ImmutableList.copyOf(values), InType.IN);
+        if (values.isEmpty()) {
+            return alwaysFalse();
+        }
+
+        T onlyElement;
+        if ((onlyElement = onlyElementOrNull(values)) != null) {
+            return eq(fieldPath, onlyElement);
+        }
+
+        return inPredicate(fieldPath, ImmutableList.copyOf(values), InType.IN);
     }
 
     @SafeVarargs
@@ -134,7 +144,28 @@ private static <T> YqlPredicate notIn(@NonNull String fieldPath,
     }
 
     private static <T> YqlPredicate notIn(@NonNull String fieldPath, @NonNull Collection<@NonNull ? extends T> values) {
-        return values.isEmpty() ? alwaysTrue() : inPredicate(fieldPath, ImmutableList.copyOf(values), InType.NOT_IN);
+        if (values.isEmpty()) {
+            return alwaysTrue();
+        }
+
+        T onlyElement;
+        if ((onlyElement = onlyElementOrNull(values)) != null) {
+            return neq(fieldPath, onlyElement);
+        }
+
+        return inPredicate(fieldPath, ImmutableList.copyOf(values), InType.NOT_IN);
+    }
+
+    @Nullable
+    private static <T> T onlyElementOrNull(@NonNull Collection<@NonNull ? extends T> coll) {
+        if (coll.isEmpty()) {
+            return null;
+        }
+
+        var iter = coll.iterator();
+        var firstElement = iter.next();
+        boolean isOnlyElement = !iter.hasNext();
+        return isOnlyElement ? Objects.requireNonNull(firstElement) : null;
     }
 
     public static <T> YqlPredicate eq(@NonNull String fieldPath, @Nullable T value) {
@@ -439,7 +470,7 @@ public List<YqlPredicateParam<?>> paramList() {
 
         @Override
         public YqlPredicate negate() {
-            return new LegacyRelPredicate<>(this.rel.negate(), this.fieldPath, this.param);
+            return new RelPredicate<>(this.rel.negate(), this.fieldPath, this.param);
         }
 
         @Override
diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YdbRepositoryIntegrationTest.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YdbRepositoryIntegrationTest.java
diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlPredicateTest.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlPredicateTest.java
diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeLegacyTest.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeLegacyTest.java
diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeRecommendedTest.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/YqlTypeRecommendedTest.java
diff --git a/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/model/IndexedEntityNew.java b/repository-ydb-v2/src/test/java/tech/ydb/yoj/repository/ydb/model/IndexedEntityNew.java
diff --git a/repository/pom.xml b/repository/pom.xml
diff --git a/util/pom.xml b/util/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`
`39`	`39`	`enum Type {`
`40`	`40`	`GLOBAL,`
	`41`	`+ GLOBAL_ASYNC,`
`41`	`42`	`UNIQUE`
`42`	`43`	`}`
`43`	`44`	`}`