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/27 09:28:20 UTC
(ignite) branch master updated: IGNITE-14823 Object abbrevation (#11147)
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 a0fc658f599 IGNITE-14823 Object abbrevation (#11147)
a0fc658f599 is described below
commit a0fc658f5996c5115c61e81143644544c163bfb5
Author: Nikolay <ni...@apache.org>
AuthorDate: Wed Dec 27 12:28:14 2023 +0300
IGNITE-14823 Object abbrevation (#11147)
---
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java | 4 +--
.../java/org/apache/ignite/cache/CacheManager.java | 6 ++--
.../optimized/OptimizedObjectInputStream.java | 4 +--
.../query/stat/IgniteGlobalStatisticsManager.java | 12 ++++----
.../tcp/internal/GridNioServerWrapper.java | 6 ++--
.../internal/binary/BinaryMarshallerSelfTest.java | 34 +++++++++++-----------
.../BinaryObjectBuilderAdditionalSelfTest.java | 6 ++--
.../GridBinaryMarshallerCtxDisabledSelfTest.java | 16 +++++-----
.../cache/CacheMetricsCacheSizeTest.java | 6 ++--
.../IgniteTxRemoveTimeoutObjectsTest.java | 4 +--
.../ignite/lang/utils/GridStripedLockSelfTest.java | 4 +--
.../startup/servlet/GridServletLoaderTest.java | 8 ++---
.../classloadproblem/P2PClassLoadingProblems.java | 2 +-
.../internal/processors/query/h2/H2Utils.java | 4 +--
.../persistence/db/wal/IgniteWalRecoveryTest.java | 6 ++--
16 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index cf0af19ceaf..107a054559a 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -43,7 +43,7 @@ message,msg
messages,msgs
mutex,mux
network,net
-#object,obj
+object,obj
#package,pkg
#parameter,param
#password,pwd
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
index 77476d9ed20..1c9961b0311 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
@@ -83,10 +83,10 @@ public abstract class AbstractJdbcPojoQuerySelfTest extends GridCommonAbstractTe
builder2.setField("id", 1);
builder2.setField("boolVal", true);
- BinaryObject testObject = builder2.build();
+ BinaryObject testObj = builder2.build();
builder.setField("id", 1);
- builder.setField("testObject", testObject);
+ builder.setField("testObject", testObj);
BinaryObject binObj = builder.build();
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 17d40726f10..e6724b314c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -395,12 +395,12 @@ public class CacheManager implements javax.cache.CacheManager {
Set<ObjectName> registeredObjNames = mBeanSrv.queryNames(getObjectName(name, beanType), null);
//should just be one
- for (ObjectName registeredObjectName : registeredObjNames) {
+ for (ObjectName registeredObjName : registeredObjNames) {
try {
- mBeanSrv.unregisterMBean(registeredObjectName);
+ mBeanSrv.unregisterMBean(registeredObjName);
}
catch (Exception e) {
- throw new CacheException("Error unregistering object instance " + registeredObjectName
+ throw new CacheException("Error unregistering object instance " + registeredObjName
+ " . Error was " + e.getMessage(), e);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
index fdf375388da..d496548dfd1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
@@ -521,10 +521,10 @@ class OptimizedObjectInputStream extends ObjectInputStream {
break;
case OTHER:
- Object resObject = readObject();
+ Object resObj = readObject();
if (t.field() != null)
- setObject(obj, t.offset(), resObject);
+ setObject(obj, t.offset(), resObj);
}
}
catch (IOException e) {
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 3ab61314d2a..1a5798c24fc 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
@@ -476,20 +476,20 @@ public class IgniteGlobalStatisticsManager implements GridMessageListener {
StatisticsKey key = new StatisticsKey(req.key().schema(), req.key().obj());
- ObjectStatisticsImpl objectStatistics = statMgr.getLocalStatistics(key, req.topVer());
+ ObjectStatisticsImpl objStatistics = statMgr.getLocalStatistics(key, req.topVer());
- if (StatisticsUtils.compareVersions(objectStatistics, req.versions()) == 0)
- sendResponse(nodeId, req.reqId(), key, StatisticsType.LOCAL, objectStatistics);
+ if (StatisticsUtils.compareVersions(objStatistics, req.versions()) == 0)
+ sendResponse(nodeId, req.reqId(), key, StatisticsType.LOCAL, objStatistics);
else {
addToRequests(inLocalRequests, key, new StatisticsAddressedRequest(req, nodeId));
- objectStatistics = statMgr.getLocalStatistics(key, req.topVer());
+ objStatistics = statMgr.getLocalStatistics(key, req.topVer());
- if (StatisticsUtils.compareVersions(objectStatistics, req.versions()) == 0) {
+ if (StatisticsUtils.compareVersions(objStatistics, req.versions()) == 0) {
StatisticsAddressedRequest removed = removeFromRequests(inLocalRequests, key, req.reqId());
if (removed != null)
- sendResponse(nodeId, req.reqId(), key, StatisticsType.LOCAL, objectStatistics);
+ sendResponse(nodeId, req.reqId(), key, StatisticsType.LOCAL, objStatistics);
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
index 187b7fc3edb..80ea0c4d760 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/GridNioServerWrapper.java
@@ -1179,15 +1179,15 @@ public class GridNioServerWrapper {
GridSslMeta sslMeta,
HandshakeMessage msg
) throws IgniteCheckedException {
- HandshakeTimeoutObject timeoutObject = new HandshakeTimeoutObject(ch);
+ HandshakeTimeoutObject timeoutObj = new HandshakeTimeoutObject(ch);
- handshakeTimeoutExecutorService.schedule(timeoutObject, timeout, TimeUnit.MILLISECONDS);
+ handshakeTimeoutExecutorService.schedule(timeoutObj, timeout, TimeUnit.MILLISECONDS);
try {
return tcpHandshakeExecutor.tcpHandshake(ch, rmtNodeId, sslMeta, msg);
}
finally {
- if (!timeoutObject.cancel())
+ if (!timeoutObj.cancel())
throw handshakeTimeoutException();
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 0c5992958d0..b906d1c3db4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -3476,15 +3476,15 @@ public class BinaryMarshallerSelfTest extends AbstractBinaryArraysTest {
BinaryMarshaller m1 = binaryMarshaller();
Value obj = new Value(27);
- ObjectWithRaw objectWithRaw = new ObjectWithRaw(27, 13);
- ObjectRaw objectRaw = new ObjectRaw(27, 13);
+ ObjectWithRaw objWithRaw = new ObjectWithRaw(27, 13);
+ ObjectRaw objRaw = new ObjectRaw(27, 13);
Value objOther = new Value(26);
- ObjectWithRaw objectWithRawOther = new ObjectWithRaw(26, 13);
- ObjectRaw objectRawOther = new ObjectRaw(26, 13);
+ ObjectWithRaw objWithRawOther = new ObjectWithRaw(26, 13);
+ ObjectRaw objRawOther = new ObjectRaw(26, 13);
ArrayList collection = new ArrayList(Arrays.asList(
- obj, objectWithRawOther, objectRaw, objectWithRaw, objectRawOther, objOther));
+ obj, objWithRawOther, objRaw, objWithRaw, objRawOther, objOther));
marshalUnmarshal(collection, m0);
marshalUnmarshal(collection, m1);
@@ -3504,19 +3504,19 @@ public class BinaryMarshallerSelfTest extends AbstractBinaryArraysTest {
BinaryMarshaller m1 = binaryMarshaller();
Value obj = new Value(27);
- ObjectWithRaw objectWithRaw = new ObjectWithRaw(27, 13);
- ObjectRaw objectRaw = new ObjectRaw(27, 13);
+ ObjectWithRaw objWithRaw = new ObjectWithRaw(27, 13);
+ ObjectRaw objRaw = new ObjectRaw(27, 13);
Value objOther = new Value(26);
- ObjectWithRaw objectWithRawOther = new ObjectWithRaw(26, 13);
- ObjectRaw objectRawOther = new ObjectRaw(26, 13);
+ ObjectWithRaw objWithRawOther = new ObjectWithRaw(26, 13);
+ ObjectRaw objRawOther = new ObjectRaw(26, 13);
BinaryObjectImpl binObj0 = marshal(obj, m0);
BinaryObjectImpl binObj1 = marshal(obj, m1);
- BinaryObjectImpl binObjWithRaw0 = marshal(objectWithRaw, m0);
- BinaryObjectImpl binObjWithRaw1 = marshal(objectWithRaw, m1);
- BinaryObjectImpl binObjRaw0 = marshal(objectRaw, m0);
- BinaryObjectImpl binObjRaw1 = marshal(objectRaw, m1);
+ BinaryObjectImpl binObjWithRaw0 = marshal(objWithRaw, m0);
+ BinaryObjectImpl binObjWithRaw1 = marshal(objWithRaw, m1);
+ BinaryObjectImpl binObjRaw0 = marshal(objRaw, m0);
+ BinaryObjectImpl binObjRaw1 = marshal(objRaw, m1);
assertNotEquals(binObj0.array().length, binObj1.array().length);
assertNotEquals(binObjWithRaw0.array().length, binObjWithRaw1.array().length);
@@ -3537,10 +3537,10 @@ public class BinaryMarshallerSelfTest extends AbstractBinaryArraysTest {
BinaryObjectImpl binObjOther0 = marshal(objOther, m0);
BinaryObjectImpl binObjOther1 = marshal(objOther, m1);
- BinaryObjectImpl binObjWithRawOther0 = marshal(objectWithRawOther, m0);
- BinaryObjectImpl binObjWithRawOther1 = marshal(objectWithRawOther, m1);
- BinaryObjectImpl binObjRawOther0 = marshal(objectRawOther, m0);
- BinaryObjectImpl binObjRawOther1 = marshal(objectRawOther, m1);
+ BinaryObjectImpl binObjWithRawOther0 = marshal(objWithRawOther, m0);
+ BinaryObjectImpl binObjWithRawOther1 = marshal(objWithRawOther, m1);
+ BinaryObjectImpl binObjRawOther0 = marshal(objRawOther, m0);
+ BinaryObjectImpl binObjRawOther1 = marshal(objRawOther, m1);
assertEquals(binObjOther0.length(), binObj0.length());
assertEquals(binObjOther1.length(), binObj1.length());
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
index adc690fdd42..f406613890c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -1896,9 +1896,9 @@ public class BinaryObjectBuilderAdditionalSelfTest extends AbstractBinaryArraysT
*/
@Test
public void testGetNotAssignedFieldInBuilder() {
- GridBinaryTestClasses.TestObjectContainer testObjectContainer = new GridBinaryTestClasses.TestObjectContainer();
- testObjectContainer.foo = "binaryCachedValue";
- BinaryObjectBuilderImpl builder = wrap(testObjectContainer);
+ GridBinaryTestClasses.TestObjectContainer testObjContainer = new GridBinaryTestClasses.TestObjectContainer();
+ testObjContainer.foo = "binaryCachedValue";
+ BinaryObjectBuilderImpl builder = wrap(testObjContainer);
builder.setField("w", "wewe");
assertNull(builder.getField("field"));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index c92b0737960..68638a50929 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -188,29 +188,29 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
if (o == null || getClass() != o.getClass())
return false;
- SimpleObject object = (SimpleObject)o;
+ SimpleObject obj = (SimpleObject)o;
- if (b != object.b)
+ if (b != obj.b)
return false;
- if (c != object.c)
+ if (c != obj.c)
return false;
- if (!Arrays.equals(bArr, object.bArr))
+ if (!Arrays.equals(bArr, obj.bArr))
return false;
// Probably incorrect - comparing Object[] arrays with Arrays.equals
- if (!Arrays.equals(objArr, object.objArr))
+ if (!Arrays.equals(objArr, obj.objArr))
return false;
- if (enumVal != object.enumVal)
+ if (enumVal != obj.enumVal)
return false;
// Probably incorrect - comparing Object[] arrays with Arrays.equals
- if (!Arrays.equals(enumArr, object.enumArr))
+ if (!Arrays.equals(enumArr, obj.enumArr))
return false;
- return !(otherObj != null ? !otherObj.equals(object.otherObj) : object.otherObj != null);
+ return !(otherObj != null ? !otherObj.equals(obj.otherObj) : obj.otherObj != null);
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java
index 6eb88e68dee..25100d308d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsCacheSizeTest.java
@@ -98,11 +98,11 @@ public class CacheMetricsCacheSizeTest extends GridCommonAbstractTest {
byte[] buf = marshaller.marshal(msg);
- Object readObject = marshaller.unmarshal(buf, getClass().getClassLoader());
+ Object readObj = marshaller.unmarshal(buf, getClass().getClassLoader());
- assertTrue(readObject instanceof TcpDiscoveryMetricsUpdateMessage);
+ assertTrue(readObj instanceof TcpDiscoveryMetricsUpdateMessage);
- TcpDiscoveryMetricsUpdateMessage msg2 = (TcpDiscoveryMetricsUpdateMessage)readObject;
+ TcpDiscoveryMetricsUpdateMessage msg2 = (TcpDiscoveryMetricsUpdateMessage)readObj;
Map<Integer, CacheMetrics> cacheMetrics2 = msg2.cacheMetrics().values().iterator().next();
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
index 31dda376bb2..edd654f9106 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxRemoveTimeoutObjectsTest.java
@@ -141,8 +141,8 @@ public class IgniteTxRemoveTimeoutObjectsTest extends GridCacheAbstractSelfTest
private void assertDoesNotContainLockTimeoutObjects() throws IgniteInterruptedCheckedException {
boolean noLockTimeoutObjs = GridTestUtils.waitForCondition(() -> {
for (Ignite ignite : G.allGrids()) {
- for (GridTimeoutObject object : getTimeoutObjects((IgniteEx)ignite)) {
- if (object.getClass().getSimpleName().equals("LockTimeoutObject"))
+ for (GridTimeoutObject obj : getTimeoutObjects((IgniteEx)ignite)) {
+ if (obj.getClass().getSimpleName().equals("LockTimeoutObject"))
return false;
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridStripedLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridStripedLockSelfTest.java
index 115da1b2c0d..0b582189ab0 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridStripedLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridStripedLockSelfTest.java
@@ -140,8 +140,8 @@ public class GridStripedLockSelfTest extends GridCommonAbstractTest {
try {
int holdCnt = 0;
- for (Object lockObject : testObjects(STRIPE_COUNT))
- if (((ReentrantLock)lock.getLock(lockObject)).isHeldByCurrentThread())
+ for (Object lockObj : testObjects(STRIPE_COUNT))
+ if (((ReentrantLock)lock.getLock(lockObj)).isHeldByCurrentThread())
holdCnt++;
// null object considered 0-hash code, so they should appear twicely.
diff --git a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
index 8de7b94b2e5..24e1c95af3c 100644
--- a/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/startup/servlet/GridServletLoaderTest.java
@@ -108,13 +108,13 @@ public class GridServletLoaderTest extends GridCommonAbstractTest {
Set<ObjectName> names = jmx.getMBeanServerConnection().queryNames(queryName, null);
if (!names.isEmpty()) {
- for (ObjectName objectName : names) {
- info("Found MBean for node: " + objectName);
+ for (ObjectName objName : names) {
+ info("Found MBean for node: " + objName);
- String kernalName = objectName.getKeyProperty("name");
+ String kernalName = objName.getKeyProperty("name");
if ("GridKernal".equals(kernalName)) {
- kernal = objectName;
+ kernal = objName;
found = true;
}
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
index 3b91da295e3..318f685aaae 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/classloadproblem/P2PClassLoadingProblems.java
@@ -82,7 +82,7 @@ class P2PClassLoadingProblems {
/***/
private static void triggerP2PClassLoad() {
@SuppressWarnings("unused")
- Object object = new SomeP2PClass();
+ Object obj = new SomeP2PClass();
}
/***/
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
index d6b59b8357d..01f5ee35e7c 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2Utils.java
@@ -935,8 +935,8 @@ public class H2Utils {
return true;
if (o == null || getClass() != o.getClass())
return false;
- ValueRuntimeSimpleObject<?> object = (ValueRuntimeSimpleObject<?>)o;
- return Objects.equals(val, object.val);
+ ValueRuntimeSimpleObject<?> obj = (ValueRuntimeSimpleObject<?>)o;
+ return Objects.equals(val, obj.val);
}
/** {@inheritDoc} */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index 115158326f0..c588ca1889b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -1925,9 +1925,9 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
return true;
if (o == null || getClass() != o.getClass())
return false;
- BigObject bigObject = (BigObject)o;
- return index == bigObject.index &&
- Arrays.equals(payload, bigObject.payload);
+ BigObject bigObj = (BigObject)o;
+ return index == bigObj.index &&
+ Arrays.equals(payload, bigObj.payload);
}
/** {@inheritDoc} */