From 8cc20bbd218e92cc8e50d28f934590fa3bc30ed0 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Fri, 6 Mar 2026 14:42:28 +0300 Subject: [PATCH 1/2] IGNITE-28092 Fixed flaky org.apache.ignite.cache.query.IndexQueryPaginationTest#nextPageTest test --- .../cache/query/IndexQueryPaginationTest.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java index 1e20a7b5b678f..a4102d4fd98c1 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java @@ -46,9 +46,6 @@ public class IndexQueryPaginationTest extends GridCommonAbstractTest { /** */ private static final int NODES = 2; - /** */ - private Ignite grid; - /** */ private IgniteCache cache; @@ -64,11 +61,13 @@ public static Object[] params() { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - grid = startGrids(NODES); + Ignite srv = startGrids(NODES); + + cache = srv.cache("cache"); - cache = grid.cache("cache"); + awaitPartitionMapExchange(); - insertData(grid, cache, entries); + insertData(srv, cache, entries); } /** {@inheritDoc} */ @@ -119,7 +118,7 @@ public void nextPageTest() { QueryCursor> cursor = cache.query( new IndexQuery(Person.class).setPageSize(PAGE_SIZE)); - assert entries == cursor.getAll().size(); + assertEquals(entries, cursor.getAll().size()); List msgs = new ArrayList<>(); @@ -131,18 +130,19 @@ public void nextPageTest() { int reqsSize = reqs.size(); - assert reqsSize == reqsExpected && reqsSize == resp.size(); + assertEquals(reqsExpected, reqsSize); + assertEquals(reqsSize, resp.size()); for (int i = 0; i < reqsSize; i++) { int reqPage = reqs.get(i).pageSize(); int respData = resp.get(i).data().size(); - assert reqPage == PAGE_SIZE; + assertEquals(PAGE_SIZE, reqPage); if (i == reqsSize - 1 && remNodeLastPageEntries != 0) - assert respData == remNodeLastPageEntries; + assertEquals(remNodeLastPageEntries, respData); else - assert respData == reqPage; + assertEquals(respData, reqPage); } } From ec147f80d7eaaae4011f77b40bb466b6609bac9b Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Fri, 6 Mar 2026 15:13:16 +0300 Subject: [PATCH 2/2] IGNITE-28092 Fixed flaky MultifieldIndexQueryTest.testCheckBoundaries test --- .../org/apache/ignite/cache/query/MultifieldIndexQueryTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java index 5f08e589ec22f..5e3c46f643bc8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java @@ -103,6 +103,8 @@ public static Collection testParams() { ignite = startGrids(nodesCnt); cache = ignite.cache(CACHE); + + awaitPartitionMapExchange(); } /** {@inheritDoc} */