split-table: split Table interface by behavior

Author: Alexander Lavrukov

repository/src/main/java/tech/ydb/yoj/repository/db/AbstractDelegatingTable.java

@@ -6,6 +6,7 @@
 import tech.ydb.yoj.databind.expression.FilterExpression;
 import tech.ydb.yoj.databind.expression.OrderExpression;
 import tech.ydb.yoj.repository.BaseDb;
+import tech.ydb.yoj.repository.db.cache.FirstLevelCache;
 import tech.ydb.yoj.repository.db.readtable.ReadTableParams;
 import tech.ydb.yoj.repository.db.statement.Changeset;
 
@@ -32,6 +33,11 @@ private Class<T> resolveEntityType() {
         }).getRawType();
     }
 
+    @Override
+    public FirstLevelCache getFirstLevelCache() {
+        return target.getFirstLevelCache();
+    }
+
     @Override
     public List<T> find(@Nullable String indexName, @Nullable FilterExpression<T> filter, @Nullable OrderExpression<T> orderBy, @Nullable Integer limit, @Nullable Long offset) {
         return target.find(indexName, filter, orderBy, limit, offset);

repository/src/main/java/tech/ydb/yoj/repository/db/Table.java

@@ -1,355 +1,16 @@
 package tech.ydb.yoj.repository.db;
 
-import com.google.common.collect.Sets;
-import lombok.NonNull;
-import tech.ydb.yoj.databind.expression.FilterExpression;
-import tech.ydb.yoj.databind.expression.OrderExpression;
 import tech.ydb.yoj.repository.db.bulk.BulkParams;
-import tech.ydb.yoj.repository.db.cache.FirstLevelCache;
-import tech.ydb.yoj.repository.db.list.ListRequest;
-import tech.ydb.yoj.repository.db.list.ListResult;
-import tech.ydb.yoj.repository.db.list.ViewListResult;
-import tech.ydb.yoj.repository.db.readtable.ReadTableParams;
-import tech.ydb.yoj.repository.db.statement.Changeset;
+import tech.ydb.yoj.repository.db.table.TableReader;
+import tech.ydb.yoj.repository.db.table.WriteTable;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
-import static java.util.stream.Stream.concat;
-
-public interface Table<T extends Entity<T>> {
-    <ID extends Entity.Id<T>> Stream<T> readTable(ReadTableParams<ID> params);
-
-    <ID extends Entity.Id<T>> Stream<ID> readTableIds(ReadTableParams<ID> params);
-
-    <V extends ViewId<T>, ID extends Entity.Id<T>> Stream<V> readTable(Class<V> viewClass, ReadTableParams<ID> params);
-
-    Class<T> getType();
-
-    @CheckForNull
-    T find(Entity.Id<T> id);
-
-    <V extends View> V find(Class<V> viewType, Entity.Id<T> id);
-
-    <ID extends Entity.Id<T>> List<T> find(Range<ID> range);
-
-    <ID extends Entity.Id<T>> List<ID> findIds(Range<ID> range);
-
-    <ID extends Entity.Id<T>> List<ID> findIds(Set<ID> partialIds);
-
-    <V extends View, ID extends Entity.Id<T>> List<V> find(Class<V> viewType, Range<ID> range);
-
-    <V extends View, ID extends Entity.Id<T>> List<V> find(Class<V> viewType, Set<ID> ids);
-
-    List<T> findAll();
-
-    <V extends View> List<V> findAll(Class<V> viewType);
-
-    List<T> find(
-            @Nullable String indexName,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit,
-            @Nullable Long offset
-    );
-
-    <ID extends Entity.Id<T>> List<ID> findIds(
-            @Nullable String indexName,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit,
-            @Nullable Long offset
-    );
-
-    <V extends Table.View> List<V> find(
-            Class<V> viewType,
-            @Nullable String indexName,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit,
-            @Nullable Long offset,
-            boolean distinct
-    );
-
-    <ID extends Entity.Id<T>> List<T> find(
-            Set<ID> ids,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit
-    );
-
-    <ID extends Entity.Id<T>> List<T> findUncached(
-            Set<ID> ids,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit
-    );
-
-    <V extends Table.View, ID extends Entity.Id<T>> List<V> find(
-            Class<V> viewType,
-            Set<ID> ids,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit
-    );
-
-    <K> List<T> find(
-            String indexName,
-            Set<K> keys,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit
-    );
-
-    <V extends Table.View, K> List<V> find(
-            Class<V> viewType,
-            String indexName,
-            Set<K> keys,
-            @Nullable FilterExpression<T> filter,
-            @Nullable OrderExpression<T> orderBy,
-            @Nullable Integer limit
-    );
-
-    Stream<T> streamAll(int batchSize);
-
-    <V extends ViewId<T>> Stream<V> streamAll(Class<V> viewType, int batchSize);
-
-    <ID extends Entity.Id<T>> Stream<T> streamPartial(ID partial, int batchSize);
-
-    <ID extends Entity.Id<T>, V extends ViewId<T>> Stream<V> streamPartial(Class<V> viewType, ID partial, int batchSize);
-
-    <ID extends Entity.Id<T>> Stream<ID> streamAllIds(int batchSize);
-
-    <ID extends Entity.Id<T>> Stream<ID> streamPartialIds(ID partial, int batchSize);
-
-    long count(String indexName, FilterExpression<T> filter);
-
-    long countAll();
-
-    // Unsafe
-    T insert(T t);
-
-    // Unsafe
-    T save(T t);
-
-    // Unsafe: may delete only entity, but not its projections, if entity was not loaded
-    void delete(Entity.Id<T> id);
-
-    // Unsafe
-    void deleteAll();
-
-    default Stream<T> readTable() {
-        return readTable(ReadTableParams.getDefault());
-    }
-
-    default <ID extends Entity.Id<T>> Stream<ID> readTableIds() {
-        return readTableIds(ReadTableParams.getDefault());
-    }
-
-    default FirstLevelCache getFirstLevelCache() {
-        return null;
-    };
-
-    @NonNull
-    default <X extends Exception> T find(Entity.Id<T> id, Supplier<? extends X> throwIfAbsent) throws X {
-        T found = find(id);
-        if (found != null) {
-            return found;
-        } else {
-            throw throwIfAbsent.get();
-        }
-    }
-
-    default T findOrDefault(Entity.Id<T> id, Supplier<T> defaultSupplier) {
-        T found = find(id);
-        return found != null ? found : defaultSupplier.get();
-    }
-
-    default <V extends View, X extends Exception> V find(Class<V> viewType, Entity.Id<T> id, Supplier<? extends X> throwIfAbsent) throws X {
-        V found = find(viewType, id);
-        if (found != null) {
-            return found;
-        } else {
-            throw throwIfAbsent.get();
-        }
-    }
-
-    default T modifyIfPresent(Entity.Id<T> id, Function<T, T> modify) {
-        return Optional.ofNullable(find(id))
-                .map(modify)
-                .map(this::save)
-                .orElse(null);
-    }
-
-    default T generateAndSaveNew(@NonNull Supplier<T> generator) {
-        for (int i = 0; i < 7; i++) {
-            T t = generator.get();
-            if (find(t.getId()) == null) {
-                return save(t);
-            }
-        }
-        throw new IllegalStateException("Cannot generate unique entity id");
-    }
-
-    default <X extends Throwable> T saveNewOrThrow(@NonNull T t, @NonNull Supplier<? extends X> alreadyExists) throws X {
-        if (find(t.getId()) != null) {
-            throw alreadyExists.get();
-        }
-        return save(t);
-    }
-
-    default <X extends Throwable> T updateExistingOrThrow(@NonNull T t, @NonNull Supplier<? extends X> notFound) throws X {
-        if (find(t.getId()) == null) {
-            throw notFound.get();
-        }
-        return save(t);
-    }
-
-    default T saveOrUpdate(@NonNull T t) {
-        find(t.getId());
-        return save(t);
-    }
-
-    default T deleteIfExists(@NonNull Entity.Id<T> id) {
-        T t = find(id);
-        if (t != null) {
-            delete(id);
-        }
-        return t;
-    }
-
-    default <ID extends Entity.Id<T>> void deleteAll(Set<ID> ids) {
-        find(ids);
-        ids.forEach(this::delete);
-    }
-
-    default <ID extends Entity.Id<T>> void deleteAll(Range<ID> range) {
-        find(range).forEach(e -> delete(e.getId()));
-    }
-
-    // Unsafe
-    @SuppressWarnings("unchecked")
-    default void insert(T first, T... rest) {
-        insertAll(concat(Stream.of(first), Stream.of(rest)).collect(toList()));
-    }
-
-    // Unsafe
-    default void insertAll(Collection<? extends T> entities) {
-        entities.forEach(this::insert);
-    }
-
-    // Unsafe
-    default <ID extends Entity.Id<T>> void delete(Set<ID> ids) {
-        ids.forEach(this::delete);
-    }
-
-    // Unsafe
-    default <ID extends Entity.Id<T>> void delete(Range<ID> range) {
-        findIds(range).forEach(this::delete);
-    }
-
-    default ListResult<T> list(ListRequest<T> request) {
-        List<T> nextPage = toQueryBuilder(request).find();
-        return ListResult.forPage(request, postLoad(nextPage));
-    }
-
-    default <V extends Table.View> ViewListResult<T, V> list(Class<V> viewType, ListRequest<T> request) {
-        List<V> nextPage = toQueryBuilder(request).find(viewType);
-        return ViewListResult.forPage(request, viewType, nextPage);
-    }
-
-    default <ID extends Entity.Id<T>> List<T> find(Set<ID> ids) {
-        if (ids.isEmpty()) {
-            return List.of();
-        }
-
-        var orderBy = EntityExpressions.defaultOrder(getType());
-        var cache = getFirstLevelCache();
-        var isPartialIdMode = ids.iterator().next().isPartial();
-
-        var foundInCache = ids.stream()
-                .filter(cache::containsKey)
-                .map(cache::peek)
-                .flatMap(Optional::stream)
-                .collect(Collectors.toMap(Entity::getId, Function.identity()));
-        var remainingIds = Sets.difference(ids, foundInCache.keySet());
-        var foundInDb = findUncached(remainingIds, null, orderBy, null);
-
-        var merged = new HashMap<Entity.Id<T>, T>();
-
-        // some entries found in db with partial id query may already be in cache (after update/delete),
-        // so we must return actual entries from cache
-        for (var entry : foundInDb) {
-            var id = entry.getId();
-            if (cache.containsKey(id)) {
-                var cached = cache.peek(id);
-                cached.ifPresent(t -> merged.put(id, t));
-                // not present means marked as deleted in cache
-            } else {
-                merged.put(id, this.postLoad(entry));
-            }
-        }
-
-        // add entries found in cache and not fetched from db
-        for (var pair : foundInCache.entrySet()) {
-            var id = pair.getKey();
-            var entry = pair.getValue();
-            merged.put(id, entry);
-        }
-
-        if (!isPartialIdMode) {
-            Set<Entity.Id<T>> foundInDbIds = foundInDb.stream().map(Entity::getId).collect(toSet());
-            Set<Entity.Id<T>> foundInCacheIds = new HashSet<>(foundInCache.keySet());
-            Sets.difference(Sets.difference(ids, foundInDbIds), foundInCacheIds).forEach(cache::putEmpty);
-        }
-
-        return merged.values().stream().sorted(EntityIdSchema.SORT_ENTITY_BY_ID).collect(Collectors.toList());
-    }
 
+public interface Table<T extends Entity<T>> extends TableReader<T>, WriteTable<T> {
     default void bulkUpsert(List<T> input, BulkParams params) {
         throw new UnsupportedOperationException();
     }
 
-    default TableQueryBuilder<T> toQueryBuilder(ListRequest<T> request) {
-        return query()
-                .index(request.getIndex())
-                .filter(request.getFilter())
-                .orderBy(request.getOrderBy())
-                .offset(request.getOffset())
-                .limit(request.getPageSize() + 1);
-    }
-
-    default List<T> postLoad(List<T> list) {
-        return list.stream().map(this::postLoad).collect(Collectors.toList());
-    }
-
-    default T postLoad(T e) {
-        return e.postLoad();
-    }
-
-    default long count(FilterExpression<T> filter) {
-        return count(null, filter);
-    }
-
-    default TableQueryBuilder<T> query() {
-        return new TableQueryBuilder<>(this);
-    }
-
-    @Deprecated
-    void update(Entity.Id<T> id, Changeset changeset);
-
     interface View {
     }
 
@@ -361,7 +22,7 @@ interface ViewId<T extends Entity<T>> extends View {
      * Base interface for ID-aware table views that are Java {@link java.lang.Record records}.
      * <p>Forwards {@link ViewId#getId() ViewId's getId() method} to the record's {@code id()} accessor.
      *
-     * @param <E> entity type
+     * @param <T> entity type
      */
     interface RecordViewId<T extends Entity<T>> extends ViewId<T> {
         Entity.Id<T> id();