IGNITE-14823 Initialize abbrevation (#11133)

apache · Dec 25, 2023 · 6a13ec7 · 6a13ec7
1 parent 23fc12f
commit 6a13ec7
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 45 deletions.
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -31,8 +31,8 @@ handler,hnd
 header,hdr
 implementation,impl
 index,idx
-#initial,init
-#initialize,init
+initial,init
+initialize,init
 #iterator,iter
 #label,lbl
 #local,loc

diff --git a/...nite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java b/...nite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
@@ -1754,11 +1754,11 @@ else if (state == MOVING) {
             for (int i = 0; i < cntrMap.size(); i++) {
                 int pId = cntrMap.partitionAt(i);
 
-                long initialUpdateCntr = cntrMap.initialUpdateCounterAt(i);
+                long initUpdateCntr = cntrMap.initialUpdateCounterAt(i);
                 long updateCntr = cntrMap.updateCounterAt(i);
 
                 if (this.cntrMap.updateCounter(pId) < updateCntr) {
-                    this.cntrMap.initialUpdateCounter(pId, initialUpdateCntr);
+                    this.cntrMap.initialUpdateCounter(pId, initUpdateCntr);
                     this.cntrMap.updateCounter(pId, updateCntr);
                 }
             }

diff --git a/...es/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java b/...es/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
@@ -159,12 +159,12 @@ private void checkDataRegionMetrics(IgniteEx ignite) throws IgniteCheckedExcepti
         }
 
         long offHeapSize = mreg.<LongMetric>findMetric("OffHeapSize").value();
-        long initialSize = mreg.<LongMetric>findMetric("InitialSize").value();
+        long initSize = mreg.<LongMetric>findMetric("InitialSize").value();
         long maxSize = mreg.<LongMetric>findMetric("MaxSize").value();
 
         assertTrue(offHeapSize > 0);
         assertTrue(offHeapSize <= region.config().getMaxSize());
-        assertEquals(region.config().getInitialSize(), initialSize);
+        assertEquals(region.config().getInitialSize(), initSize);
         assertEquals(region.config().getMaxSize(), maxSize);
     }
 

diff --git a/.../org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/.../org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -234,11 +234,11 @@ private void checkFullMessage(GridDhtPartitionsFullMessage msg) {
 
         if (partCntrs != null) {
             for (CachePartitionFullCountersMap cntrs : partCntrs.values()) {
-                long[] initialUpdCntrs = getFieldValue(cntrs, "initialUpdCntrs");
+                long[] initUpdCntrs = getFieldValue(cntrs, "initialUpdCntrs");
                 long[] updCntrs = getFieldValue(cntrs, "updCntrs");
 
-                for (int i = 0; i < initialUpdCntrs.length; i++) {
-                    assertEquals(0, initialUpdCntrs[i]);
+                for (int i = 0; i < initUpdCntrs.length; i++) {
+                    assertEquals(0, initUpdCntrs[i]);
                     assertEquals(0, updCntrs[i]);
                 }
             }

diff --git a/...ache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java b/...ache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java
@@ -155,7 +155,7 @@ private void doTestMarshallingBinaryMappingsLoadedFromClient(boolean receiveMeta
         CountDownLatch delayMappingLatch = new CountDownLatch(1);
         AtomicInteger loadKeys = new AtomicInteger(100);
         CountDownLatch evtReceiveLatch = new CountDownLatch(1);
-        int initialKeys = receiveMetadataOnClientJoin ? 10 : 0;
+        int initKeys = receiveMetadataOnClientJoin ? 10 : 0;
 
         IgniteEx srv1 = startGrid(0);
 
@@ -164,7 +164,7 @@ private void doTestMarshallingBinaryMappingsLoadedFromClient(boolean receiveMeta
                 msg instanceof MetadataResponseMessage);
 
         // Load data pior to the client note starts, so the client will receive the binary metadata on the client node join.
-        for (int i = 0; i < initialKeys; i++)
+        for (int i = 0; i < initKeys; i++)
             srv1.cache(DEFAULT_CACHE_NAME).put(i, createOrganization(extClsLdr, i));
 
         Ignite cl1 = startClientGrid(1,
@@ -221,7 +221,7 @@ private void doTestMarshallingBinaryMappingsLoadedFromClient(boolean receiveMeta
         GridTestUtils.runMultiThreadedAsync((Callable<Boolean>)() -> {
             int key;
 
-            while ((key = loadKeys.decrementAndGet()) > initialKeys && !Thread.currentThread().isInterrupted())
+            while ((key = loadKeys.decrementAndGet()) > initKeys && !Thread.currentThread().isInterrupted())
                 srv1.cache(DEFAULT_CACHE_NAME).put(key, createOrganization(extClsLdr, key));
 
             return true;

diff --git a/...va/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java b/...va/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -263,9 +263,9 @@ public void testTopologyChangesWithFixedBaseline() throws Exception {
 
         int part = ignite.affinity(CACHE_NAME).partition(key);
 
-        Collection<ClusterNode> initialMapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        Collection<ClusterNode> initMapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping.size() == 2 : initialMapping;
+        assert initMapping.size() == 2 : initMapping;
 
         ignite.cluster().setBaselineTopology(baselineNodes(nodes.keySet()));
 
@@ -275,22 +275,22 @@ public void testTopologyChangesWithFixedBaseline() throws Exception {
 
         Collection<ClusterNode> mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping.size() == mapping.size() : mapping;
-        assert initialMapping.containsAll(mapping) : mapping;
+        assert initMapping.size() == mapping.size() : mapping;
+        assert initMapping.containsAll(mapping) : mapping;
 
         IgniteEx newIgnite = startGrid(4);
 
         awaitPartitionMapExchange();
 
         mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping.size() == mapping.size() : mapping;
-        assert initialMapping.containsAll(mapping) : mapping;
+        assert initMapping.size() == mapping.size() : mapping;
+        assert initMapping.containsAll(mapping) : mapping;
 
         mapping = newIgnite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping.size() == mapping.size() : mapping;
-        assert initialMapping.containsAll(mapping) : mapping;
+        assert initMapping.size() == mapping.size() : mapping;
+        assert initMapping.containsAll(mapping) : mapping;
 
         Set<String> stoppedNodeNames = new HashSet<>();
 
@@ -307,7 +307,7 @@ public void testTopologyChangesWithFixedBaseline() throws Exception {
         mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
         assert mapping.size() == 1 : mapping;
-        assert initialMapping.containsAll(mapping);
+        assert initMapping.containsAll(mapping);
 
         node = mapping.iterator().next();
 
@@ -335,9 +335,9 @@ public void testTopologyChangesWithFixedBaseline() throws Exception {
 
         mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping.size() == mapping.size() : mapping;
+        assert initMapping.size() == mapping.size() : mapping;
 
-        for (ClusterNode n1 : initialMapping) {
+        for (ClusterNode n1 : initMapping) {
             boolean found = false;
 
             for (ClusterNode n2 : mapping) {
@@ -457,15 +457,15 @@ private void testBaselineTopologyChanges(boolean fromClient) throws Exception {
 
         assert key >= 0;
 
-        Collection<ClusterNode> initialMapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        Collection<ClusterNode> initMapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping.size() == 2 : initialMapping;
+        assert initMapping.size() == 2 : initMapping;
 
         ignite.cluster().setBaselineTopology(baselineNodes(nodes.keySet()));
 
         Set<String> stoppedNodeNames = new HashSet<>();
 
-        ClusterNode node = initialMapping.iterator().next();
+        ClusterNode node = initMapping.iterator().next();
 
         stoppedNodeNames.add(nodes.get(node).name());
 
@@ -478,7 +478,7 @@ private void testBaselineTopologyChanges(boolean fromClient) throws Exception {
         Collection<ClusterNode> mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
         assert mapping.size() == 1 : mapping;
-        assert initialMapping.containsAll(mapping);
+        assert initMapping.containsAll(mapping);
 
         Set<ClusterNode> blt2 = new HashSet<>(ignite.cluster().nodes());
 
@@ -487,18 +487,18 @@ private void testBaselineTopologyChanges(boolean fromClient) throws Exception {
 
         awaitPartitionMapExchange();
 
-        Collection<ClusterNode> initialMapping2 = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        Collection<ClusterNode> initMapping2 = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping2.size() == 2 : initialMapping2;
+        assert initMapping2.size() == 2 : initMapping2;
 
         Ignite newIgnite = startGrid(NODE_COUNT);
 
         awaitPartitionMapExchange();
 
         mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert mapping.size() == initialMapping2.size() : mapping;
-        assert mapping.containsAll(initialMapping2);
+        assert mapping.size() == initMapping2.size() : mapping;
+        assert mapping.containsAll(initMapping2);
 
         assert ignite.affinity(CACHE_NAME).primaryPartitions(newIgnite.cluster().localNode()).length == 0;
 
@@ -509,9 +509,9 @@ private void testBaselineTopologyChanges(boolean fromClient) throws Exception {
 
         awaitPartitionMapExchange();
 
-        Collection<ClusterNode> initialMapping3 = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
+        Collection<ClusterNode> initMapping3 = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert initialMapping3.size() == 2;
+        assert initMapping3.size() == 2;
 
         assert ignite.affinity(CACHE_NAME).primaryPartitions(newIgnite.cluster().localNode()).length > 0;
 
@@ -521,8 +521,8 @@ private void testBaselineTopologyChanges(boolean fromClient) throws Exception {
 
         mapping = ignite.affinity(CACHE_NAME).mapKeyToPrimaryAndBackups(key);
 
-        assert mapping.size() == initialMapping3.size() : mapping;
-        assert mapping.containsAll(initialMapping3);
+        assert mapping.size() == initMapping3.size() : mapping;
+        assert mapping.containsAll(initMapping3);
 
         assert ignite.affinity(CACHE_NAME).primaryPartitions(newIgnite.cluster().localNode()).length == 0;
 

diff --git a/...essors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/...essors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
@@ -271,7 +271,7 @@ public void testGetForInitialWrite() throws Exception {
         try (PartitionMetaStateRecordExcludeIterator it = new PartitionMetaStateRecordExcludeIterator(wal.replay(start))) {
             it.next();
 
-            for (FullPageId initialWrite : initWrites) {
+            for (FullPageId initWrite : initWrites) {
                 IgniteBiTuple<WALPointer, WALRecord> tup = it.next();
 
                 assertTrue(String.valueOf(tup.get2()), tup.get2() instanceof PageSnapshot);
@@ -289,7 +289,7 @@ public void testGetForInitialWrite() throws Exception {
                     actual = ((PageSnapshot)tup.get2()).fullPageId();
                 }
 
-                assertEquals(initialWrite, actual);
+                assertEquals(initWrite, actual);
             }
         }
     }

diff --git a/...g/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java b/...g/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
@@ -194,12 +194,12 @@ private void doTestConcurrentUpdates() throws Exception {
         IgniteCache<Long, Long> cache = server.createCache(ccfg);
 
         long accounts = 100;
-        long initialBalance = 100;
+        long initBalance = 100;
 
         for (long i = 0; i < accounts; i++)
-            cache.put(i, initialBalance);
+            cache.put(i, initBalance);
 
-        assertEquals(accounts * initialBalance, ((Number)
+        assertEquals(accounts * initBalance, ((Number)
             cache.query(new SqlFieldsQuery("select sum(_val) from Long use index()")
                 ).getAll().get(0).get(0)).longValue());
         assertTrue(CacheDataTree.isLastFindWithDataPageScan());
@@ -270,7 +270,7 @@ private void doTestConcurrentUpdates() throws Exception {
 
         IgniteInternalFuture<?> qryFut = multithreadedAsync(() -> {
             while (!cancel.get() && !Thread.interrupted()) {
-                assertEquals("wrong sum!", accounts * initialBalance, ((Number)
+                assertEquals("wrong sum!", accounts * initBalance, ((Number)
                     cache.query(new SqlFieldsQuery("select sum(_val) from Long use index()")
                         ).getAll().get(0).get(0)).longValue());
 //                info("query ok!");

diff --git a/...per/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/...per/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -3356,9 +3356,9 @@ private void onCommunicationErrorResolveStatusReceived(final ZkRuntimeState rtSt
 
         String futPath = zkPaths.distributedFutureBasePath(futId);
 
-        List<ClusterNode> initialNodes = rtState.commErrProcNodes;
+        List<ClusterNode> initNodes = rtState.commErrProcNodes;
 
-        assert initialNodes != null;
+        assert initNodes != null;
 
         rtState.commErrProcNodes = null;
 
@@ -3396,7 +3396,7 @@ private void onCommunicationErrorResolveStatusReceived(final ZkRuntimeState rtSt
             boolean fullyConnected = true;
 
             for (Map.Entry<UUID, BitSet> e : nodesRes.entrySet()) {
-                if (!checkFullyConnected(e.getValue(), initialNodes, rtState.top)) {
+                if (!checkFullyConnected(e.getValue(), initNodes, rtState.top)) {
                     fullyConnected = false;
 
                     break;
@@ -3421,7 +3421,7 @@ private void onCommunicationErrorResolveStatusReceived(final ZkRuntimeState rtSt
                     ZkCommunicationFailureContext ctx = new ZkCommunicationFailureContext(
                         ((IgniteKernal)spi.ignite()).context().cache().context(),
                         topSnapshot,
-                        initialNodes,
+                        initNodes,
                         nodesRes);
 
                     try {