ISPN-14194 Restore the inefficiency for the aggregation

That is the way aggregations currently work, the inefficiency could be removed delegating them to Search! (see ISPN-13986)
infinispan · Oct 14, 2022 · 0dffcdb · 0dffcdb
1 parent fdfa766
commit 0dffcdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/query-core/src/main/java/org/infinispan/query/core/impl/QueryEngine.java b/query-core/src/main/java/org/infinispan/query/core/impl/QueryEngine.java
@@ -255,7 +255,8 @@ protected BaseQuery<?> buildQueryWithAggregations(QueryFactory queryFactory, Str
 
       // first phase: gather rows matching the 'where' clause
       String firstPhaseQueryStr = firstPhaseQuery.toString();
-      BaseQuery<?> baseQuery = buildQueryNoAggregations(queryFactory, firstPhaseQueryStr, namedParameters, -1, -1, parse(firstPhaseQueryStr), local);
+      // TODO ISPN-13986 Improve the efficiency of aggregation deletege them to Search!
+      BaseQuery<?> baseQuery = buildQueryNoAggregations(queryFactory, firstPhaseQueryStr, namedParameters, -1, Integer.MAX_VALUE, parse(firstPhaseQueryStr), local);
 
       // second phase: grouping, aggregation, 'having' clause filtering, sorting and pagination
       String secondPhaseQueryStr = secondPhaseQuery.toString();

diff --git a/query/src/main/java/org/infinispan/query/dsl/embedded/impl/QueryEngine.java b/query/src/main/java/org/infinispan/query/dsl/embedded/impl/QueryEngine.java
@@ -268,7 +268,8 @@ protected BaseQuery<?> buildQueryWithAggregations(QueryFactory queryFactory, Str
 
       // first phase: gather rows matching the 'where' clause
       String firstPhaseQueryStr = firstPhaseQuery.toString();
-      BaseQuery<?> baseQuery = buildQueryNoAggregations(queryFactory, firstPhaseQueryStr, namedParameters, -1, -1, parse(firstPhaseQueryStr), local);
+      // TODO ISPN-13986 Improve the efficiency of aggregation deletege them to Search!
+      BaseQuery<?> baseQuery = buildQueryNoAggregations(queryFactory, firstPhaseQueryStr, namedParameters, -1, Integer.MAX_VALUE, parse(firstPhaseQueryStr), local);
 
       // second phase: grouping, aggregation, 'having' clause filtering, sorting and pagination
       String secondPhaseQueryStr = secondPhaseQuery.toString();