FMWK-199 Refactor implementation of paginated queries #658

agrgr · 2023-11-16T08:46:00Z

No description provided.

…antity

reugn · 2023-11-16T09:14:38Z

src/main/java/org/springframework/data/aerospike/core/ReactiveAerospikeTemplate.java

@@ -1177,6 +1177,12 @@ private <T> Flux<T> findUsingQueryWithPostProcessing(String setName, Class<T> ta
        return results;
    }

+    public <T> Flux<T> findUsingQueryWithoutPostProcessing(Class<?> entityClass, Class<T> targetClass, Query query) {


Add @Override

reugn · 2023-11-16T09:15:00Z

src/main/java/org/springframework/data/aerospike/core/ReactiveAerospikeOperations.java

@@ -868,6 +868,8 @@ <T, S> Flux<?> findByIdsUsingQuery(Collection<?> ids, Class<T> entityClass, Clas
     */
    <T, S> Flux<S> findInRange(long offset, long limit, Sort sort, Class<T> entityClass, Class<S> targetClass);

+    <T> Flux<T> findUsingQueryWithoutPostProcessing(Class<?> entityClass, Class<T> targetClass, Query query);


Javadoc is required

reugn · 2023-11-16T09:15:09Z

src/main/java/org/springframework/data/aerospike/core/AerospikeOperations.java

@@ -896,6 +896,8 @@ <T, S> List<?> findByIdsUsingQuery(Collection<?> ids, Class<T> entityClass, Clas
     */
    <T> Stream<T> findInRange(long offset, long limit, Sort sort, Class<T> targetClass, String setName);

+    <T> Stream<T> findUsingQueryWithoutPostProcessing(Class<?> entityClass, Class<T> targetClass, Query query);


Javadoc is required

reugn · 2023-11-16T09:15:28Z

src/main/java/org/springframework/data/aerospike/core/AerospikeTemplate.java

@@ -944,6 +944,12 @@ private <T> Stream<T> findUsingQueryWithPostProcessing(String setName, Class<T>
        return applyPostProcessingOnResults(results, query);
    }

+    public <T> Stream<T> findUsingQueryWithoutPostProcessing(Class<?> entityClass, Class<T> targetClass, Query query) {


Add @Override

reugn · 2023-11-16T09:16:07Z

src/main/java/org/springframework/data/aerospike/query/QueryEngine.java

@@ -54,6 +54,7 @@ public class QueryEngine {
     * scans, set this property to true.
     */
    private boolean scansEnabled = false;
+    private int queryMaxRecords = 100000;


Should be taken from AerospikeDataSettings?

reugn · 2023-11-16T09:17:03Z

src/main/java/org/springframework/data/aerospike/query/QueryEngine.java

@@ -128,6 +130,11 @@ public void setScansEnabled(boolean scansEnabled) {
        this.scansEnabled = scansEnabled;


reugn · 2023-11-16T09:17:10Z

src/main/java/org/springframework/data/aerospike/query/QueryEngine.java

@@ -128,6 +130,11 @@ public void setScansEnabled(boolean scansEnabled) {
        this.scansEnabled = scansEnabled;
    }

+    public void setQueryMaxRecords(int queryMaxRecords) {


reugn · 2023-11-16T09:17:18Z

src/main/java/org/springframework/data/aerospike/query/ReactorQueryEngine.java

@@ -115,4 +117,8 @@ private Mono<KeyRecord> getRecord(Policy policy, Key key, String[] binNames) {
    public void setScansEnabled(boolean scansEnabled) {
        this.scansEnabled = scansEnabled;
    }
+
+    public void setQueryMaxRecords(int queryMaxRecords) {


reugn · 2023-11-16T09:17:22Z

src/main/java/org/springframework/data/aerospike/query/ReactorQueryEngine.java

@@ -115,4 +117,8 @@ private Mono<KeyRecord> getRecord(Policy policy, Key key, String[] binNames) {
    public void setScansEnabled(boolean scansEnabled) {
        this.scansEnabled = scansEnabled;


roimenashe · 2023-11-16T12:52:32Z

src/main/java/org/springframework/data/aerospike/core/AerospikeOperations.java

+     * @return A Stream of all matching documents regardless of pagination/sorting, returned documents will be mapped to
+     * targetClass's type.
+     */
+    <T> Stream<T> findUsingQueryWithoutPostProcessing(Class<?> entityClass, Class<T> targetClass, Query query);


Why does entityClass is wrapped with Class<?>, usually when we have entity and target we use Class<T> for entityClass and Class<S> for targetClass, please align with rest of the methods

roimenashe · 2023-11-16T12:53:35Z

src/main/java/org/springframework/data/aerospike/core/ReactiveAerospikeOperations.java

+     * @return A Flux of all matching documents regardless of pagination/sorting, returned documents will be mapped to
+     * targetClass's type.
+     */
+    <T> Flux<T> findUsingQueryWithoutPostProcessing(Class<?> entityClass, Class<T> targetClass, Query query);


Same here Class<?>.

roimenashe · 2023-11-16T12:54:47Z

src/main/java/org/springframework/data/aerospike/repository/query/AerospikePartTreeQuery.java

@@ -40,15 +39,15 @@
 */
 public class AerospikePartTreeQuery extends BaseAerospikePartTreeQuery {

-    private final AerospikeOperations operations;
+    private final AerospikeTemplate template;


Why template instead of operations?

roimenashe · 2023-11-16T12:55:39Z

...java/org/springframework/data/aerospike/repository/query/ReactiveAerospikePartTreeQuery.java

@@ -35,14 +38,14 @@
 */
 public class ReactiveAerospikePartTreeQuery extends BaseAerospikePartTreeQuery {

-    private final ReactiveAerospikeOperations operations;
+    private final ReactiveAerospikeTemplate template;


Same (why template?)

roimenashe · 2023-11-16T12:57:11Z

src/test/java/org/springframework/data/aerospike/repository/PersonRepositoryQueryTests.java

@@ -1322,8 +1322,8 @@ public void findPersonsByQuery() {
            .setFilterOperation(FilterOperation.EQ)
            .setValue1(Value.get(49))
            .build();
-        result = repository.findUsingQuery(new Query(ageEq49));
-        assertThat(result).containsOnly(carter);
+//        result = repository.findUsingQuery(new Query(ageEq49));


Why commenting assertions? if its not relevant anymore remove

…ged()

roimenashe · 2023-11-20T13:11:27Z

src/main/java/org/springframework/data/aerospike/core/AerospikeTemplate.java

+        if (qualifier != null) {
+            Qualifier idQualifier = getOneIdQualifier(qualifier);
+            if (idQualifier != null) {
+                // a special flow if there is id given


Sounds grammatically wrong, maybe:
// Dedicate flow when id is given

Agree, updated to a similar phrase

roimenashe · 2023-11-20T13:11:47Z

src/main/java/org/springframework/data/aerospike/core/ReactiveAerospikeTemplate.java

+        if (qualifier != null) {
+            Qualifier idQualifier = getOneIdQualifier(qualifier);
+            if (idQualifier != null) {
+                // a special flow if there is id given


agrgr added 3 commits November 15, 2023 14:51

add queryMaxRecords configuration parameter to limit query results qu…

ce93b21

…antity

refactor paginated query processing

53cfc40

add support for paginated queries for reactive flow

6ff3802

agrgr added the enhancement label Nov 16, 2023

agrgr requested review from roimenashe and reugn November 16, 2023 08:46

cleanup

5d34e37

agrgr marked this pull request as ready for review November 16, 2023 08:57

reugn reviewed Nov 16, 2023

View reviewed changes

cleanup

52eb141

agrgr closed this Nov 16, 2023

agrgr reopened this Nov 16, 2023

Merge branch 'main' into FMWK-199-refactor-paginated-queries

f6ad97c

roimenashe reviewed Nov 16, 2023

View reviewed changes

agrgr added 3 commits November 16, 2023 15:32

cleanup

6328dd2

configure paginated queries processing, add support for Pageable.unpa…

2e80823

…ged()

cleanup

e9c4409

roimenashe approved these changes Nov 19, 2023

View reviewed changes

agrgr added 3 commits November 19, 2023 18:59

code format

35595d0

add support for Pageable.unpaged() for both sync and reactive flows

160e517

cleanup

1aaad1d

roimenashe reviewed Nov 20, 2023

View reviewed changes

agrgr added 3 commits November 20, 2023 17:46

rephrase

78adfb4

cleanup

afa5f62

cleanup

cf424a4

agrgr added 3 commits November 20, 2023 22:09

code format, update Javadoc

660af78

code format

ccc0f25

code format, remove unused parameters

ba5178f

reugn approved these changes Nov 21, 2023

View reviewed changes

agrgr merged commit 0f8c0ae into main Nov 21, 2023
5 checks passed

agrgr deleted the FMWK-199-refactor-paginated-queries branch November 21, 2023 11:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FMWK-199 Refactor implementation of paginated queries #658

FMWK-199 Refactor implementation of paginated queries #658

agrgr commented Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

reugn Nov 16, 2023

roimenashe Nov 16, 2023 •

edited

Loading

roimenashe Nov 16, 2023

roimenashe Nov 16, 2023

roimenashe Nov 16, 2023

roimenashe Nov 16, 2023

roimenashe Nov 20, 2023

agrgr Nov 20, 2023

roimenashe Nov 20, 2023

		@@ -128,6 +130,11 @@ public void setScansEnabled(boolean scansEnabled) {
		this.scansEnabled = scansEnabled;

		@@ -115,4 +117,8 @@ private Mono<KeyRecord> getRecord(Policy policy, Key key, String[] binNames) {
		public void setScansEnabled(boolean scansEnabled) {
		this.scansEnabled = scansEnabled;

FMWK-199 Refactor implementation of paginated queries #658

FMWK-199 Refactor implementation of paginated queries #658

Conversation

agrgr commented Nov 16, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roimenashe Nov 16, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roimenashe Nov 16, 2023 •

edited

Loading