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 2024/02/01 12:51:49 UTC
(ignite) branch master updated: IGNITE-14823 String abbrevation (#11213)
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 855b617d484 IGNITE-14823 String abbrevation (#11213)
855b617d484 is described below
commit 855b617d4840776cd6b82963b48b0553e9b7c63f
Author: Nikolay <ni...@apache.org>
AuthorDate: Thu Feb 1 15:51:38 2024 +0300
IGNITE-14823 String abbrevation (#11213)
---
.../query/calcite/exec/exp/RexImpTable.java | 22 +++++++++++-----------
.../checkstyle/src/main/resources/abbrevations.csv | 6 +++---
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 6 +++---
.../internal/sql/command/SqlBulkLoadCommand.java | 4 ++--
...rNodeAttributeAffinityBackupFilterSelfTest.java | 6 +++---
.../internal/cluster/IgniteClusterIdTagTest.java | 4 ++--
.../internal/metric/MetricsConfigurationTest.java | 4 ++--
.../IgniteSemaphoreAbstractSelfTest.java | 8 ++++----
.../IgniteAbstractStandByClientReconnectTest.java | 6 +++---
.../p2p/P2PClassLoadingFailureHandlingTest.java | 6 +++---
.../ignite/platform/PlatformProcessUtils.java | 8 ++++----
11 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index 44f70ff2ad4..c5c8a378b2a 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -520,19 +520,19 @@ public class RexImpTable {
NullPolicy.NONE, false)));
// System functions.
- final SystemFunctionImplementor systemFunctionImplementor = new SystemFunctionImplementor();
- map.put(SYSTEM_RANGE, systemFunctionImplementor);
+ final SystemFunctionImplementor sysFunctionImplementor = new SystemFunctionImplementor();
+ map.put(SYSTEM_RANGE, sysFunctionImplementor);
// Current time functions.
- map.put(CURRENT_TIME, systemFunctionImplementor);
- map.put(CURRENT_TIMESTAMP, systemFunctionImplementor);
- map.put(CURRENT_DATE, systemFunctionImplementor);
- map.put(LOCALTIME, systemFunctionImplementor);
- map.put(LOCALTIMESTAMP, systemFunctionImplementor);
-
- map.put(TYPEOF, systemFunctionImplementor);
- map.put(QUERY_ENGINE, systemFunctionImplementor);
- map.put(NULL_BOUND, systemFunctionImplementor);
+ map.put(CURRENT_TIME, sysFunctionImplementor);
+ map.put(CURRENT_TIMESTAMP, sysFunctionImplementor);
+ map.put(CURRENT_DATE, sysFunctionImplementor);
+ map.put(LOCALTIME, sysFunctionImplementor);
+ map.put(LOCALTIMESTAMP, sysFunctionImplementor);
+
+ map.put(TYPEOF, sysFunctionImplementor);
+ map.put(QUERY_ENGINE, sysFunctionImplementor);
+ map.put(NULL_BOUND, sysFunctionImplementor);
defineMethod(LEAST2, IgniteMethod.LEAST2.method(), NullPolicy.ALL);
defineMethod(GREATEST2, IgniteMethod.GREATEST2.method(), NullPolicy.ALL);
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index 044b652ed05..2ffe088086f 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -60,16 +60,16 @@ repository,repo
request,req
resource,rsrc
response,res
-#returnValue,retVal
+returnValue,retVal
sender,snd
service,srvc
session,ses
sequence,seq
socket,sock
source,src
-#string,s,str
+string,s,str
subject,subj
-#system,sys
+system,sys
#topology,top
#topologyversion,topVer
#value,val
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index 2a7547d59fb..135c6fc6a24 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -641,7 +641,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
Set<String> actualUserCols = new TreeSet<>();
- Set<String> actualSystemCols = new TreeSet<>();
+ Set<String> actualSysCols = new TreeSet<>();
while (rs.next()) {
int precision = rs.getInt("COLUMN_SIZE");
@@ -660,7 +660,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
if (!schemaName.equals(SCHEMA_SYS))
actualUserCols.add(colDefinition);
else
- actualSystemCols.add(colDefinition);
+ actualSysCols.add(colDefinition);
}
Assert.assertEquals(expectedCols, actualUserCols);
@@ -1160,7 +1160,7 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
"SYS.PAGES_TIMESTAMP_HISTOGRAM.PAGES_COUNT.null"
));
- Assert.assertEquals(expectedCols, actualSystemCols);
+ Assert.assertEquals(expectedCols, actualSysCols);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlBulkLoadCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlBulkLoadCommand.java
index 54021bde93d..805c202df2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlBulkLoadCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/command/SqlBulkLoadCommand.java
@@ -209,9 +209,9 @@ public class SqlBulkLoadCommand implements SqlCommand {
case SqlKeyword.NULLSTRING: {
lex.shift();
- String nullString = parseString(lex);
+ String nullStr = parseString(lex);
- format.nullString(nullString);
+ format.nullString(nullStr);
break;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
index 8212419d4de..00c1bf1fcba 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilterSelfTest.java
@@ -37,11 +37,11 @@ public class ClusterNodeAttributeAffinityBackupFilterSelfTest extends AffinityFu
@Override protected AffinityFunction affinityFunctionWithAffinityBackupFilter(String attributeName) {
RendezvousAffinityFunction aff = new RendezvousAffinityFunction(false);
- String[] stringArr = new String[1];
+ String[] strArr = new String[1];
- stringArr[0] = attributeName;
+ strArr[0] = attributeName;
- aff.setAffinityBackupFilter(new ClusterNodeAttributeAffinityBackupFilter(stringArr));
+ aff.setAffinityBackupFilter(new ClusterNodeAttributeAffinityBackupFilter(strArr));
return aff;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java b/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
index e52ec9a0f67..b277b66d172 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/cluster/IgniteClusterIdTagTest.java
@@ -273,10 +273,10 @@ public class IgniteClusterIdTagTest extends GridCommonAbstractTest {
assertTrue(e.getMessage().contains("should not be empty"));
}
- String longString = new String(new char[281]);
+ String longStr = new String(new char[281]);
try {
- ig0.cluster().tag(longString);
+ ig0.cluster().tag(longStr);
fail("Expected exception has not been thrown.");
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java
index 29e31865926..3e07cf59c0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsConfigurationTest.java
@@ -139,10 +139,10 @@ public class MetricsConfigurationTest extends GridCommonAbstractTest {
bean.configureHistogramMetric(metricName(TX_METRICS, METRIC_SYSTEM_TIME_HISTOGRAM), BOUNDS);
- HistogramMetric systemTime = g.context().metric().registry(TX_METRICS)
+ HistogramMetric sysTime = g.context().metric().registry(TX_METRICS)
.findMetric(METRIC_SYSTEM_TIME_HISTOGRAM);
- assertArrayEquals(BOUNDS, systemTime.bounds());
+ assertArrayEquals(BOUNDS, sysTime.bounds());
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
index 05e5b4b283c..fc1616a98b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteSemaphoreAbstractSelfTest.java
@@ -290,18 +290,18 @@ public abstract class IgniteSemaphoreAbstractSelfTest extends IgniteAtomicsAbstr
@Test
public void testSemaphoreClosing() throws Exception {
IgniteConfiguration cfg;
- GridStringLogger stringLog;
+ GridStringLogger strLog;
- stringLog = new GridStringLogger();
+ strLog = new GridStringLogger();
cfg = optimize(getConfiguration("npeGrid"));
- cfg.setGridLogger(stringLog);
+ cfg.setGridLogger(strLog);
try (Ignite ignite = startGrid(cfg.getIgniteInstanceName(), cfg)) {
ignite.semaphore("semaphore", 1, true, true);
}
- assertFalse(stringLog.toString().contains(NullPointerException.class.getName()));
+ assertFalse(strLog.toString().contains(NullPointerException.class.getName()));
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
index 01f76c231e7..7bc03a84130 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
@@ -189,15 +189,15 @@ public abstract class IgniteAbstractStandByClientReconnectTest extends GridCommo
assertEquals("Node name: " + ig.name(), cacheNames.size() + 1, descs.size());
- int systemCnt = 0;
+ int sysCnt = 0;
for (DynamicCacheDescriptor desc : descs)
if (!CU.isSystemCache(desc.cacheName()))
assertTrue(desc.cacheName(), cacheNames.contains(desc.cacheName()));
else
- systemCnt++;
+ sysCnt++;
- assertEquals(1, systemCnt);
+ assertEquals(1, sysCnt);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
index 05b4f36ad31..cedb0741939 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
@@ -137,12 +137,12 @@ public class P2PClassLoadingFailureHandlingTest extends GridCommonAbstractTest {
private void assertThatFailureHandlerIsNotCalled() throws InterruptedException {
letFailurePropagateToFailureHandler();
- StringWriter stringWriter = new StringWriter();
+ StringWriter strWriter = new StringWriter();
if (failure.get() != null) {
- failure.get().printStackTrace(new PrintWriter(stringWriter));
+ failure.get().printStackTrace(new PrintWriter(strWriter));
}
- assertNull("Failure handler should not be called, but it was with " + stringWriter, failure.get());
+ assertNull("Failure handler should not be called, but it was with " + strWriter, failure.get());
}
/***/
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformProcessUtils.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformProcessUtils.java
index ac2d41327a7..b25ca06e440 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformProcessUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformProcessUtils.java
@@ -98,18 +98,18 @@ public class PlatformProcessUtils {
process.destroyForcibly();
process = null;
- String logString = String.join(System.lineSeparator(), log);
+ String logStr = String.join(System.lineSeparator(), log);
- throw new Exception("Failed to wait for specified output ('" + waitForOutput + "'): " + logString, e);
+ throw new Exception("Failed to wait for specified output ('" + waitForOutput + "'): " + logStr, e);
}
if (!process.isAlive()) {
int exitValue = process.exitValue();
process = null;
- String logString = String.join(System.lineSeparator(), log);
+ String logStr = String.join(System.lineSeparator(), log);
- throw new Exception("Process has exited unexpectedly (" + exitValue + "): " + logString);
+ throw new Exception("Process has exited unexpectedly (" + exitValue + "): " + logStr);
}
}