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 f4c1d6be9b4 IGNITE-14823 Version, subject abbrevations (#11211)
f4c1d6be9b4 is described below
commit f4c1d6be9b4f5184349bde54443ad8cb56c6dcda
Author: Nikolay <[email protected]>
AuthorDate: Wed Jan 31 14:34:49 2024 +0300
IGNITE-14823 Version, subject abbrevations (#11211)
---
.../integration/StatisticsCommandDdlIntegrationTest.java | 6 +++---
modules/checkstyle/src/main/resources/abbrevations.csv | 4 ++--
.../compatibility/clients/JavaThinCompatibilityTest.java | 4 ++--
.../compatibility/clients/JdbcThinCompatibilityTest.java | 4 ++--
.../persistence/IndexTypesCompatibilityTest.java | 4 ++--
.../persistence/InlineJavaObjectCompatibilityTest.java | 4 ++--
.../persistence/PersistenceBasicCompatibilityTest.java | 6 +++---
.../compatibility/testframework/util/MavenUtils.java | 6 +++---
.../org/apache/ignite/internal/IgniteMessagingImpl.java | 4 ++--
.../org/apache/ignite/internal/mem/file/MappedFile.java | 6 +++---
.../internal/processors/cache/ClusterCachesInfo.java | 4 ++--
.../persistence/wal/filehandle/FileWriteHandleImpl.java | 4 ++--
.../query/continuous/CacheContinuousQueryManager.java | 4 ++--
.../cache/tree/mvcc/search/MvccFirstRowTreeClosure.java | 4 ++--
.../processors/platform/PlatformProcessorImpl.java | 4 ++--
.../query/stat/IgniteGlobalStatisticsManager.java | 6 +++---
.../internal/processors/query/stat/StatisticsUtils.java | 16 ++++++++--------
.../ignite/internal/processors/query/stat/hll/HLL.java | 6 +++---
.../query/stat/hll/serialization/SchemaVersionOne.java | 4 ++--
.../query/stat/hll/serialization/SerializationUtil.java | 12 ++++++------
.../internal/client/thin/ServiceAwarenessTest.java | 12 ++++++------
.../junits/multijvm/IgniteProcessProxy.java | 10 +++++-----
.../junits/multijvm/JavaVersionCommand.java | 4 ++--
.../junits/multijvm/JavaVersionCommandParser.java | 4 ++--
.../LongRunningTransactionsGenerator.java | 10 +++++-----
.../processors/query/stat/StatisticsAbstractTest.java | 6 +++---
.../internal/processors/query/stat/hll/FullHLLTest.java | 10 +++++-----
27 files changed, 84 insertions(+), 84 deletions(-)
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
index dca7529c544..6e6e3db899c 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
@@ -128,11 +128,11 @@ public class StatisticsCommandDdlIntegrationTest extends
AbstractDdlIntegrationT
assertFalse(res.isEmpty());
assertFalse(res.get(0).isEmpty() || res.get(0).size() < 10);
- long version = (Long)res.get(0).get(9);
+ long ver = (Long)res.get(0).get(9);
assertThat(res, hasItems(
- Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, ID_FIELD,
(byte)2, 6L, 5L, 7L, 8, version),
- Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, NAME_FIELD,
(byte)2, 7L, 6L, 8L, null, version)
+ Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, ID_FIELD,
(byte)2, 6L, 5L, 7L, 8, ver),
+ Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, NAME_FIELD,
(byte)2, 7L, 6L, 8L, null, ver)
));
}
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 388657f7683..044b652ed05 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -68,9 +68,9 @@ sequence,seq
socket,sock
source,src
#string,s,str
-#subject,subj
+subject,subj
#system,sys
#topology,top
#topologyversion,topVer
#value,val
-#version,ver
\ No newline at end of file
+version,ver
\ No newline at end of file
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
index ba14f2eeb02..51fb0519586 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java
@@ -107,9 +107,9 @@ public class JavaThinCompatibilityTest extends
AbstractClientCompatibilityTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- int majorJavaVersion = U.majorJavaVersion(U.jdkVersion());
+ int majorJavaVer = U.majorJavaVersion(U.jdkVersion());
- if (majorJavaVersion > 11) {
+ if (majorJavaVer > 11) {
Assume.assumeTrue("Skipped on jdk " + U.jdkVersion(),
VER_2_12_0.compareTo(IgniteProductVersion.fromString(verFormatted)) < 0);
}
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JdbcThinCompatibilityTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JdbcThinCompatibilityTest.java
index 3c41d8180fb..bb0d070cb61 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JdbcThinCompatibilityTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JdbcThinCompatibilityTest.java
@@ -53,9 +53,9 @@ public class JdbcThinCompatibilityTest extends
AbstractClientCompatibilityTest {
@Override protected void beforeTest() throws Exception {
super.beforeTest();
- int majorJavaVersion = U.majorJavaVersion(U.jdkVersion());
+ int majorJavaVer = U.majorJavaVersion(U.jdkVersion());
- if (majorJavaVersion > 11) {
+ if (majorJavaVer > 11) {
Assume.assumeTrue("Skipped on jdk " + U.jdkVersion(),
VER_2_12_0.compareTo(IgniteProductVersion.fromString(verFormatted)) < 0);
}
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
index 2184d641edf..c1cf8dcf740 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IndexTypesCompatibilityTest.java
@@ -110,9 +110,9 @@ public class IndexTypesCompatibilityTest extends
IndexAbstractCompatibilityTest
/** */
@Test
public void testQueryOldIndex() throws Exception {
- int majorJavaVersion = U.majorJavaVersion(U.jdkVersion());
+ int majorJavaVer = U.majorJavaVersion(U.jdkVersion());
- if (majorJavaVersion > 11) {
+ if (majorJavaVer > 11) {
Assume.assumeTrue("Skipped on jdk " + U.jdkVersion(),
VER_2_12_0.compareTo(IgniteReleasedVersion.fromString(igniteVer)) < 0);
}
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
index e1b5aa60507..917a8bd7bc3 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/InlineJavaObjectCompatibilityTest.java
@@ -81,9 +81,9 @@ public class InlineJavaObjectCompatibilityTest extends
IndexAbstractCompatibilit
/** */
@Test
public void testQueryOldInlinedIndex() throws Exception {
- int majorJavaVersion = U.majorJavaVersion(U.jdkVersion());
+ int majorJavaVer = U.majorJavaVersion(U.jdkVersion());
- if (majorJavaVersion > 11) {
+ if (majorJavaVer > 11) {
Assume.assumeTrue("Skipped on jdk " + U.jdkVersion(),
VER_2_12_0.compareTo(IgniteReleasedVersion.fromString(igniteVer)) < 0);
}
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
index b23e57b38e2..dc06de7d0a7 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
@@ -102,13 +102,13 @@ public class PersistenceBasicCompatibilityTest extends
IgnitePersistenceCompatib
*/
@Test
public void testNodeStartByOldVersionPersistenceData() throws Exception {
- int majorJavaVersion = U.majorJavaVersion(U.jdkVersion());
+ int majorJavaVer = U.majorJavaVersion(U.jdkVersion());
- if (majorJavaVersion > 11) {
+ if (majorJavaVer > 11) {
Assume.assumeTrue("Skipped on jdk " + U.jdkVersion(),
VER_2_12_0.compareTo(IgniteReleasedVersion.fromString(version)) < 0);
}
- else if (majorJavaVersion > 8) {
+ else if (majorJavaVer > 8) {
Assume.assumeTrue("Skipped on jdk " + U.jdkVersion(),
VER_2_3_0.compareTo(IgniteReleasedVersion.fromString(version))
< 0);
}
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
index aeb9f27b649..d4f10085b19 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java
@@ -104,13 +104,13 @@ public class MavenUtils {
String groupId = names[0];
String artifactId = names[1];
- String version = names[2];
+ String ver = names[2];
String packaging = names.length > 3 ? names[3] : null;
String classifier = names.length > 4 ? names[4] : null;
String jarFileName = String.format("%s-%s%s.%s",
artifactId,
- version,
+ ver,
(classifier == null ? "" : "-" + classifier),
(packaging == null ? "jar" : packaging)
);
@@ -118,7 +118,7 @@ public class MavenUtils {
String pathToArtifact = getMavenLocalRepositoryPath() + File.separator
+
groupId.replace(".", File.separator) + File.separator +
artifactId.replace(".", File.separator) + File.separator +
- version + File.separator + jarFileName;
+ ver + File.separator + jarFileName;
if (Files.notExists(Paths.get(pathToArtifact)))
downloadArtifact(artifact);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
index a24012ae896..d1362d6625c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteMessagingImpl.java
@@ -232,9 +232,9 @@ public class IgniteMessagingImpl extends
AsyncSupportAdapter<IgniteMessaging>
IgniteBiPredicate<UUID, Object> res = (IgniteBiPredicate<UUID,
Object>)p;
if (ctx.security().enabled()) {
- final UUID subjectId =
ctx.security().securityContext().subject().id();
+ final UUID subjId =
ctx.security().securityContext().subject().id();
- return new SecurityAwareBiPredicate<>(subjectId, res);
+ return new SecurityAwareBiPredicate<>(subjId, res);
}
return res;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
index f264d87a315..01b8f81b1c1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFile.java
@@ -139,12 +139,12 @@ public class MappedFile implements Closeable,
DirectMemoryRegion {
/** */
private static Mapper pickMapper() {
- int javaVersion = majorJavaVersion(jdkVersion());
+ int javaVer = majorJavaVersion(jdkVersion());
- if (javaVersion >= 19)
+ if (javaVer >= 19)
return new JDK19Mapper();
- if (javaVersion >= 14)
+ if (javaVer >= 14)
return new JDK14Mapper();
return new LegacyMapper();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 17f9851575d..d421a95169a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -2390,9 +2390,9 @@ public class ClusterCachesInfo {
Collection<ClusterNode> nodes = discoCache.allNodes();
for (ClusterNode node : nodes) {
- IgniteProductVersion version = node.version();
+ IgniteProductVersion ver = node.version();
- if (version.compareToIgnoreTimestamp(V_MERGE_CONFIG_SINCE) < 0)
+ if (ver.compareToIgnoreTimestamp(V_MERGE_CONFIG_SINCE) < 0)
return false;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
index b29aecc78db..d9e063bcf06 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/filehandle/FileWriteHandleImpl.java
@@ -638,9 +638,9 @@ class FileWriteHandleImpl extends AbstractFileHandle
implements FileWriteHandle
* @return FSyncer suitable for the current JRE.
*/
private static MMapFSyncer pickFsyncer() {
- int javaVersion = majorJavaVersion(jdkVersion());
+ int javaVer = majorJavaVersion(jdkVersion());
- if (javaVersion >= 15)
+ if (javaVer >= 15)
return new JDK15FSyncer();
return new LegacyFSyncer();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index e21dc846545..186ef12f40d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -895,9 +895,9 @@ public class CacheContinuousQueryManager<K, V> extends
GridCacheManagerAdapter<K
GridKernalContext ctx = cctx.kernalContext();
if (ctx.security().enabled() &&
allNodesSupports(ctx.discovery().allNodes(), CONT_QRY_SECURITY_AWARE)) {
- final UUID subjectId =
ctx.security().securityContext().subject().id();
+ final UUID subjId =
ctx.security().securityContext().subject().id();
- return f.apply(subjectId, component);
+ return f.apply(subjId, component);
}
return component;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/search/MvccFirstRowTreeClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/search/MvccFirstRowTreeClosure.java
index bec7c1bc3a0..ebf152099ba 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/search/MvccFirstRowTreeClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/mvcc/search/MvccFirstRowTreeClosure.java
@@ -60,9 +60,9 @@ public class MvccFirstRowTreeClosure implements
MvccTreeClosure {
long pageAddr, int idx) throws IgniteCheckedException {
RowLinkIO rowIo = (RowLinkIO)io;
- MvccVersion newVersion = getNewVersion(cctx, rowIo.getLink(pageAddr,
idx));
+ MvccVersion newVer = getNewVersion(cctx, rowIo.getLink(pageAddr, idx));
- if (newVersion == null)
+ if (newVer == null)
res = tree.getRow(io, pageAddr, idx,
CacheDataRowAdapter.RowData.NO_KEY);
return false; // Stop search.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
index 6ce5e36bd2c..12f44be42f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformProcessorImpl.java
@@ -802,8 +802,8 @@ public class PlatformProcessorImpl extends
GridProcessorAdapter implements Platf
}
case OP_NODE_VERSION: {
- IgniteProductVersion productVersion =
ignite().cluster().node().version();
- PlatformUtils.writeNodeVersion(writer, productVersion);
+ IgniteProductVersion productVer =
ignite().cluster().node().version();
+ PlatformUtils.writeNodeVersion(writer, productVer);
return;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java
index 1a5798c24fc..5f7ee9d9feb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java
@@ -504,10 +504,10 @@ public class IgniteGlobalStatisticsManager implements
GridMessageListener {
if (cfg == null)
return false;
- for (Map.Entry<String, Long> version : versions.entrySet()) {
- StatisticsColumnConfiguration colCfg =
cfg.columns().get(version.getKey());
+ for (Map.Entry<String, Long> ver : versions.entrySet()) {
+ StatisticsColumnConfiguration colCfg =
cfg.columns().get(ver.getKey());
- if (colCfg == null || colCfg.version() < version.getValue())
+ if (colCfg == null || colCfg.version() < ver.getValue())
return false;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsUtils.java
index 5d7c8ed3229..bc6bf7a437e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/StatisticsUtils.java
@@ -190,13 +190,13 @@ public class StatisticsUtils {
if (stat == null)
return -1;
- for (Map.Entry<String, Long> version : versions.entrySet()) {
- ColumnStatistics colStat =
stat.columnsStatistics().get(version.getKey());
+ for (Map.Entry<String, Long> ver : versions.entrySet()) {
+ ColumnStatistics colStat =
stat.columnsStatistics().get(ver.getKey());
- if (colStat == null || colStat.version() < version.getValue())
+ if (colStat == null || colStat.version() < ver.getValue())
return -1;
- if (colStat.version() > version.getValue())
+ if (colStat.version() > ver.getValue())
return 1;
}
@@ -218,13 +218,13 @@ public class StatisticsUtils {
if (cfg == null)
return -1;
- for (Map.Entry<String, Long> colVersion : versions.entrySet()) {
- StatisticsColumnConfiguration colCfg =
cfg.columns().get(colVersion.getKey());
+ for (Map.Entry<String, Long> colVer : versions.entrySet()) {
+ StatisticsColumnConfiguration colCfg =
cfg.columns().get(colVer.getKey());
- if (colCfg == null || colCfg.version() < colVersion.getValue())
+ if (colCfg == null || colCfg.version() < colVer.getValue())
return -1;
- if (colCfg.version() > colVersion.getValue())
+ if (colCfg.version() > colVer.getValue())
return 1;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/HLL.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/HLL.java
index 8c519081cd1..288f2e9d62a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/HLL.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/HLL.java
@@ -1015,8 +1015,8 @@ public class HLL implements Cloneable {
* @see #toBytes(ISchemaVersion)
*/
public static HLL fromBytes(final byte[] bytes) {
- final ISchemaVersion schemaVersion =
SerializationUtil.getSchemaVersion(bytes);
- final IHLLMetadata metadata = schemaVersion.readMetadata(bytes);
+ final ISchemaVersion schemaVer =
SerializationUtil.getSchemaVersion(bytes);
+ final IHLLMetadata metadata = schemaVer.readMetadata(bytes);
final HLLType type = metadata.HLLType();
final int regwidth = metadata.registerWidth();
@@ -1060,7 +1060,7 @@ public class HLL implements Cloneable {
throw new RuntimeException("Unsupported HLL type " + type);
}
- final IWordDeserializer deserializer =
schemaVersion.getDeserializer(type, wordLength, bytes);
+ final IWordDeserializer deserializer = schemaVer.getDeserializer(type,
wordLength, bytes);
switch (type) {
case EXPLICIT:
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SchemaVersionOne.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SchemaVersionOne.java
index ba86e05b1d4..4849985bf20 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SchemaVersionOne.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SchemaVersionOne.java
@@ -80,11 +80,11 @@ public class SchemaVersionOne implements ISchemaVersion {
* @see net.agkn.hll.serialization.ISchemaVersion#readMetadata(byte[])
*/
@Override public IHLLMetadata readMetadata(final byte[] bytes) {
- final byte versionByte = bytes[0];
+ final byte verByte = bytes[0];
final byte parametersByte = bytes[1];
final byte cutoffByte = bytes[2];
- final int typeOrdinal = SerializationUtil.typeOrdinal(versionByte);
+ final int typeOrdinal = SerializationUtil.typeOrdinal(verByte);
final int explicitCutoffValue =
SerializationUtil.explicitCutoff(cutoffByte);
final boolean explicitOff = (explicitCutoffValue == EXPLICIT_OFF);
final boolean explicitAuto = (explicitCutoffValue == EXPLICIT_AUTO);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SerializationUtil.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SerializationUtil.java
index 9ce17ce0e76..211593d59ff 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SerializationUtil.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/hll/serialization/SerializationUtil.java
@@ -113,12 +113,12 @@ public class SerializationUtil {
if (schemaVersionNumber >= REGISTERED_SCHEMA_VERSIONS.length ||
schemaVersionNumber < 0)
throw new RuntimeException("Invalid schema version number " +
schemaVersionNumber);
- final ISchemaVersion schemaVersion =
REGISTERED_SCHEMA_VERSIONS[schemaVersionNumber];
+ final ISchemaVersion schemaVer =
REGISTERED_SCHEMA_VERSIONS[schemaVersionNumber];
- if (schemaVersion == null)
+ if (schemaVer == null)
throw new RuntimeException("Unknown schema version number " +
schemaVersionNumber);
- return schemaVersion;
+ return schemaVer;
}
/**
@@ -130,10 +130,10 @@ public class SerializationUtil {
* be <code>null</code>.
*/
public static ISchemaVersion getSchemaVersion(final byte[] bytes) {
- final byte versionByte = bytes[0];
- final int schemaVersionNumber = schemaVersion(versionByte);
+ final byte verByte = bytes[0];
+ final int schemaVerNumber = schemaVersion(verByte);
- return getSchemaVersion(schemaVersionNumber);
+ return getSchemaVersion(schemaVerNumber);
}
// ************************************************************************
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java
index d2cc68b3959..53d36b30752 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ServiceAwarenessTest.java
@@ -277,16 +277,16 @@ public class ServiceAwarenessTest extends
AbstractThinClientTest {
srvcTopOnClient.clear();
- AffinityTopologyVersion prevTopVersion =
grid(0).context().discovery().topologyVersionEx();
+ AffinityTopologyVersion prevTopVer =
grid(0).context().discovery().topologyVersionEx();
grid(0).createCache("testCache");
awaitPartitionMapExchange();
- AffinityTopologyVersion newTopVersion =
grid(0).context().discovery().topologyVersionEx();
+ AffinityTopologyVersion newTopVer =
grid(0).context().discovery().topologyVersionEx();
- assertTrue(newTopVersion.topologyVersion() ==
prevTopVersion.topologyVersion()
- && newTopVersion.minorTopologyVersion() >
prevTopVersion.minorTopologyVersion());
+ assertTrue(newTopVer.topologyVersion() ==
prevTopVer.topologyVersion()
+ && newTopVer.minorTopologyVersion() >
prevTopVer.minorTopologyVersion());
while (srvcTopOnClient.isEmpty())
svc.testMethod();
@@ -322,7 +322,7 @@ public class ServiceAwarenessTest extends
AbstractThinClientTest {
&& srvcTopOnClient.contains(grid(1).localNode().id())
&& srvcTopOnClient.contains(grid(2).localNode().id()));
- long prevTopVersion =
grid(0).context().discovery().topologyVersion();
+ long prevTopVer = grid(0).context().discovery().topologyVersion();
grid(1).services().cancel(SRV_NAME);
@@ -334,7 +334,7 @@ public class ServiceAwarenessTest extends
AbstractThinClientTest {
waitForCondition(() ->
!grid(0).services().serviceDescriptors().isEmpty(), getTestTimeout());
- assertEquals(prevTopVersion,
grid(0).context().discovery().topologyVersion());
+ assertEquals(prevTopVer,
grid(0).context().discovery().topologyVersion());
((GridTestLog4jLogger)log).setLevel(Level.DEBUG);
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index 30a13e5509c..456a0b99816 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -220,12 +220,12 @@ public class IgniteProcessProxy implements IgniteEx {
* @throws InterruptedException If we get interrupted.
*/
private static void validateRemoteJre(@Nullable String javaHome) throws
IOException, InterruptedException {
- int remoteMajorVersion = new
JavaVersionCommand().majorVersion(javaHome);
- int localMajorVersion =
U.majorJavaVersion(System.getProperty("java.version"));
+ int remoteMajorVer = new JavaVersionCommand().majorVersion(javaHome);
+ int localMajorVer =
U.majorJavaVersion(System.getProperty("java.version"));
- if (localMajorVersion != remoteMajorVersion) {
- fail("Version of remote java with home at '" + javaHome + "' (" +
remoteMajorVersion +
- ") is different from local java version (" + localMajorVersion
+ "). " +
+ if (localMajorVer != remoteMajorVer) {
+ fail("Version of remote java with home at '" + javaHome + "' (" +
remoteMajorVer +
+ ") is different from local java version (" + localMajorVer +
"). " +
"Make sure test.multijvm.java.home property specifies a path
to a correct Java installation");
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java
index 80fa5be2d25..e3a2fa91924 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java
@@ -48,9 +48,9 @@ class JavaVersionCommand {
readStream(proc.getErrorStream()) + "'");
}
- String versionOutput = readStream(proc.getErrorStream());
+ String verOutput = readStream(proc.getErrorStream());
- return JavaVersionCommandParser.extractMajorVersion(versionOutput);
+ return JavaVersionCommandParser.extractMajorVersion(verOutput);
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommandParser.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommandParser.java
index 6b97f9696be..30159e54893 100644
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommandParser.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommandParser.java
@@ -41,8 +41,8 @@ class JavaVersionCommandParser {
versionCommandOutput + "'");
}
- String fullJavaVersion = matcher.group(2);
+ String fullJavaVer = matcher.group(2);
- return U.majorJavaVersion(fullJavaVersion);
+ return U.majorJavaVersion(fullJavaVer);
}
}
diff --git
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
index 7e4bc904cf8..cf17378fc83 100644
---
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
+++
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
@@ -61,7 +61,7 @@ public class LongRunningTransactionsGenerator extends
IgniteAwareApplication {
String lbl = jsonNode.get("label") != null ?
jsonNode.get("label").asText() : null;
- long expectedTopologyVersion =
jsonNode.get("wait_for_topology_version") != null ?
+ long expectedTopologyVer = jsonNode.get("wait_for_topology_version")
!= null ?
jsonNode.get("wait_for_topology_version").asLong() : -1L;
CountDownLatch lockLatch = new CountDownLatch(txCnt);
@@ -70,17 +70,17 @@ public class LongRunningTransactionsGenerator extends
IgniteAwareApplication {
markInitialized();
- if (expectedTopologyVersion > 0) {
- log.info("Start waiting for topology version: " +
expectedTopologyVersion + ", " +
+ if (expectedTopologyVer > 0) {
+ log.info("Start waiting for topology version: " +
expectedTopologyVer + ", " +
"current version is: " + ignite.cluster().topologyVersion());
long start = System.nanoTime();
- while (ignite.cluster().topologyVersion() < expectedTopologyVersion
+ while (ignite.cluster().topologyVersion() < expectedTopologyVer
&& Duration.ofNanos(start -
System.nanoTime()).compareTo(TOPOLOGY_WAIT_TIMEOUT) < 0)
Thread.sleep(100L);
- log.info("Finished waiting for topology version: " +
expectedTopologyVersion + ", " +
+ log.info("Finished waiting for topology version: " +
expectedTopologyVer + ", " +
"current version is: " + ignite.cluster().topologyVersion());
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java
index 7d2823c8615..8c87170a466 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsAbstractTest.java
@@ -555,14 +555,14 @@ public abstract class StatisticsAbstractTest extends
GridCommonAbstractTest {
try {
checkStatisticTasksEmpty(ign);
- for (Map.Entry<StatisticsTarget, Long> targetVersionEntry :
expectedVersions.entrySet()) {
- StatisticsTarget target = targetVersionEntry.getKey();
+ for (Map.Entry<StatisticsTarget, Long> targetVerEntry :
expectedVersions.entrySet()) {
+ StatisticsTarget target = targetVerEntry.getKey();
// Statistics configuration manager could not get fresh
enough configuration version till now so we
// need to request global statistics again to force it's
collection
// TODO: remove me
statisticsMgr(ign).getGlobalStatistics(target.key());
- Long ver = targetVersionEntry.getValue();
+ Long ver = targetVerEntry.getValue();
ObjectStatisticsImpl s;
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/hll/FullHLLTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/hll/FullHLLTest.java
index 141b5acb3d4..e31c9b389f8 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/hll/FullHLLTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/hll/FullHLLTest.java
@@ -280,9 +280,9 @@ public class FullHLLTest {
final int log2m = 11/*arbitrary*/;
final int regwidth = 5;
- final ISchemaVersion schemaVersion =
SerializationUtil.DEFAULT_SCHEMA_VERSION;
+ final ISchemaVersion schemaVer =
SerializationUtil.DEFAULT_SCHEMA_VERSION;
final HLLType type = HLLType.FULL;
- final int padding = schemaVersion.paddingBytes(type);
+ final int padding = schemaVer.paddingBytes(type);
final int dataByteCnt =
ProbabilisticTestUtil.getRequiredBytes(regwidth, (1 << log2m)/*aka 2^log2m =
m*/);
final int expectedByteCnt = padding + dataByteCnt;
@@ -290,7 +290,7 @@ public class FullHLLTest {
// Should work on an empty element
final HLL hll = new HLL(log2m, regwidth, 128/*explicitThreshold,
arbitrary, unused*/,
256/*sparseThreshold, arbitrary, unused*/, HLLType.FULL);
- final byte[] bytes = hll.toBytes(schemaVersion);
+ final byte[] bytes = hll.toBytes(schemaVer);
// assert output length is correct
assertEquals(bytes.length, expectedByteCnt);
@@ -310,7 +310,7 @@ public class FullHLLTest {
hll.addRaw(rawValue);
}
- final byte[] bytes = hll.toBytes(schemaVersion);
+ final byte[] bytes = hll.toBytes(schemaVer);
// assert output length is correct
assertEquals(bytes.length, expectedByteCnt);
@@ -330,7 +330,7 @@ public class FullHLLTest {
hll.addRaw(rawValue);
}
- final byte[] bytes = hll.toBytes(schemaVersion);
+ final byte[] bytes = hll.toBytes(schemaVer);
// assert output length is correct
assertEquals(bytes.length, expectedByteCnt);
