ydb-platform#32 Support multiple tables under one entity (Review comm…

…ents)
g-sg-v · Dec 23, 2024 · 40ab237 · 40ab237
1 parent 6c30f74
commit 40ab237
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/YdbRepositoryTransaction.java b/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/YdbRepositoryTransaction.java
@@ -36,6 +36,7 @@
 import tech.ydb.yoj.repository.db.IsolationLevel;
 import tech.ydb.yoj.repository.db.RepositoryTransaction;
 import tech.ydb.yoj.repository.db.Table;
+import tech.ydb.yoj.repository.db.TableDescriptor;
 import tech.ydb.yoj.repository.db.TxOptions;
 import tech.ydb.yoj.repository.db.bulk.BulkParams;
 import tech.ydb.yoj.repository.db.cache.RepositoryCache;
@@ -126,8 +127,8 @@ public <T extends Entity<T>> Table<T> table(Class<T> c) {
      */
     @Override
     @ExperimentalApi(issue = "https://github.com/ydb-platform/yoj-project/issues/32")
-    public <T extends Entity<T>> Table<T> table(@NonNull Class<T> clazz, @NonNull String tableName) {
-        return new YdbTable<>(clazz, tableName, this);
+    public <T extends Entity<T>> Table<T> table(@NonNull TableDescriptor<T> descriptor) {
+        return new YdbTable<>(descriptor, this);
     }
 
     @Override

diff --git a/...rc/main/java/tech/ydb/yoj/repository/ydb/compatibility/YdbSchemaCompatibilityChecker.java b/...rc/main/java/tech/ydb/yoj/repository/ydb/compatibility/YdbSchemaCompatibilityChecker.java
@@ -52,8 +52,8 @@ public final class YdbSchemaCompatibilityChecker {
     private final List<String> canExecuteMessages = new ArrayList<>();
     private final List<String> incompatibleMessages = new ArrayList<>();
 
-    public YdbSchemaCompatibilityChecker(Map<String, Class<? extends Entity>> entities, YdbRepository repository) {
-        this(entities, repository, Config.DEFAULT);
+    public YdbSchemaCompatibilityChecker(YdbRepository repository, List<TableDescriptor<? extends Entity>> entities) {
+        this(repository, entities, Config.DEFAULT);
     }
 
     public YdbSchemaCompatibilityChecker(List<Class<? extends Entity>> entities, YdbRepository repository) {
@@ -67,8 +67,8 @@ public YdbSchemaCompatibilityChecker(List<Class<? extends Entity>> entities, Ydb
         this.repositoryConfig = this.repository.getConfig();
     }
 
-    public YdbSchemaCompatibilityChecker(Map<String, Class<? extends Entity>> entities, YdbRepository repository, Config config) {
-        this.entities = toDescriptors(entities);
+    public YdbSchemaCompatibilityChecker(YdbRepository repository, List<TableDescriptor<? extends Entity>> entities, Config config) {
+        this.entities = entities;
         this.config = config;
         this.repository = repository;
         this.repositoryConfig = this.repository.getConfig();
@@ -484,12 +484,6 @@ private static List<TableDescriptor<? extends Entity>> toDescriptors(List<Class<
         return descriptors;
     }
 
-    private static List<TableDescriptor<? extends Entity>> toDescriptors(Map<String, Class<? extends Entity>> entities) {
-        List<TableDescriptor<? extends Entity>> descriptors = new ArrayList<>();
-        entities.forEach((n, e) -> descriptors.add(TableDescriptor.from(EntitySchema.of(e), n)));
-        return descriptors;
-    }
-
     @Value
     @Builder
     @With

diff --git a/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/table/YdbTable.java b/repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/table/YdbTable.java
@@ -78,11 +78,11 @@ public YdbTable(Class<T> type, QueryExecutor executor) {
         this.tableDescriptor = TableDescriptor.from(schema);
     }
 
-    public YdbTable(Class<T> type, String name, QueryExecutor executor) {
-        this.type = type;
+    public YdbTable(TableDescriptor<T> descriptor, QueryExecutor executor) {
+        this.type = descriptor.entityType();
         this.executor = new CheckingQueryExecutor(executor);
         this.schema = EntitySchema.of(type);
-        this.tableDescriptor = TableDescriptor.from(schema, name);
+        this.tableDescriptor = descriptor;
     }
 
     protected YdbTable(QueryExecutor executor) {

diff --git a/repository/src/main/java/tech/ydb/yoj/repository/BaseDb.java b/repository/src/main/java/tech/ydb/yoj/repository/BaseDb.java
@@ -3,6 +3,7 @@
 import tech.ydb.yoj.ExperimentalApi;
 import tech.ydb.yoj.repository.db.Entity;
 import tech.ydb.yoj.repository.db.Table;
+import tech.ydb.yoj.repository.db.TableDescriptor;
 import tech.ydb.yoj.repository.db.Tx;
 import tech.ydb.yoj.util.lang.Proxies;
 
@@ -14,7 +15,7 @@ static <T> T current(Class<T> type) {
     <T extends Entity<T>> Table<T> table(Class<T> c);
 
     @ExperimentalApi(issue = "https://github.com/ydb-platform/yoj-project/issues/32")
-    default <T extends Entity<T>> Table<T> table(Class<T> c, String name) {
-        return table(c);
+    default <T extends Entity<T>> Table<T> table(TableDescriptor<T> descriptor) {
+        return table(descriptor.entityType());
     }
 }
diff --git a/repository/src/main/java/tech/ydb/yoj/repository/db/AbstractDelegatingTable.java b/repository/src/main/java/tech/ydb/yoj/repository/db/AbstractDelegatingTable.java
@@ -30,7 +30,7 @@ protected AbstractDelegatingTable() {
 
     @ExperimentalApi(issue = "https://github.com/ydb-platform/yoj-project/issues/32")
     protected AbstractDelegatingTable(@NonNull String tableName) {
-        this.target = BaseDb.current(BaseDb.class).table(resolveEntityType(), tableName);
+        this.target = BaseDb.current(BaseDb.class).table(TableDescriptor.from(EntitySchema.of(resolveEntityType()), tableName));
     }
 
     @SuppressWarnings("unchecked")