Skip to content

Commit db62c8c

Browse files
authored
IGNITE-26850 Fix flaky RebuildIndexTest#testRebuildIndexWithLogging (#13027)
1 parent 55ec68d commit db62c8c

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/SchemaIndexCacheVisitorImpl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
package org.apache.ignite.internal.processors.query.schema;
1919

20+
import java.util.Comparator;
2021
import java.util.List;
2122
import java.util.Objects;
23+
import java.util.TreeSet;
2224
import java.util.concurrent.atomic.AtomicBoolean;
2325
import java.util.concurrent.atomic.AtomicInteger;
2426
import org.apache.ignite.IgniteCheckedException;
@@ -180,7 +182,10 @@ private String indexStatStr(SchemaIndexCacheStat stat) throws IgniteCheckedExcep
180182
cctx.cache().name(), type.schemaName(), tblName, pk)).unwrap(InlineIndex.class).totalCount());
181183
res.a(U.nl());
182184

183-
for (GridQueryIndexDescriptor descriptor : type.indexes().values()) {
185+
TreeSet<GridQueryIndexDescriptor> idxDescs = new TreeSet<>(Comparator.comparing(GridQueryIndexDescriptor::name));
186+
idxDescs.addAll(type.indexes().values());
187+
188+
for (GridQueryIndexDescriptor descriptor : idxDescs) {
184189
long size = idxProc.index(new IndexName(
185190
cctx.cache().name(), type.schemaName(), tblName, pk)).unwrap(InlineIndex.class).totalCount();
186191

modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public class RebuildIndexTest extends GridCommonAbstractTest {
6565
"Scanned rows 2, visited types \\[UserValue].*" +
6666
"Type name=UserValue.*" +
6767
"Index: name=_key_PK, size=2.*" +
68-
"Index: name=IDX_2, size=2.*" +
69-
"Index: name=IDX_1, size=2.*",
68+
"Index: name=IDX_1, size=2.*" +
69+
"Index: name=IDX_2, size=2.*",
7070
Pattern.DOTALL);
7171

7272
/** {@inheritDoc} */

0 commit comments

Comments
 (0)