diff --git a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java index 0af6e889b9f8c..870249f5db980 100644 --- a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java +++ b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java @@ -224,11 +224,11 @@ protected static class TestTree extends BPlusTree { /** */ private static PageLockTrackerManager mockPageLockTrackerManager() { - PageLockTrackerManager manager = mock(PageLockTrackerManager.class); + PageLockTrackerManager mgr = mock(PageLockTrackerManager.class); - when(manager.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR); + when(mgr.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR); - return manager; + return mgr; } } diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv index dad4c74e05f42..f7ca8b5ec4d19 100644 --- a/modules/checkstyle/src/main/resources/abbrevations.csv +++ b/modules/checkstyle/src/main/resources/abbrevations.csv @@ -38,7 +38,7 @@ label,lbl #local,loc logger,log loader,ldr -#manager,mgr +manager,mgr #message,msg #mutex,mux #network,net diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java index 773ff1b51b278..46535d73e8b8c 100644 --- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java +++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java @@ -311,9 +311,9 @@ private Ignite prepareGridForTest() throws Exception { private File indexPartition(Ignite ig, String groupName) { IgniteEx ig0 = (IgniteEx)ig; - FilePageStoreManager pageStoreManager = ((FilePageStoreManager)ig0.context().cache().context().pageStore()); + FilePageStoreManager pageStoreMgr = ((FilePageStoreManager)ig0.context().cache().context().pageStore()); - return new File(pageStoreManager.cacheWorkDir(true, groupName), INDEX_FILE_NAME); + return new File(pageStoreMgr.cacheWorkDir(true, groupName), INDEX_FILE_NAME); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java index a35b28503d24f..a1f0d1367f43d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java @@ -245,9 +245,9 @@ protected void removeClosedManager(CacheManager mgr) { if (fut != null && fut.isDone() && !fut.isFailed()) { try { - CacheManager cachedManager = fut.get(); + CacheManager cachedMgr = fut.get(); - if (cachedManager == mgr) + if (cachedMgr == mgr) uriMap.remove(mgr.getURI()); } catch (IgniteCheckedException e) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 298dfd6233d3b..4206b4c56deed 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -2543,7 +2543,7 @@ private RestoreLogicalState applyLogicalUpdates( RestoreLogicalState restoreLogicalState = new RestoreLogicalState(status, it, lastArchivedSegment, cacheGroupsPredicate, partitionRecoveryStates); - final IgniteTxManager txManager = cctx.tm(); + final IgniteTxManager txMgr = cctx.tm(); try { while (restoreLogicalState.hasNext()) { @@ -2557,7 +2557,7 @@ private RestoreLogicalState applyLogicalUpdates( if (restoreMeta) { // Also restore tx states. TxRecord txRec = (TxRecord)rec; - txManager.collectTxStates(txRec); + txMgr.collectTxStates(txRec); } break; @@ -2607,7 +2607,7 @@ private RestoreLogicalState applyLogicalUpdates( for (int i = 0; i < entryCnt; i++) { DataEntry dataEntry = dataRec.get(i); - if (!restoreMeta && txManager.uncommitedTx(dataEntry)) + if (!restoreMeta && txMgr.uncommitedTx(dataEntry)) continue; int cacheId = dataEntry.cacheId(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java index af0b9f079c184..1643eb01e5d50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java @@ -189,9 +189,9 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple RootPage reuseListRoot = metas.reuseListRoot; - GridCacheDatabaseSharedManager dbSharedManager = (GridCacheDatabaseSharedManager)ctx.database(); + GridCacheDatabaseSharedManager dbSharedMgr = (GridCacheDatabaseSharedManager)ctx.database(); - pageListCacheLimit = dbSharedManager.pageListCacheLimitHolder(grp.dataRegion()); + pageListCacheLimit = dbSharedMgr.pageListCacheLimitHolder(grp.dataRegion()); reuseList = new ReuseListImpl( grp.groupId(), @@ -224,7 +224,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple ctx.diagnostic().pageLockTracker() ); - dbSharedManager.addCheckpointListener(this, grp.dataRegion()); + dbSharedMgr.addCheckpointListener(this, grp.dataRegion()); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java index e28c48e788da2..f725d3970feaf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TransactionMetricsAdapter.java @@ -378,12 +378,12 @@ private long txHoldingLockNum() { * Count total number of locked keys on local node. */ private long txLockedKeysNum() { - GridCacheMvccManager mvccManager = gridKernalCtx.cache().context().mvcc(); + GridCacheMvccManager mvccMgr = gridKernalCtx.cache().context().mvcc(); - if (mvccManager == null) + if (mvccMgr == null) return 0; - return mvccManager.lockedKeys().size() + mvccManager.nearLockedKeys().size(); + return mvccMgr.lockedKeys().size() + mvccMgr.nearLockedKeys().size(); } /** {@inheritDoc} */ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java index 1fb49859c64d1..9139710216381 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java @@ -54,9 +54,9 @@ public void initLoggerMock() { */ @Test public void collisionResolutionDisabledMessageShouldBeLoggedAtInfoLevel() throws Exception { - GridCollisionManager manager = new GridCollisionManager(collisionResolutionDisabledContext()); + GridCollisionManager mgr = new GridCollisionManager(collisionResolutionDisabledContext()); - manager.start(); + mgr.start(); verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival)."); } diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java index d603b82a4343b..d4c69cbf04351 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsManageTest.java @@ -555,7 +555,7 @@ public void testTxContentionMetric() throws Exception { final Integer backKey = backupKey(cache); - IgniteTransactions txMgr = cl.transactions(); + IgniteTransactions cliTxMgr = cl.transactions(); CountDownLatch blockOnce = new CountDownLatch(1); @@ -577,7 +577,7 @@ public void testTxContentionMetric() throws Exception { } IgniteInternalFuture f = GridTestUtils.runAsync(() -> { - try (Transaction tx = txMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { + try (Transaction tx = cliTxMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { cache0.put(priKeys.get(0), 0); cache0.put(priKeys.get(2), 0); tx.commit(); @@ -590,7 +590,7 @@ public void testTxContentionMetric() throws Exception { for (int i = 0; i < contCnt; ++i) { IgniteInternalFuture f0 = GridTestUtils.runAsync(() -> { - try (Transaction tx = txMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { + try (Transaction tx = cliTxMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { cache0.put(priKeys.get(0), 0); cache0.put(priKeys.get(1), 0); @@ -601,7 +601,7 @@ public void testTxContentionMetric() throws Exception { txLatch.countDown(); } - try (Transaction tx = txMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { + try (Transaction tx = cliTxMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { cache0.put(priKeys.get(2), 0); cache0.put(backKey, 0); @@ -627,12 +627,12 @@ public void testTxContentionMetric() throws Exception { commSpi0.stopBlock(); } - IgniteTxManager txManager = ((IgniteEx)ig).context().cache().context().tm(); + IgniteTxManager srvTxMgr = ((IgniteEx)ig).context().cache().context().tm(); assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { try { - U.invoke(IgniteTxManager.class, txManager, "collectTxCollisionsInfo"); + U.invoke(IgniteTxManager.class, srvTxMgr, "collectTxCollisionsInfo"); } catch (IgniteCheckedException e) { fail(e.toString()); @@ -671,7 +671,7 @@ public void testKeyCollisionsMetricDifferentTimeout() throws Exception { Ignite cl = startGrid(); - IgniteTransactions txMgr = cl.transactions(); + IgniteTransactions cliTxMgr = cl.transactions(); CacheConfiguration dfltCacheCfg = getCacheConfiguration(); @@ -708,7 +708,7 @@ public void testKeyCollisionsMetricDifferentTimeout() throws Exception { } IgniteInternalFuture f = GridTestUtils.runAsync(() -> { - try (Transaction tx = txMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { + try (Transaction tx = cliTxMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { cache0.put(keyId, 0); tx.commit(); } @@ -720,7 +720,7 @@ public void testKeyCollisionsMetricDifferentTimeout() throws Exception { for (int i = 0; i < contCnt; ++i) { IgniteInternalFuture f0 = GridTestUtils.runAsync(() -> { - try (Transaction tx = txMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { + try (Transaction tx = cliTxMgr.txStart(PESSIMISTIC, READ_COMMITTED)) { cache0.put(keyId, 0); tx.commit(); @@ -746,7 +746,7 @@ public void testKeyCollisionsMetricDifferentTimeout() throws Exception { CacheMetrics localCacheMetrics = cache.localMetrics(); - IgniteTxManager txManager = ((IgniteEx)ig).context().cache().context().tm(); + IgniteTxManager srvTxMgr = ((IgniteEx)ig).context().cache().context().tm(); final TransactionsMXBean txMXBean1 = txMXBean(0); @@ -762,7 +762,7 @@ public void testKeyCollisionsMetricDifferentTimeout() throws Exception { ig.cache(cacheName).clearStatistics(); try { - U.invoke(IgniteTxManager.class, txManager, "collectTxCollisionsInfo"); + U.invoke(IgniteTxManager.class, srvTxMgr, "collectTxCollisionsInfo"); } catch (IgniteCheckedException e) { fail(e.toString()); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java index 113f3516c277f..19171ac170457 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePeekModesAbstractTest.java @@ -725,9 +725,9 @@ private T2 offheapKeysCount(int nodeIdx) { private T2 offheapKeysCount(int nodeIdx, int part) throws IgniteCheckedException { GridCacheContext ctx = ((IgniteEx)ignite(nodeIdx)).context().cache().internalCache(DEFAULT_CACHE_NAME).context(); // Swap and offheap are disabled for near cache. - IgniteCacheOffheapManager offheapManager = ctx.isNear() ? ctx.near().dht().context().offheap() : ctx.offheap(); + IgniteCacheOffheapManager offheapMgr = ctx.isNear() ? ctx.near().dht().context().offheap() : ctx.offheap(); //First count entries... - int cnt = (int)offheapManager.cacheEntriesCount(ctx.cacheId(), part); + int cnt = (int)offheapMgr.cacheEntriesCount(ctx.cacheId(), part); GridCacheAffinityManager aff = ctx.affinity(); AffinityTopologyVersion topVer = aff.affinityTopologyVersion(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java index 078f9d9d033e4..044c1233fb622 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingWithAsyncClearingTest.java @@ -164,14 +164,14 @@ public void testPartitionClearingNotBlockExchange() throws Exception { forceCheckpoint(); - GridCachePartitionExchangeManager exchangeManager = ig.cachex(CACHE_NAME).context().shared().exchange(); + GridCachePartitionExchangeManager exchangeMgr = ig.cachex(CACHE_NAME).context().shared().exchange(); - long topVer = exchangeManager.lastTopologyFuture().topologyVersion().topologyVersion(); + long topVer = exchangeMgr.lastTopologyFuture().topologyVersion().topologyVersion(); startGrid(2); // Check that exchange future is completed and version is incremented - GridDhtPartitionsExchangeFuture fut1 = exchangeManager.lastTopologyFuture(); + GridDhtPartitionsExchangeFuture fut1 = exchangeMgr.lastTopologyFuture(); fut1.get(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java index a0a1ebc72fb93..2b397a34d960f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWithTtlTest.java @@ -249,7 +249,7 @@ public void testPutOpsIntoCacheWithExpirationConcurrentlyWithCheckpointCompleteS AtomicBoolean timeoutReached = new AtomicBoolean(false); - CheckpointManager checkpointManager = U.field(ig0.context().cache().context().database(), "checkpointManager"); + CheckpointManager checkpointMgr = U.field(ig0.context().cache().context().database(), "checkpointManager"); IgniteInternalFuture ldrFut = runMultiThreadedAsync(() -> { while (!timeoutReached.get()) { @@ -271,7 +271,7 @@ public void testPutOpsIntoCacheWithExpirationConcurrentlyWithCheckpointCompleteS IgniteInternalFuture cpWriteLockUnlockFut = runAsync(() -> { Object checkpointReadWriteLock = U.field( - checkpointManager.checkpointTimeoutLock(), "checkpointReadWriteLock" + checkpointMgr.checkpointTimeoutLock(), "checkpointReadWriteLock" ); ReentrantReadWriteLockWithTracking lock = U.field(checkpointReadWriteLock, "checkpointLock"); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java index 2a6da78ae2b26..e89ed6b4d0dd7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/LightweightCheckpointTest.java @@ -142,7 +142,7 @@ public void testLightCheckpointAbleToStoreOnlyGivenDataRegion() throws Exception DataRegion regionForCheckpoint = db.dataRegion(DFLT_DATA_REG_DEFAULT_NAME); //and: Create light checkpoint with only one region. - LightweightCheckpointManager lightweightCheckpointManager = new LightweightCheckpointManager( + LightweightCheckpointManager lightweightCheckpointMgr = new LightweightCheckpointManager( ctx::log, ctx.igniteInstanceName(), "light-test-checkpoint", @@ -158,12 +158,12 @@ public void testLightCheckpointAbleToStoreOnlyGivenDataRegion() throws Exception ); //and: Add checkpoint listener for DEFAULT_CACHE in order of storing the meta pages. - lightweightCheckpointManager.addCheckpointListener( + lightweightCheckpointMgr.addCheckpointListener( (CheckpointListener)ctx.cache().cacheGroup(groupIdForCache(ignite0, DEFAULT_CACHE_NAME)).offheap(), regionForCheckpoint ); - lightweightCheckpointManager.start(); + lightweightCheckpointMgr.start(); //when: Fill the caches for (int j = 0; j < 1024; j++) { @@ -172,7 +172,7 @@ public void testLightCheckpointAbleToStoreOnlyGivenDataRegion() throws Exception } //and: Trigger and wait for the checkpoint. - lightweightCheckpointManager.forceCheckpoint("test", null) + lightweightCheckpointMgr.forceCheckpoint("test", null) .futureFor(CheckpointState.FINISHED) .get(); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/LinkMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/LinkMapTest.java index b953ae076053c..0614b2d0df060 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/LinkMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/defragmentation/LinkMapTest.java @@ -72,11 +72,11 @@ public void test() throws Exception { FullPageId pageId = new FullPageId(pageMem.allocatePage(cacheGroupId, 0, PageIdAllocator.FLAG_DATA), cacheGroupId); - PageLockTrackerManager pageLockTrackerManager = mock(PageLockTrackerManager.class); + PageLockTrackerManager pageLockTrackerMgr = mock(PageLockTrackerManager.class); - when(pageLockTrackerManager.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR); + when(pageLockTrackerMgr.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR); - LinkMap map = new LinkMap(cacheGroupId, groupName, pageMem, pageId.pageId(), true, pageLockTrackerManager); + LinkMap map = new LinkMap(cacheGroupId, groupName, pageMem, pageId.pageId(), true, pageLockTrackerMgr); for (int i = 0; i < 10_000; i++) map.put(i, i + 1); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java index fcd6516e196ec..fe2278918e2a0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithKeyContentionSelfTest.java @@ -229,7 +229,7 @@ private void runKeyCollisionsMetric(TransactionConcurrency concurrency, Transact Ignite cl = startGrid(); - IgniteTransactions txMgr = cl.transactions(); + IgniteTransactions cliTxMgr = cl.transactions(); IgniteCache cache = ig.cache(DEFAULT_CACHE_NAME); @@ -260,7 +260,7 @@ private void runKeyCollisionsMetric(TransactionConcurrency concurrency, Transact } IgniteInternalFuture f = GridTestUtils.runAsync(() -> { - try (Transaction tx = txMgr.txStart(concurrency, isolation)) { + try (Transaction tx = cliTxMgr.txStart(concurrency, isolation)) { cache0.put(keyId, 0); tx.commit(); } @@ -272,7 +272,7 @@ private void runKeyCollisionsMetric(TransactionConcurrency concurrency, Transact for (int i = 0; i < contCnt; ++i) { IgniteInternalFuture f0 = GridTestUtils.runAsync(() -> { - try (Transaction tx = txMgr.txStart(concurrency, isolation)) { + try (Transaction tx = cliTxMgr.txStart(concurrency, isolation)) { cache0.put(keyId, 0); tx.commit(); @@ -296,12 +296,12 @@ private void runKeyCollisionsMetric(TransactionConcurrency concurrency, Transact commSpi0.stopBlock(); } - IgniteTxManager txManager = ((IgniteEx)ig).context().cache().context().tm(); + IgniteTxManager srvTxMgr = ((IgniteEx)ig).context().cache().context().tm(); assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { try { - U.invoke(IgniteTxManager.class, txManager, "collectTxCollisionsInfo"); + U.invoke(IgniteTxManager.class, srvTxMgr, "collectTxCollisionsInfo"); } catch (IgniteCheckedException e) { fail(e.toString()); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeReuseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeReuseSelfTest.java index c3b0593386885..88ddf248d1fb0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeReuseSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeReuseSelfTest.java @@ -46,16 +46,16 @@ public class BPlusTreeReuseSelfTest extends BPlusTreeSelfTest { long rootId, boolean initNew ) throws IgniteCheckedException { - PageLockTrackerManager pageLockTrackerManager = mock(PageLockTrackerManager.class); + PageLockTrackerManager pageLockTrackerMgr = mock(PageLockTrackerManager.class); - when(pageLockTrackerManager.createPageLockTracker(anyString())).thenReturn(new TestPageLockListener()); + when(pageLockTrackerMgr.createPageLockTracker(anyString())).thenReturn(new TestPageLockListener()); return new TestReuseList( cacheId, "test", pageMem, rootId, - pageLockTrackerManager, + pageLockTrackerMgr, new GridTestKernalContext(log), initNew ); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java index 371128f38c0f0..af11bd726e4ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/CacheFreeListSelfTest.java @@ -527,9 +527,9 @@ private FreeList createFreeList(int pageSize) throws Exception { DataRegion dataRegion = new DataRegion(pageMem, plcCfg, regionMetrics, new NoOpPageEvictionTracker()); - PageLockTrackerManager pageLockTrackerManager = mock(PageLockTrackerManager.class); + PageLockTrackerManager pageLockTrackerMgr = mock(PageLockTrackerManager.class); - when(pageLockTrackerManager.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR); + when(pageLockTrackerMgr.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR); return new CacheFreeList( 1, @@ -538,7 +538,7 @@ private FreeList createFreeList(int pageSize) throws Exception { null, metaPageId, true, - pageLockTrackerManager, + pageLockTrackerMgr, new GridTestKernalContext(log), null, PageIdAllocator.FLAG_IDX diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java index 4a50e4030f7c8..0bf2d6d752b96 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java @@ -105,9 +105,9 @@ private void metaAllocation() throws Exception { IndexStorageImpl metaStore = storeMap.get(cacheId); if (metaStore == null) { - PageLockTrackerManager pageLockTrackerManager = mock(PageLockTrackerManager.class); + PageLockTrackerManager pageLockTrackerMgr = mock(PageLockTrackerManager.class); - when(pageLockTrackerManager.createPageLockTracker(anyString())).thenReturn(NOOP_LSNR); + when(pageLockTrackerMgr.createPageLockTracker(anyString())).thenReturn(NOOP_LSNR); metaStore = new IndexStorageImpl( "indexStorageTree", @@ -122,7 +122,7 @@ private void metaAllocation() throws Exception { mem.allocatePage(cacheId, PageIdAllocator.INDEX_PARTITION, PageMemory.FLAG_IDX), true, null, - pageLockTrackerManager + pageLockTrackerMgr ); storeMap.put(cacheId, metaStore);