IGNITE-26451 Fixed PerformanceStatisticsQueryTest to handle fetchAll scenario and improved GridCacheDistributedQueryFuture by passing cancel flag to onDone method

Author: chesnokoff

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java

@@ -40,6 +40,7 @@
 import org.apache.ignite.internal.processors.query.QueryUtils;
 import org.apache.ignite.internal.util.lang.GridPlainCallable;
 import org.apache.ignite.internal.util.typedef.internal.U;
+import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.INDEX;
 import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.TEXT;
@@ -144,8 +145,6 @@ private ClusterNode node(Collection<ClusterNode> nodes) {
         cctx.queries().onQueryFutureCanceled(reqId);
 
         clear();
-
-        onDone(err);
     }
 
     /** {@inheritDoc} */
@@ -326,8 +325,11 @@ private void cancelPages(UUID nodeId) {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean onDone(Collection<R> res, Throwable err) {
-        boolean done = super.onDone(res, err);
+    @Override protected boolean onDone(@Nullable Collection<R> res, @Nullable Throwable err, boolean cancel) {
+        boolean done = super.onDone(res, err, cancel);
+
+        if (!done)
+            return false;
 
         if (cctx.kernalContext().performanceStatistics().enabled() && startTimeNanos > 0) {
             GridCacheQueryType type = qry.query().type();
@@ -348,6 +350,6 @@ private void cancelPages(UUID nodeId) {
                 err == null || QueryUtils.wasCancelled(err));
         }
 
-        return done;
+        return true;
     }
 }

modules/indexing/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsQueryTest.java

@@ -169,12 +169,6 @@ public static Collection<?> parameters() {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        if (!fetchAll)
-            assumeTrue(pageSize < ENTRY_COUNT);
-    }
-
     /** {@inheritDoc} */
     @Override protected void afterTestsStopped() throws Exception {
         super.afterTestsStopped();