This is an automated email from the ASF dual-hosted git repository.
rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new b357efdd7b IGNITE-24121 Use HeapLockManager with less slots in tests
(#4975)
b357efdd7b is described below
commit b357efdd7bc83350fe95f677ffcca80b9218e9cd
Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com>
AuthorDate: Fri Dec 27 09:45:58 2024 +0400
IGNITE-24121 Use HeapLockManager with less slots in tests (#4975)
---
.../java/org/apache/ignite/client/fakes/FakeIgniteTables.java | 2 +-
.../java/org/apache/ignite/internal/index/IndexManagerTest.java | 4 ++--
.../internal/partition/replicator/ItReplicaLifecycleTest.java | 2 +-
.../sql/engine/exec/ExecutableTableRegistrySelfTest.java | 2 +-
.../internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java | 2 +-
.../org/apache/ignite/internal/table/InteropOperationsTest.java | 2 +-
.../replication/PartitionReplicaListenerIndexLockingTest.java | 2 +-
.../PartitionReplicaListenerSortedIndexLockingTest.java | 2 +-
.../distributed/replication/PartitionReplicaListenerTest.java | 2 +-
.../java/org/apache/ignite/distributed/ItTxTestCluster.java | 4 ++--
.../ignite/internal/table/impl/DummyInternalTableImpl.java | 2 +-
.../java/org/apache/ignite/internal/tx/impl/HeapLockManager.java | 9 +++++++++
.../org/apache/ignite/internal/tx/impl/OrphanDetectorTest.java | 2 +-
13 files changed, 23 insertions(+), 14 deletions(-)
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
index 934b5b4701..539b8c8bb3 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
@@ -246,7 +246,7 @@ public class FakeIgniteTables implements
IgniteTablesInternal {
}
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager(1024, 1024);
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
index 1253f5d989..69066f8c4d 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
@@ -114,7 +114,7 @@ public class IndexManagerTest extends
BaseIgniteAbstractTest {
private final Map<Integer, TableViewInternal> tableViewInternalByTableId =
new ConcurrentHashMap<>();
- private TestLowWatermark lowWatermark = new TestLowWatermark();
+ private final TestLowWatermark lowWatermark = new TestLowWatermark();
@BeforeEach
public void setUp() {
@@ -222,7 +222,7 @@ public class IndexManagerTest extends
BaseIgniteAbstractTest {
}
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
index 8280c43628..b3f3930015 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java
@@ -1034,7 +1034,7 @@ public class ItReplicaLifecycleTest extends
BaseIgniteAbstractTest {
clusterIdHolder
);
- lockManager = new HeapLockManager();
+ lockManager = HeapLockManager.smallInstance();
var raftGroupEventsClientListener = new
RaftGroupEventsClientListener();
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
index 89f7faac20..5549817b35 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistrySelfTest.java
@@ -167,7 +167,7 @@ public class ExecutableTableRegistrySelfTest extends
BaseIgniteAbstractTest {
}
private LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
index 4af27e38f3..2ed56813e7 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
@@ -163,7 +163,7 @@ public class TableScanNodeExecutionTest extends
AbstractExecutionTest<Object[]>
txConfiguration,
clusterService,
replicaSvc,
- new HeapLockManager(1024, 1024),
+ HeapLockManager.smallInstance(),
clockService,
new TransactionIdGenerator(0xdeadbeef),
placementDriver,
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
index f6d9695181..f6c60076ff 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/InteropOperationsTest.java
@@ -151,7 +151,7 @@ public class InteropOperationsTest extends
BaseIgniteAbstractTest {
}
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
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 7ab9e26d73..0fa46d6cda 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
@@ -313,7 +313,7 @@ public class PartitionReplicaListenerIndexLockingTest
extends IgniteAbstractTest
}
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
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 af785a9569..df27d9ab5e 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
@@ -288,7 +288,7 @@ public class PartitionReplicaListenerSortedIndexLockingTest
extends IgniteAbstra
}
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
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 237e593153..9293aafa69 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
@@ -664,7 +664,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
}
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
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 332e316999..6a80b56d74 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
@@ -575,7 +575,7 @@ public class ItTxTestCluster {
clusterService.messagingService(),
clusterService.topologyService(),
replicaSvc,
- new HeapLockManager(),
+ HeapLockManager.smallInstance(),
clockService,
generator,
placementDriver,
@@ -1063,7 +1063,7 @@ public class ItTxTestCluster {
client.messagingService(),
client.topologyService(),
clientReplicaSvc,
- new HeapLockManager(),
+ HeapLockManager.smallInstance(),
clientClockService,
new TransactionIdGenerator(-1),
placementDriver,
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 1c916f71c1..d79cfcd011 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
@@ -561,7 +561,7 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
txConfiguration,
clusterService,
replicaSvc,
- new HeapLockManager(1024, 1024),
+ HeapLockManager.smallInstance(),
CLOCK_SERVICE,
new TransactionIdGenerator(0xdeadbeef),
placementDriver,
diff --git
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/HeapLockManager.java
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/HeapLockManager.java
index 9d13575b01..bf0e7709b8 100644
---
a/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/HeapLockManager.java
+++
b/modules/transactions/src/main/java/org/apache/ignite/internal/tx/impl/HeapLockManager.java
@@ -142,6 +142,15 @@ public class HeapLockManager extends
AbstractEventProducer<LockEvent, LockEventP
*/
private final AtomicLong lastTsPintWarn = new AtomicLong();
+ /**
+ * Creates an instance of {@link HeapLockManager} with a few slots
eligible for tests which don't stress the lock manager too much.
+ * Such a small instance is started way faster than a full-blown
production ready instance with a lot of slots.
+ */
+ @TestOnly
+ public static HeapLockManager smallInstance() {
+ return new HeapLockManager(1024, 1024);
+ }
+
/**
* Constructor.
*/
diff --git
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/OrphanDetectorTest.java
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/OrphanDetectorTest.java
index 9ecd188562..d106715ee1 100644
---
a/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/OrphanDetectorTest.java
+++
b/modules/transactions/src/test/java/org/apache/ignite/internal/tx/impl/OrphanDetectorTest.java
@@ -107,7 +107,7 @@ public class OrphanDetectorTest extends
BaseIgniteAbstractTest {
private OrphanDetector orphanDetector;
private static LockManager lockManager() {
- HeapLockManager lockManager = new HeapLockManager();
+ HeapLockManager lockManager = HeapLockManager.smallInstance();
lockManager.start(new WaitDieDeadlockPreventionPolicy());
return lockManager;
}
