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/01/30 11:31:11 UTC
(ignite) branch master updated: IGNITE-14823 Sequence, socket, source abbrevations (#11208)
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 aec5f953949 IGNITE-14823 Sequence, socket, source abbrevations (#11208)
aec5f953949 is described below
commit aec5f9539494e1b9216de427e15ecec4a3874881
Author: Nikolay <ni...@apache.org>
AuthorDate: Tue Jan 30 14:31:04 2024 +0300
IGNITE-14823 Sequence, socket, source abbrevations (#11208)
---
.../processors/query/calcite/exec/exp/RexImpTable.java | 6 +++---
.../query/calcite/exec/exp/RexToLixTranslator.java | 6 +++---
.../query/calcite/metadata/ColocationGroup.java | 8 ++++----
.../query/calcite/prepare/FragmentSplitter.java | 8 ++++----
.../query/calcite/prepare/IgniteSqlToRelConvertor.java | 6 +++---
.../query/calcite/prepare/IgniteSqlValidator.java | 16 ++++++++--------
.../processors/query/calcite/prepare/Splitter.java | 8 ++++----
.../query/calcite/rel/AbstractIgniteJoin.java | 4 ++--
modules/checkstyle/src/main/resources/abbrevations.csv | 6 +++---
.../commandline/CommandHandlerParsingTest.java | 12 ++++++------
.../ignite/internal/jdbc/thin/JdbcThinSSLUtil.java | 4 ++--
.../internal/util/io/GridReversedLinesFileReader.java | 10 +++++-----
...acheJdbcPojoWriteBehindStoreWithCoalescingTest.java | 10 +++++-----
.../java/org/apache/ignite/client/ConnectionTest.java | 18 +++++++++---------
.../IgnitePersistentStoreDataStructuresTest.java | 8 ++++----
.../ServiceHotRedeploymentViaDeploymentSpiTest.java | 4 ++--
.../org/apache/ignite/internal/util/EchoServer.java | 4 ++--
.../ignite/internal/util/IgniteUtilsSelfTest.java | 4 ++--
.../tcp/TcpCommunicationHandshakeTimeoutTest.java | 6 +++---
.../spi/discovery/tcp/DiscoveryClientSocketTest.java | 16 ++++++++--------
.../tcp/TcpClientDiscoveryUnresolvedHostTest.java | 6 +++---
21 files changed, 85 insertions(+), 85 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 2d8d047ff3b..44f70ff2ad4 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
@@ -1531,11 +1531,11 @@ public class RexImpTable {
@Override Expression implementSafe(final RexToLixTranslator translator,
final RexCall call, final List<Expression> argValueList) {
assert call.getOperands().size() == 1;
- final RelDataType sourceType = call.getOperands().get(0).getType();
+ final RelDataType srcType = call.getOperands().get(0).getType();
// Short-circuit if no cast is required
RexNode arg = call.getOperands().get(0);
- if (call.getType().equals(sourceType)) {
+ if (call.getType().equals(srcType)) {
// No cast required, omit cast
return argValueList.get(0);
}
@@ -1548,7 +1548,7 @@ public class RexImpTable {
}
final RelDataType targetType =
nullifyType(translator.typeFactory, call.getType(), false);
- return translator.translateCast(sourceType,
+ return translator.translateCast(srcType,
targetType, argValueList.get(0));
}
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index 94de7699a27..95ff5d77780 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -577,12 +577,12 @@ public class RexToLixTranslator implements RexVisitor<RexToLixTranslator.Result>
case BINARY:
case VARBINARY:
// If this is a widening cast, no need to truncate.
- final int sourcePrecision = sourceType.getPrecision();
- if (SqlTypeUtil.comparePrecision(sourcePrecision, targetPrecision) <= 0)
+ final int srcPrecision = sourceType.getPrecision();
+ if (SqlTypeUtil.comparePrecision(srcPrecision, targetPrecision) <= 0)
truncate = false;
// If this is a widening cast, no need to pad.
- if (SqlTypeUtil.comparePrecision(sourcePrecision, targetPrecision) >= 0)
+ if (SqlTypeUtil.comparePrecision(srcPrecision, targetPrecision) >= 0)
pad = false;
// fall through
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
index baa36c26aef..cb9cbe426d5 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/ColocationGroup.java
@@ -142,11 +142,11 @@ public class ColocationGroup implements MarshalableMessage {
* being calculated fragment.
*/
public ColocationGroup colocate(ColocationGroup other) throws ColocationMappingException {
- long[] sourceIds;
+ long[] srcIds;
if (this.sourceIds == null || other.sourceIds == null)
- sourceIds = U.firstNotNull(this.sourceIds, other.sourceIds);
+ srcIds = U.firstNotNull(this.sourceIds, other.sourceIds);
else
- sourceIds = LongStream.concat(Arrays.stream(this.sourceIds), Arrays.stream(other.sourceIds)).distinct().toArray();
+ srcIds = LongStream.concat(Arrays.stream(this.sourceIds), Arrays.stream(other.sourceIds)).distinct().toArray();
List<UUID> nodeIds;
if (this.nodeIds == null || other.nodeIds == null)
@@ -198,7 +198,7 @@ public class ColocationGroup implements MarshalableMessage {
}
}
- return new ColocationGroup(sourceIds, nodeIds, assignments);
+ return new ColocationGroup(srcIds, nodeIds, assignments);
}
/** */
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
index 6757fdf711f..9518b661307 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
@@ -106,14 +106,14 @@ public class FragmentSplitter extends IgniteRelShuttle {
RelNode input = rel instanceof IgniteTrimExchange ? rel.getInput(0) : rel;
long targetFragmentId = curr.id;
- long sourceFragmentId = IdGenerator.nextId();
- long exchangeId = sourceFragmentId;
+ long srcFragmentId = IdGenerator.nextId();
+ long exchangeId = srcFragmentId;
- IgniteReceiver receiver = new IgniteReceiver(cluster, traits, rowType, exchangeId, sourceFragmentId);
+ IgniteReceiver receiver = new IgniteReceiver(cluster, traits, rowType, exchangeId, srcFragmentId);
IgniteSender snd = new IgniteSender(cluster, traits, input, exchangeId, targetFragmentId, rel.distribution());
curr.remotes.add(receiver);
- stack.push(new FragmentProto(sourceFragmentId, snd));
+ stack.push(new FragmentProto(srcFragmentId, snd));
return receiver;
}
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
index d72729ab3a6..86620510834 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlToRelConvertor.java
@@ -231,7 +231,7 @@ public class IgniteSqlToRelConvertor extends SqlToRelConverter {
// first, convert the merge's source select to construct the columns
// from the target table and the set expressions in the update call
- RelNode mergeSourceRel = convertSelect(
+ RelNode mergeSrcRel = convertSelect(
requireNonNull(call.getSourceSelect(), () -> "sourceSelect for " + call), false);
// then, convert the insert statement so we can get the insert
@@ -260,7 +260,7 @@ public class IgniteSqlToRelConvertor extends SqlToRelConverter {
nLevel1Exprs = level1InsertExprs.size();
}
- LogicalJoin join = (LogicalJoin)mergeSourceRel.getInput(0);
+ LogicalJoin join = (LogicalJoin)mergeSrcRel.getInput(0);
final List<RexNode> projects = new ArrayList<>();
@@ -276,7 +276,7 @@ public class IgniteSqlToRelConvertor extends SqlToRelConverter {
projects.add(level1InsertExprs.get(level1Idx));
}
if (updateCall != null) {
- final LogicalProject project = (LogicalProject)mergeSourceRel;
+ final LogicalProject project = (LogicalProject)mergeSrcRel;
projects.addAll(project.getProjects());
}
else {
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlValidator.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlValidator.java
index 09b2b240cb6..bbd2c119430 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlValidator.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgniteSqlValidator.java
@@ -189,16 +189,16 @@ public class IgniteSqlValidator extends SqlValidatorImpl {
for (SqlNode exp : call.getSourceExpressionList())
selectList.add(SqlValidatorUtil.addAlias(exp, SqlUtil.deriveAliasFromOrdinal(ordinal++)));
- SqlNode sourceTable = call.getTargetTable();
+ SqlNode srcTable = call.getTargetTable();
if (call.getAlias() != null) {
- sourceTable =
+ srcTable =
SqlValidatorUtil.addAlias(
- sourceTable,
+ srcTable,
call.getAlias().getSimple());
}
- return new SqlSelect(SqlParserPos.ZERO, null, selectList, sourceTable,
+ return new SqlSelect(SqlParserPos.ZERO, null, selectList, srcTable,
call.getCondition(), null, null, null, null, null, null, null);
}
@@ -207,16 +207,16 @@ public class IgniteSqlValidator extends SqlValidatorImpl {
final SqlNodeList selectList = SqlNodeList.of(
new SqlIdentifier(QueryUtils.KEY_FIELD_NAME, SqlParserPos.ZERO));
- SqlNode sourceTable = call.getTargetTable();
+ SqlNode srcTable = call.getTargetTable();
if (call.getAlias() != null) {
- sourceTable =
+ srcTable =
SqlValidatorUtil.addAlias(
- sourceTable,
+ srcTable,
call.getAlias().getSimple());
}
- return new SqlSelect(SqlParserPos.ZERO, null, selectList, sourceTable,
+ return new SqlSelect(SqlParserPos.ZERO, null, selectList, srcTable,
call.getCondition(), null, null, null, null, null, null, null);
}
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Splitter.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Splitter.java
index 2157930c272..802c2913af1 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Splitter.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Splitter.java
@@ -81,15 +81,15 @@ public class Splitter extends IgniteRelShuttle {
RelOptCluster cluster = rel.getCluster();
long targetFragmentId = curr.id;
- long sourceFragmentId = IdGenerator.nextId();
- long exchangeId = sourceFragmentId;
+ long srcFragmentId = IdGenerator.nextId();
+ long exchangeId = srcFragmentId;
- IgniteReceiver receiver = new IgniteReceiver(cluster, rel.getTraitSet(), rel.getRowType(), exchangeId, sourceFragmentId);
+ IgniteReceiver receiver = new IgniteReceiver(cluster, rel.getTraitSet(), rel.getRowType(), exchangeId, srcFragmentId);
IgniteSender snd = new IgniteSender(cluster, rel.getTraitSet(), rel.getInput(), exchangeId, targetFragmentId,
rel.distribution());
curr.remotes.add(receiver);
- stack.push(new FragmentProto(sourceFragmentId, snd));
+ stack.push(new FragmentProto(srcFragmentId, snd));
return receiver;
}
diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/AbstractIgniteJoin.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/AbstractIgniteJoin.java
index db73391b6ba..25826f40abe 100644
--- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/AbstractIgniteJoin.java
+++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/rel/AbstractIgniteJoin.java
@@ -301,12 +301,12 @@ public abstract class AbstractIgniteJoin extends Join implements TraitsAwareIgni
/** Creates mapping from left join keys to the right and vice versa with regards to {@code left2Right}. */
protected Mappings.TargetMapping buildTransposeMapping(boolean left2Right) {
- ImmutableIntList sourceKeys = left2Right ? joinInfo.leftKeys : joinInfo.rightKeys;
+ ImmutableIntList srcKeys = left2Right ? joinInfo.leftKeys : joinInfo.rightKeys;
ImmutableIntList targetKeys = left2Right ? joinInfo.rightKeys : joinInfo.leftKeys;
Map<Integer, Integer> keyMap = new HashMap<>();
for (int i = 0; i < joinInfo.leftKeys.size(); i++)
- keyMap.put(sourceKeys.get(i), targetKeys.get(i));
+ keyMap.put(srcKeys.get(i), targetKeys.get(i));
return Mappings.target(
keyMap,
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index 591ab9c475f..388657f7683 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -64,9 +64,9 @@ response,res
sender,snd
service,srvc
session,ses
-#sequence,seq
-#socket,sock
-#source,src
+sequence,seq
+socket,sock
+source,src
#string,s,str
#subject,subj
#system,sys
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java
index b2ed1bab2b8..bd574ea104b 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/CommandHandlerParsingTest.java
@@ -284,11 +284,11 @@ public class CommandHandlerParsingTest {
List<List<T>> res = new ArrayList<>();
for (int i = 0; i < source.size(); i++) {
- List<T> sourceCopy = new ArrayList<>(source);
+ List<T> srcCopy = new ArrayList<>(source);
- T removed = sourceCopy.remove(i);
+ T removed = srcCopy.remove(i);
- generateAllCombinations(singletonList(removed), sourceCopy, stopFunc, res);
+ generateAllCombinations(singletonList(removed), srcCopy, stopFunc, res);
}
return res;
@@ -314,13 +314,13 @@ public class CommandHandlerParsingTest {
for (int i = 0; i < source.size(); i++) {
ArrayList<T> res0 = new ArrayList<>(res);
- List<T> sourceCopy = new ArrayList<>(source);
+ List<T> srcCopy = new ArrayList<>(source);
- T removed = sourceCopy.remove(i);
+ T removed = srcCopy.remove(i);
res0.add(removed);
- generateAllCombinations(res0, sourceCopy, stopFunc, acc);
+ generateAllCombinations(res0, srcCopy, stopFunc, acc);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
index d52095fe336..8c7ca94ab53 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
@@ -73,9 +73,9 @@ public class JdbcThinSSLUtil {
*/
public static SSLSocket createSSLSocket(InetSocketAddress addr, ConnectionProperties connProps) throws SQLException {
try {
- SSLSocketFactory sslSocketFactory = getSSLSocketFactory(connProps);
+ SSLSocketFactory sslSockFactory = getSSLSocketFactory(connProps);
- SSLSocket sock = (SSLSocket)sslSocketFactory.createSocket(addr.getAddress(), addr.getPort());
+ SSLSocket sock = (SSLSocket)sslSockFactory.createSocket(addr.getAddress(), addr.getPort());
sock.setUseClientMode(true);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
index 04bb8907a9b..12c80a00f4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/io/GridReversedLinesFileReader.java
@@ -351,14 +351,14 @@ public class GridReversedLinesFileReader implements Closeable {
* @return length of newline sequence or 0 if none found
*/
private int getNewLineMatchByteCount(byte[] data, int i) {
- for (byte[] newLineSequence : newLineSequences) {
+ for (byte[] newLineSeq : newLineSequences) {
boolean match = true;
- for (int j = newLineSequence.length - 1; j >= 0; j--) {
- int k = i + j - (newLineSequence.length - 1);
- match &= k >= 0 && data[k] == newLineSequence[j];
+ for (int j = newLineSeq.length - 1; j >= 0; j--) {
+ int k = i + j - (newLineSeq.length - 1);
+ match &= k >= 0 && data[k] == newLineSeq[j];
}
if (match) {
- return newLineSequence.length;
+ return newLineSeq.length;
}
}
return 0;
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java
index 3714c6f7f59..d02653ce1c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindStoreWithCoalescingTest.java
@@ -102,15 +102,15 @@ public class CacheJdbcPojoWriteBehindStoreWithCoalescingTest extends GridCommonA
/** */
public TestJdbcPojoDataSourceFactory getDataSourceFactory() {
- TestJdbcPojoDataSourceFactory testJdbcPojoDataSourceFactory = new TestJdbcPojoDataSourceFactory();
+ TestJdbcPojoDataSourceFactory testJdbcPojoDataSrcFactory = new TestJdbcPojoDataSourceFactory();
- testJdbcPojoDataSourceFactory.setURL("jdbc:h2:mem:TestDatabase;DB_CLOSE_DELAY=-1");
+ testJdbcPojoDataSrcFactory.setURL("jdbc:h2:mem:TestDatabase;DB_CLOSE_DELAY=-1");
- testJdbcPojoDataSourceFactory.setUserName("sa");
+ testJdbcPojoDataSrcFactory.setUserName("sa");
- testJdbcPojoDataSourceFactory.setPassword("");
+ testJdbcPojoDataSrcFactory.setPassword("");
- return testJdbcPojoDataSourceFactory;
+ return testJdbcPojoDataSrcFactory;
}
/** */
diff --git a/modules/core/src/test/java/org/apache/ignite/client/ConnectionTest.java b/modules/core/src/test/java/org/apache/ignite/client/ConnectionTest.java
index cdb8222fc01..d147352e74f 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/ConnectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/ConnectionTest.java
@@ -101,14 +101,14 @@ public class ConnectionTest {
@Test
public void testHandshakeTooLargeServerDropsConnection() throws Exception {
try (LocalIgniteCluster ignored = LocalIgniteCluster.start(1, IPv4_HOST)) {
- Socket clientSocket = new Socket(IPv4_HOST, 10800);
- OutputStream stream = clientSocket.getOutputStream();
+ Socket clientSock = new Socket(IPv4_HOST, 10800);
+ OutputStream stream = clientSock.getOutputStream();
stream.write(new byte[]{1, 1, 1, 1});
stream.flush();
// Read returns -1 when end of stream has been reached, blocks otherwise.
- assertEquals(-1, clientSocket.getInputStream().read());
+ assertEquals(-1, clientSock.getInputStream().read());
}
}
@@ -116,15 +116,15 @@ public class ConnectionTest {
@Test
public void testNegativeMessageSizeDropsConnection() throws Exception {
try (LocalIgniteCluster ignored = LocalIgniteCluster.start(1, IPv4_HOST)) {
- Socket clientSocket = new Socket(IPv4_HOST, 10800);
- OutputStream stream = clientSocket.getOutputStream();
+ Socket clientSock = new Socket(IPv4_HOST, 10800);
+ OutputStream stream = clientSock.getOutputStream();
byte b = (byte)255;
stream.write(new byte[]{b, b, b, b});
stream.flush();
// Read returns -1 when end of stream has been reached, blocks otherwise.
- assertEquals(-1, clientSocket.getInputStream().read());
+ assertEquals(-1, clientSock.getInputStream().read());
}
}
@@ -132,13 +132,13 @@ public class ConnectionTest {
@Test
public void testInvalidHandshakeHeaderDropsConnection() throws Exception {
try (LocalIgniteCluster ignored = LocalIgniteCluster.start(1, IPv4_HOST)) {
- Socket clientSocket = new Socket(IPv4_HOST, 10800);
- OutputStream stream = clientSocket.getOutputStream();
+ Socket clientSock = new Socket(IPv4_HOST, 10800);
+ OutputStream stream = clientSock.getOutputStream();
stream.write(new byte[]{10, 0, 0, 0, 42, 42, 42});
stream.flush();
- assertEquals(-1, clientSocket.getInputStream().read());
+ assertEquals(-1, clientSock.getInputStream().read());
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
index a4348eec021..4cbc0bc3b0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreDataStructuresTest.java
@@ -144,12 +144,12 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite.cluster().state(ClusterState.ACTIVE);
- IgniteAtomicSequence sequence = ignite.atomicSequence("testSequence", 0, true);
+ IgniteAtomicSequence seq = ignite.atomicSequence("testSequence", 0, true);
int i = 0;
while (i < 1000) {
- sequence.incrementAndGet();
+ seq.incrementAndGet();
i++;
}
@@ -160,9 +160,9 @@ public class IgnitePersistentStoreDataStructuresTest extends GridCommonAbstractT
ignite.cluster().state(ClusterState.ACTIVE);
- sequence = ignite.atomicSequence("testSequence", 0, false);
+ seq = ignite.atomicSequence("testSequence", 0, false);
- assertTrue(sequence.incrementAndGet() > i);
+ assertTrue(seq.incrementAndGet() > i);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceHotRedeploymentViaDeploymentSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceHotRedeploymentViaDeploymentSpiTest.java
index 43ba53f54a0..d08cc23ae28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceHotRedeploymentViaDeploymentSpiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServiceHotRedeploymentViaDeploymentSpiTest.java
@@ -206,7 +206,7 @@ public class ServiceHotRedeploymentViaDeploymentSpiTest extends GridCommonAbstra
* @throws Exception In case of an error.
*/
private URLClassLoader prepareClassLoader(int ver) throws Exception {
- String source = "import org.apache.ignite.internal.processors.service.ServiceHotRedeploymentViaDeploymentSpiTest;\n" +
+ String src = "import org.apache.ignite.internal.processors.service.ServiceHotRedeploymentViaDeploymentSpiTest;\n" +
"import org.apache.ignite.services.ServiceContext;\n" +
"public class MyRenewServiceImpl implements ServiceHotRedeploymentViaDeploymentSpiTest.MyRenewService {\n" +
" @Override public int version() {\n" +
@@ -221,7 +221,7 @@ public class ServiceHotRedeploymentViaDeploymentSpiTest extends GridCommonAbstra
File srcFile = new File(srcTmpDir.toFile(), "MyRenewServiceImpl.java");
- Path srcFilePath = Files.write(srcFile.toPath(), source.getBytes(StandardCharsets.UTF_8));
+ Path srcFilePath = Files.write(srcFile.toPath(), src.getBytes(StandardCharsets.UTF_8));
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/EchoServer.java b/modules/core/src/test/java/org/apache/ignite/internal/util/EchoServer.java
index ae9e031ec1c..7647ea592d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/EchoServer.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/EchoServer.java
@@ -92,8 +92,8 @@ class EchoServer implements AutoCloseable {
/** {@inheritDoc} */
@Override public void run() {
while (running) {
- Socket socket = acceptConnection();
- workersExecutor.submit(new Worker(socket));
+ Socket sock = acceptConnection();
+ workersExecutor.submit(new Worker(sock));
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
index 351e54107f5..0891309a259 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteUtilsSelfTest.java
@@ -1589,8 +1589,8 @@ public class IgniteUtilsSelfTest extends GridCommonAbstractTest {
boolean ignoreLocalHostname = IgniteSystemProperties.getBoolean(IgniteSystemProperties.IGNITE_IGNORE_LOCAL_HOST_NAME);
String userDefinedHost = IgniteSystemProperties.getString(IgniteSystemProperties.IGNITE_LOCAL_HOST);
- InetSocketAddress inetSocketAddr = new InetSocketAddress(userDefinedHost, 0);
- InetAddress addr = inetSocketAddr.getAddress();
+ InetSocketAddress inetSockAddr = new InetSocketAddress(userDefinedHost, 0);
+ InetAddress addr = inetSockAddr.getAddress();
IgniteBiTuple<Collection<String>, Collection<String>> localAddrs = IgniteUtils.resolveLocalAddresses(addr);
if (ignoreLocalHostname) {
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationHandshakeTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationHandshakeTimeoutTest.java
index c8eba14075c..22ed899f373 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationHandshakeTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationHandshakeTimeoutTest.java
@@ -78,13 +78,13 @@ public class TcpCommunicationHandshakeTimeoutTest extends GridCommonAbstractTest
IgniteEx g1 = startGrid(1);
//and: One more node which communication connection can be delayed by demand.
- AtomicBoolean delayHandshakeUntilSocketClosed = new AtomicBoolean();
+ AtomicBoolean delayHandshakeUntilSockClosed = new AtomicBoolean();
IgniteEx g2 = startGrid(2, new DependencyResolver() {
@Override public <T> T resolve(T instance) {
if (instance instanceof TcpHandshakeExecutor) {
TcpHandshakeExecutor gridNioServer = (TcpHandshakeExecutor)instance;
- return (T)new DelaydTcpHandshakeExecutor(gridNioServer, delayHandshakeUntilSocketClosed);
+ return (T)new DelaydTcpHandshakeExecutor(gridNioServer, delayHandshakeUntilSockClosed);
}
return instance;
@@ -102,7 +102,7 @@ public class TcpCommunicationHandshakeTimeoutTest extends GridCommonAbstractTest
g2.context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(0) {
@Override public void onTimeout() {
- delayHandshakeUntilSocketClosed.set(true);
+ delayHandshakeUntilSockClosed.set(true);
g2.compute(g2.cluster().forNodes(Arrays.asList(g1.localNode()))).withNoFailover().call(() -> true);
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DiscoveryClientSocketTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DiscoveryClientSocketTest.java
index fb7d1f3e623..0a490782258 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DiscoveryClientSocketTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/DiscoveryClientSocketTest.java
@@ -53,8 +53,8 @@ public class DiscoveryClientSocketTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
- SslContextFactory socketFactory = (SslContextFactory)GridTestUtils.sslTrustedFactory("node01", "trustone");
- SSLContext sslCtx = socketFactory.create();
+ SslContextFactory sockFactory = (SslContextFactory)GridTestUtils.sslTrustedFactory("node01", "trustone");
+ SSLContext sslCtx = sockFactory.create();
sslSrvSockFactory = sslCtx.getServerSocketFactory();
sslSockFactory = sslCtx.getSocketFactory();
@@ -129,18 +129,18 @@ public class DiscoveryClientSocketTest extends GridCommonAbstractTest {
*/
public void startSslClient() {
try {
- Socket clientSocket = sslSockFactory.createSocket(HOST, PORT_TO_LNSR);
+ Socket clientSock = sslSockFactory.createSocket(HOST, PORT_TO_LNSR);
info("Client started.");
- fakeTcpDiscoverySpi.configureSocketOptions(clientSocket);
+ fakeTcpDiscoverySpi.configureSocketOptions(clientSock);
long handshakeStartTime = System.currentTimeMillis();
//need to send message in order to ssl handshake passed.
- clientSocket.getOutputStream().write(U.IGNITE_HEADER);
+ clientSock.getOutputStream().write(U.IGNITE_HEADER);
- readHandshake(clientSocket);
+ readHandshake(clientSock);
long handshakeInterval = System.currentTimeMillis() - handshakeStartTime;
@@ -154,7 +154,7 @@ public class DiscoveryClientSocketTest extends GridCommonAbstractTest {
IgniteInternalFuture writeFut = GridTestUtils.runAsync(() -> {
try {
- clientSocket.getOutputStream().write(new byte[4 * 1024]);
+ clientSock.getOutputStream().write(new byte[4 * 1024]);
}
catch (IOException e) {
assertEquals("Socket closed", e.getMessage());
@@ -174,7 +174,7 @@ public class DiscoveryClientSocketTest extends GridCommonAbstractTest {
long startClose = System.currentTimeMillis();
// Do not use try-catch-resource here, because JVM has a bug on TLS implementation and requires to close
// socket streams explicitly.
- U.closeQuiet(clientSocket);
+ U.closeQuiet(clientSock);
info("Socket closed [time=" + (System.currentTimeMillis() - startClose) + ']');
}
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java
index c5445e6b7be..b0249c39513 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoveryUnresolvedHostTest.java
@@ -78,11 +78,11 @@ public class TcpClientDiscoveryUnresolvedHostTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override Socket createSocket() throws IOException {
- Socket socket = super.createSocket();
+ Socket sock = super.createSocket();
- sockets.add(socket);
+ sockets.add(sock);
- return socket;
+ return sock;
}
/** {@inheritDoc} */