You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2023/12/25 10:47:52 UTC
(ignite) branch master updated: IGNITE-14823 Initialize abbrevation (#11133)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6a13ec79d4a IGNITE-14823 Initialize abbrevation (#11133)
6a13ec79d4a is described below
commit 6a13ec79d4afe2b694a577102a7f10a7cd33a744
Author: Nikolay <ni...@apache.org>
AuthorDate: Mon Dec 25 13:47:43 2023 +0300
IGNITE-14823 Initialize abbrevation (#11133)
---
.../checkstyle/src/main/resources/abbrevations.csv | 4 +-
.../dht/topology/GridDhtPartitionTopologyImpl.java | 4 +-
.../metric/MetricsClusterActivationTest.java | 4 +-
.../CacheExchangeMessageDuplicatedStateTest.java | 6 +--
...teMarshallerCacheClientRequestsMappingTest.java | 6 +--
.../distributed/CacheBaselineTopologyTest.java | 46 +++++++++++-----------
...CheckpointSimulationWithRealCpDisabledTest.java | 4 +-
.../processors/query/h2/QueryDataPageScanTest.java | 8 ++--
.../zk/internal/ZookeeperDiscoveryImpl.java | 8 ++--
9 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index e42f1360a53..71df5acaf27 100644
--- 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/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
index a39212117ae..7625fe7e813 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
@@ -1754,11 +1754,11 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
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/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
index 427278314ec..96a8a4c82a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
@@ -159,12 +159,12 @@ public class MetricsClusterActivationTest extends GridCommonAbstractTest {
}
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/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index 0c521545372..648e2e90f70 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -234,11 +234,11 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
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/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java
index 5f19e41ca94..80f24d591e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingTest.java
@@ -155,7 +155,7 @@ public class IgniteMarshallerCacheClientRequestsMappingTest extends GridCommonAb
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 @@ public class IgniteMarshallerCacheClientRequestsMappingTest extends GridCommonAb
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 @@ public class IgniteMarshallerCacheClientRequestsMappingTest extends GridCommonAb
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/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index 7ef2e4cbe7a..794474bb375 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -263,9 +263,9 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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,8 +275,8 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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);
@@ -284,13 +284,13 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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 class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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 class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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,9 +487,9 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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);
@@ -497,8 +497,8 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
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/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
index f18337e42bf..7793c994f38 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java
@@ -271,7 +271,7 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
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 class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom
actual = ((PageSnapshot)tup.get2()).fullPageId();
}
- assertEquals(initialWrite, actual);
+ assertEquals(initWrite, actual);
}
}
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
index 9abf9dcb366..5e8f5d7e7ec 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/QueryDataPageScanTest.java
@@ -194,12 +194,12 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
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 @@ public class QueryDataPageScanTest extends GridCommonAbstractTest {
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/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 3b3b2546904..8b6718e5b99 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -3356,9 +3356,9 @@ public class ZookeeperDiscoveryImpl {
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 @@ public class ZookeeperDiscoveryImpl {
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 @@ public class ZookeeperDiscoveryImpl {
ZkCommunicationFailureContext ctx = new ZkCommunicationFailureContext(
((IgniteKernal)spi.ignite()).context().cache().context(),
topSnapshot,
- initialNodes,
+ initNodes,
nodesRes);
try {