Remove static find() method from YqlStatement #102
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lavrukov
force-pushed
the
table-refactoring-rem-find
branch
3 times, most recently
from
fe00e12 to
b8abd43
Compare
lavrukov
force-pushed
the
table-refactoring-rem-find
branch
from
b8abd43 to
e6fd1d3
Compare
lavrukov
requested review from
g-sg-v and
nvamelichev
and removed request for
g-sg-v
nvamelichev
requested changes
Dec 4, 2024
repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/statement/FindStatement.java
Outdated
Show resolved
Hide resolved
| @@ -888,12 +889,13 @@ public void complexIdLtYsingYqlPredicate() { | |||
|
|
|||
| private void executeQuery(String expectSqlQuery, List<IndexedEntity> expectRows, | |||
| Collection<? extends YqlStatementPart<?>> query) { | |||
| var statement = YqlStatement.find(IndexedEntity.class, query); | |||
| EntitySchema<IndexedEntity> schema = EntitySchema.of(IndexedEntity.class); | |||
There was a problem hiding this comment.
minor: style: var schema is preferable here, I think
| @@ -350,6 +352,8 @@ private CompletableFuture<Result<DataQueryResult>> convertEntity(List<Complex> c | |||
| } | |||
|
|
|||
| private Params convertId(Id id) { | |||
| return YdbConverter.convertToParams(YqlStatement.find(Complex.class).toQueryParameters(id)); | |||
| EntitySchema<Complex> schema = EntitySchema.of(Complex.class); | |||
There was a problem hiding this comment.
minor: style: var schema is preferable here, I think
| @@ -154,7 +156,9 @@ private <T extends Entity<T>> YdbRepository.Query<?> insert(T p) { | |||
|
|
|||
| @SuppressWarnings("unchecked") | |||
| private <T extends Entity<T>> YdbRepository.Query<?> find(T p) { | |||
| return new YdbRepository.Query<>(YqlStatement.find((Class<T>) p.getClass()), p.getId()); | |||
| EntitySchema<T> schema = EntitySchema.of((Class<T>) p.getClass()); | |||
There was a problem hiding this comment.
minor: style: var schema is preferable here, I think
There was a problem hiding this comment.
I prefer var only in new statements. It's little bit more symbols, but more understandable in RO mode, i think :)
repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/statement/FindStatement.java
Show resolved
Hide resolved
repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/statement/FindStatement.java
Show resolved
Hide resolved
nvamelichev
approved these changes
Dec 4, 2024
| @@ -223,14 +225,17 @@ public T find(Entity.Id<T> id) { | |||
| throw new IllegalArgumentException("Cannot use partial id in find method"); | |||
| } | |||
| return executor.getTransactionLocal().firstLevelCache().get(id, __ -> { | |||
| List<T> res = postLoad(executor.execute(YqlStatement.find(type), id)); | |||
| var statement = new FindYqlStatement<>(schema, schema); | |||
| List<T> res = postLoad(executor.execute(statement, id)); | |||
There was a problem hiding this comment.
minor: style: maybe also var res here?
| return res.isEmpty() ? null : res.get(0); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| public <V extends View> V find(Class<V> viewType, Entity.Id<T> id) { | ||
| List<V> res = executor.execute(YqlStatement.find(type, viewType), id); | ||
| ViewSchema<V> viewSchema = ViewSchema.of(viewType); |
There was a problem hiding this comment.
minor: style: maybe also var res and var viewSchema here?
| @@ -385,15 +391,19 @@ public <V extends View> List<V> find(Class<V> viewType, YqlStatementPart<?> part | |||
| } | |||
|
|
|||
| public <V extends View> List<V> find(Class<V> viewType, Collection<? extends YqlStatementPart<?>> parts, boolean distinct) { | |||
| return executor.execute(YqlStatement.find(type, viewType, distinct, parts), parts); | |||
| ViewSchema<V> viewSchema = ViewSchema.of(viewType); | |||
There was a problem hiding this comment.
minor: style: maybe also var viewSchema here?
| } | ||
|
|
||
| public <ID extends Entity.Id<T>> List<ID> findIds(YqlStatementPart<?> part, YqlStatementPart<?>... otherParts) { | ||
| return findIds(toList(part, otherParts)); | ||
| } | ||
|
|
||
| private <ID extends Entity.Id<T>> List<ID> findIds(Collection<? extends YqlStatementPart<?>> parts) { | ||
| return executor.execute(YqlStatement.findIds(type, parts), parts); | ||
| EntityIdSchema<ID> idSchema = EntityIdSchema.ofEntity(type); |
There was a problem hiding this comment.
minor: style: maybe also var idSchema here?
| @@ -450,7 +460,8 @@ public void delete(Entity.Id<T> id) { | |||
| * @param <ID> entity ID type | |||
| */ | |||
| public <ID extends Id<T>> void migrate(ID id) { | |||
| List<T> foundRaw = executor.execute(YqlStatement.find(type), id); | |||
| var statement = new FindYqlStatement<>(schema, schema); | |||
| List<T> foundRaw = executor.execute(statement, id); | |||
There was a problem hiding this comment.
minor: style: maybe also var foundRaw here?
repository-ydb-v2/src/main/java/tech/ydb/yoj/repository/ydb/statement/FindStatement.java
Outdated
Show resolved
Hide resolved
nvamelichev
pushed a commit
that referenced
this pull request
Dec 6, 2024
Co-authored-by: Alexander Lavrukov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.