(ignite) branch master updated: IGNITE-27834 SQL Calcite: Fix flaky CalciteBasicSecondaryIndexIntegrationTest.testOrderByDepId - Fixes #12734.

[alexpl]

This is an automated email from the ASF dual-hosted git repository.

alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 908d5ac2f53 IGNITE-27834 SQL Calcite: Fix flaky 
CalciteBasicSecondaryIndexIntegrationTest.testOrderByDepId - Fixes #12734.
908d5ac2f53 is described below

commit 908d5ac2f53af29503e6908c5a2adb4649983a91
Author: Aleksey Plekhanov <plehanov.a...@gmail.com>
AuthorDate: Tue Feb 17 09:49:11 2026 +0300

    IGNITE-27834 SQL Calcite: Fix flaky 
CalciteBasicSecondaryIndexIntegrationTest.testOrderByDepId - Fixes #12734.
    
    Signed-off-by: Aleksey Plekhanov <plehanov.a...@gmail.com>
---
 .../ignite/internal/processors/query/calcite/QueryChecker.java |  6 +++---
 .../integration/CalciteBasicSecondaryIndexIntegrationTest.java | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/QueryChecker.java
 
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/QueryChecker.java
index 86d789c8159..67534cee626 100644
--- 
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/QueryChecker.java
+++ 
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/QueryChecker.java
@@ -468,6 +468,9 @@ public abstract class QueryChecker {
         if (expectedResultSize >= 0)
             assertEquals("Unexpected result size", expectedResultSize, 
res.size());
 
+        if (resultChecker != null)
+            resultChecker.accept(res);
+
         if (expectedResult != null) {
             if (!ordered) {
                 // Avoid arbitrary order.
@@ -477,9 +480,6 @@ public abstract class QueryChecker {
 
             assertEqualsCollections(expectedResult, res);
         }
-
-        if (resultChecker != null)
-            resultChecker.accept(res);
     }
 
     /** */
diff --git 
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CalciteBasicSecondaryIndexIntegrationTest.java
 
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CalciteBasicSecondaryIndexIntegrationTest.java
index 7016a65f3d1..396eb28e8dc 100644
--- 
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CalciteBasicSecondaryIndexIntegrationTest.java
+++ 
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/CalciteBasicSecondaryIndexIntegrationTest.java
@@ -978,8 +978,14 @@ public class CalciteBasicSecondaryIndexIntegrationTest 
extends AbstractBasicInte
             .returns(21, "Cacciapaglia", 20, "", -1)
             .returns(22, "Prokofiev", 21, "", -1)
             .returns(23, "Musorgskii", 22, "", -1)
-
-            .ordered()
+            .withResultChecker(res -> {
+                // Check rows are ordered by depId, can't use ordered() 
method, since there are rows exist with
+                // duplicated depId and order is not determided for them.
+                for (int i = 1; i < res.size(); i++) {
+                    assertTrue("Unexpected rows order: " + res.get(i - 1) + ", 
" + res.get(i),
+                        (int)res.get(i - 1).get(2) <= (int)res.get(i).get(2));
+                }
+            })
             .check();
     }