This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-28311 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 61dd36afa27a2a3fc1e1ee850d0a48f94bf03c97 Author: AMashenkov <[email protected]> AuthorDate: Fri Mar 20 14:02:02 2026 +0300 minor --- .../ItTxDistributedTestSingleNodeNoCleanupMessage.java | 3 ++- .../main/java/org/apache/ignite/internal/table/TableImpl.java | 6 ++++-- .../java/org/apache/ignite/internal/table/TableViewInternal.java | 4 ++-- .../table/distributed/replicator/PartitionReplicaListener.java | 5 +++-- .../replication/PartitionReplicaListenerIndexLockingTest.java | 9 +++++---- .../PartitionReplicaListenerSortedIndexLockingTest.java | 5 ++--- .../distributed/replication/PartitionReplicaListenerTest.java | 6 +++++- .../replication/ZonePartitionReplicaListenerTest.java | 6 +++++- .../distributed/storage/InternalTableEstimatedSizeTest.java | 3 ++- .../java/org/apache/ignite/distributed/ItTxTestCluster.java | 8 +++++--- .../ignite/internal/table/impl/DummyInternalTableImpl.java | 3 ++- 11 files changed, 37 insertions(+), 21 deletions(-) diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java index f4af6166011..dd384a5ccd2 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ItTxDistributedTestSingleNodeNoCleanupMessage.java @@ -27,6 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -177,7 +178,7 @@ public class ItTxDistributedTestSingleNodeNoCleanupMessage extends TxAbstractTes Executor scanRequestExecutor, ZonePartitionId replicationGroupId, int tableId, - Supplier<Map<Integer, IndexLocker>> indexesLockers, + Supplier<Int2ObjectMap<IndexLocker>> indexesLockers, Lazy<TableSchemaAwareIndexStorage> pkIndexStorage, Supplier<Map<Integer, TableSchemaAwareIndexStorage>> secondaryIndexStorages, ClockService clockService, diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java index 967e27ef347..b05dc57f40a 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/TableImpl.java @@ -17,6 +17,8 @@ package org.apache.ignite.internal.table; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -267,11 +269,11 @@ public class TableImpl implements TableViewInternal { } @Override - public Supplier<Map<Integer, IndexLocker>> indexesLockers(int partId) { + public Supplier<Int2ObjectMap<IndexLocker>> indexesLockers(int partId) { return () -> { List<IndexWrapper> factories = new ArrayList<>(indexWrapperById.values()); - Map<Integer, IndexLocker> lockers = new HashMap<>(factories.size()); + Int2ObjectMap<IndexLocker> lockers = new Int2ObjectOpenHashMap<>(factories.size()); for (IndexWrapper factory : factories) { IndexLocker locker = factory.getLocker(partId); diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/TableViewInternal.java b/modules/table/src/main/java/org/apache/ignite/internal/table/TableViewInternal.java index cc715d1dbbb..e04fe5f29c9 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/TableViewInternal.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/TableViewInternal.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.table; -import java.util.Map; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import java.util.function.Supplier; import org.apache.ignite.internal.schema.ColumnsExtractor; import org.apache.ignite.internal.schema.SchemaRegistry; @@ -87,7 +87,7 @@ public interface TableViewInternal extends Table { TableIndexStoragesSupplier indexStorageAdapters(int partitionId); /** Returns a supplier of index locker factories for given partition. */ - Supplier<Map<Integer, IndexLocker>> indexesLockers(int partId); + Supplier<Int2ObjectMap<IndexLocker>> indexesLockers(int partId); /** * Registers the index with given id in a table. diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java index 5c7276e53dd..3cacdd0d399 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java @@ -62,6 +62,7 @@ import static org.apache.ignite.internal.util.IgniteUtils.inBusyLock; import static org.apache.ignite.internal.util.IgniteUtils.inBusyLockAsync; import static org.apache.ignite.lang.ErrorGroups.Replicator.CURSOR_CLOSE_ERR; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.BitSet; @@ -293,7 +294,7 @@ public class PartitionReplicaListener implements ReplicaTableProcessor { /** Runs async scan tasks for effective tail recursion execution (avoid deep recursive calls). */ private final Executor scanRequestExecutor; - private final Supplier<Map<Integer, IndexLocker>> indexesLockers; + private final Supplier<Int2ObjectMap<IndexLocker>> indexesLockers; private final ConcurrentMap<UUID, TxCleanupReadyState> txCleanupReadyFutures = new ConcurrentHashMap<>(); @@ -371,7 +372,7 @@ public class PartitionReplicaListener implements ReplicaTableProcessor { Executor scanRequestExecutor, ZonePartitionId replicationGroupId, int tableId, - Supplier<Map<Integer, IndexLocker>> indexesLockers, + Supplier<Int2ObjectMap<IndexLocker>> indexesLockers, Lazy<TableSchemaAwareIndexStorage> pkIndexStorage, Supplier<Map<Integer, TableSchemaAwareIndexStorage>> secondaryIndexStorages, ClockService clockService, diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java index 91859e8034f..02fad3dc230 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerIndexLockingTest.java @@ -46,6 +46,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -259,10 +260,10 @@ public class PartitionReplicaListenerIndexLockingTest extends IgniteAbstractTest Runnable::run, new ZonePartitionId(ZONE_ID, PART_ID), TABLE_ID, - () -> Map.of( - pkLocker.id(), pkLocker, - hashIndexLocker.id(), hashIndexLocker, - sortedIndexLocker.id(), sortedIndexLocker + () -> Int2ObjectMap.ofEntries( + Int2ObjectMap.entry(pkLocker.id(), pkLocker), + Int2ObjectMap.entry(hashIndexLocker.id(), hashIndexLocker), + Int2ObjectMap.entry(sortedIndexLocker.id(), sortedIndexLocker) ), pkStorage, () -> Map.of( diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java index 056847698ed..1b008c22f98 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerSortedIndexLockingTest.java @@ -47,6 +47,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -234,9 +235,7 @@ public class PartitionReplicaListenerSortedIndexLockingTest extends IgniteAbstra Runnable::run, new ZonePartitionId(ZONE_ID, PART_ID), TABLE_ID, - () -> Map.of( - pkLocker.id(), pkLocker - ), + () -> Int2ObjectMaps.singleton(pkLocker.id(), pkLocker), pkStorage, () -> Map.of(), CLOCK_SERVICE, diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java index 1ec87c9b292..4a238bb412d 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java @@ -92,6 +92,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.IntList; import java.nio.ByteBuffer; import java.util.Arrays; @@ -665,7 +666,10 @@ public class PartitionReplicaListenerTest extends IgniteAbstractTest { Runnable::run, new ZonePartitionId(tableDescriptor.zoneId(), PART_ID), TABLE_ID, - () -> Map.of(pkLocker.id(), pkLocker, sortedIndexId, sortedIndexLocker, hashIndexId, hashIndexLocker), + () -> Int2ObjectMap.ofEntries( + Int2ObjectMap.entry(pkLocker.id(), pkLocker), + Int2ObjectMap.entry(sortedIndexId, sortedIndexLocker), + Int2ObjectMap.entry(hashIndexId, hashIndexLocker)), pkStorageSupplier, () -> Map.of(sortedIndexId, sortedIndexStorage, hashIndexId, hashIndexStorage), clockService, diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java index 1ffffb15ac5..2d0dda8c1e0 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java @@ -71,6 +71,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.IntList; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -668,7 +669,10 @@ public class ZonePartitionReplicaListenerTest extends IgniteAbstractTest { Runnable::run, new ZonePartitionId(tableDescriptor.zoneId(), PART_ID), TABLE_ID, - () -> Map.of(pkLocker.id(), pkLocker, sortedIndexId, sortedIndexLocker, hashIndexId, hashIndexLocker), + () -> Int2ObjectMap.ofEntries( + Int2ObjectMap.entry(pkLocker.id(), pkLocker), + Int2ObjectMap.entry(sortedIndexId, sortedIndexLocker), + Int2ObjectMap.entry(hashIndexId, hashIndexLocker)), pkStorageSupplier, () -> Map.of(sortedIndexId, sortedIndexStorage, hashIndexId, hashIndexStorage), clockService, diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java index 12797dd12f6..3d356cd5f67 100644 --- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java +++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java @@ -42,6 +42,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -330,7 +331,7 @@ public class InternalTableEstimatedSizeTest extends BaseIgniteAbstractTest { ForkJoinPool.commonPool(), new ZonePartitionId(ZONE_ID, partId), TABLE_ID, - Map::of, + Int2ObjectMaps::emptyMap, new Lazy<>(() -> null), Map::of, clockService, diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java index 000c34dc4ec..41656bfdaf6 100644 --- a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java +++ b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java @@ -43,6 +43,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; @@ -814,7 +816,7 @@ public class ItTxTestCluster { txManagers.get(assignment), new ZonePartitionId(predefinedZoneId, partId), tableId, - () -> Map.of(pkLocker.id(), pkLocker), + () -> Int2ObjectMaps.singleton(pkLocker.id(), pkLocker), pkStorage, Map::of, clockServices.get(assignment), @@ -951,7 +953,7 @@ public class ItTxTestCluster { TxManager txManager, ZonePartitionId zonePartitionId, int tableId, - Supplier<Map<Integer, IndexLocker>> indexesLockers, + Supplier<Int2ObjectMap<IndexLocker>> indexesLockers, Lazy<TableSchemaAwareIndexStorage> pkIndexStorage, Supplier<Map<Integer, TableSchemaAwareIndexStorage>> secondaryIndexStorages, ClockService clockService, @@ -1067,7 +1069,7 @@ public class ItTxTestCluster { Executor scanRequestExecutor, ZonePartitionId replicationGroupId, int tableId, - Supplier<Map<Integer, IndexLocker>> indexesLockers, + Supplier<Int2ObjectMap<IndexLocker>> indexesLockers, Lazy<TableSchemaAwareIndexStorage> pkIndexStorage, Supplier<Map<Integer, TableSchemaAwareIndexStorage>> secondaryIndexStorages, ClockService clockService, diff --git a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java index d44eb9f8286..b28b54de74d 100644 --- a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java +++ b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java @@ -33,6 +33,7 @@ import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import java.io.Serializable; import java.util.Collections; import java.util.List; @@ -484,7 +485,7 @@ public class DummyInternalTableImpl extends InternalTableImpl { Runnable::run, zonePartitionId, tableId, - () -> Map.of(pkLocker.id(), pkLocker), + () -> Int2ObjectMaps.singleton(pkLocker.id(), pkLocker), pkStorage, Map::of, CLOCK_SERVICE,
