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/28 11:05:37 UTC
(ignite) branch master updated: IGNITE-14823 Process abbrevation (#11155)
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 7270b5c40fe IGNITE-14823 Process abbrevation (#11155)
7270b5c40fe is described below
commit 7270b5c40fe17c5d805fd1c4de96429a31d368bd
Author: Nikolay <ni...@apache.org>
AuthorDate: Thu Dec 28 14:05:29 2023 +0300
IGNITE-14823 Process abbrevation (#11155)
---
.../checkstyle/src/main/resources/abbrevations.csv | 4 +-
.../JdbcThinCacheToJdbcDataTypesCoverageTest.java | 8 ++--
.../util/GridCommandHandlerIndexingUtils.java | 4 +-
.../org/apache/ignite/internal/IgniteKernal.java | 8 ++--
.../management/cache/IndexForceRebuildTask.java | 6 +--
.../management/cache/ScheduleIndexRebuildTask.java | 6 +--
.../management/cache/ValidateIndexesClosure.java | 8 ++--
.../cache/EntryProcessorResourceInjectorProxy.java | 4 +-
.../processors/cache/GridCacheMapEntry.java | 12 +++---
.../distributed/dht/GridDhtTxPrepareFuture.java | 8 ++--
.../distributed/dht/atomic/GridDhtAtomicCache.java | 44 +++++++++++-----------
.../atomic/GridNearAtomicFullUpdateRequest.java | 8 ++--
.../preloader/GridDhtPartitionsExchangeFuture.java | 12 +++---
.../distributed/near/GridNearAtomicCache.java | 6 +--
.../wal/reader/StandaloneGridKernalContext.java | 6 +--
.../wal/reader/StandaloneWalRecordsIterator.java | 6 +--
.../cache/transactions/IgniteTxEntry.java | 4 +-
.../processors/failure/FailureProcessor.java | 6 +--
.../processors/odbc/jdbc/JdbcRequestHandler.java | 22 +++++------
.../spi/communication/tcp/TcpCommunicationSpi.java | 6 +--
.../tcp/internal/CommunicationWorker.java | 8 ++--
.../tcp/internal/InboundConnectionHandler.java | 6 +--
...gniteCacheEntryProcessorSequentialCallTest.java | 12 +++---
.../BinaryObjectBuilderAdditionalSelfTest.java | 6 +--
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
.../cache/GridCacheDataTypesCoverageTest.java | 10 ++---
.../GridCacheGetAndTransformStoreAbstractTest.java | 4 +-
.../cache/GridCacheProcessorActiveTxTest.java | 4 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 4 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 24 ++++++------
.../RestorePartitionStateDuringCheckpointTest.java | 10 ++---
...cheContinuousQueryFailoverAbstractSelfTest.java | 6 +--
.../DistributedProcessCoordinatorLeftTest.java | 6 +--
.../util/DistributedProcessErrorHandlingTest.java | 6 +--
.../p2p/P2PClassLoadingFailureHandlingTest.java | 8 ++--
.../junits/multijvm/JavaVersionCommand.java | 12 +++---
.../utils/IgniteWalConverterArguments.java | 10 ++---
.../processors/query/h2/CommandProcessor.java | 4 +-
.../internal/processors/query/KillQueryTest.java | 8 ++--
.../query/stat/IgniteStatisticsRepositoryTest.java | 6 +--
.../query/stat/StatisticsStorageUnitTest.java | 6 +--
...achePartitionedAtomicColumnConstraintsTest.java | 12 +++---
.../zk/internal/ZookeeperDiscoveryImpl.java | 6 +--
43 files changed, 185 insertions(+), 185 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv
index b19101fffa0..4a1aed94f65 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -50,8 +50,8 @@ password,pwd
policy,plc
property,prop
properties,props
-#process,proc
-#processor,proc
+process,proc
+processor,proc
#query,qry
#receive,rcv
#reference,ref
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
index dc03826a939..9f6027a40c4 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java
@@ -404,7 +404,7 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes
// so that EqualsBuilder.reflectionEquals returns false.
// As a result in case of BigDecimal data type Objects.equals is used.
// Same is about BigInteger.
- BiFunction<Object, Object, Boolean> equalsProcessor =
+ BiFunction<Object, Object, Boolean> equalsProc =
originalValItem instanceof BigDecimal || originalValItem instanceof BigInteger ?
Objects::equals :
(lhs, rhs) -> EqualsBuilder.reflectionEquals(
@@ -463,7 +463,7 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes
// Check SELECT query.
try (PreparedStatement stmt = prepareStatement(cacheName, "SELECT * FROM " + tblName)) {
- checkQuery(converterToSqlExpVal, equalsProcessor, originalVal.getClass(), originalKey, originalVal, stmt);
+ checkQuery(converterToSqlExpVal, equalsProc, originalVal.getClass(), originalKey, originalVal, stmt);
}
// Check SELECT query with where clause.
@@ -474,13 +474,13 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes
else
stmt.setObject(1, originalKey);
- checkQuery(converterToSqlExpVal, equalsProcessor, originalVal.getClass(), originalKey, originalVal, stmt);
+ checkQuery(converterToSqlExpVal, equalsProc, originalVal.getClass(), originalKey, originalVal, stmt);
}
}
else {
try (PreparedStatement stmt = prepareStatement(cacheName, "SELECT * FROM " + tblName
+ " WHERE _key = " + sqlStrKey)) {
- checkQuery(converterToSqlExpVal, equalsProcessor, originalVal.getClass(), originalKey, originalVal, stmt);
+ checkQuery(converterToSqlExpVal, equalsProc, originalVal.getClass(), originalKey, originalVal, stmt);
}
}
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingUtils.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingUtils.java
index d097c60fd46..cdd0e6181a4 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingUtils.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingUtils.java
@@ -266,7 +266,7 @@ public class GridCommandHandlerIndexingUtils {
GridDhtLocalPartition locPart = cacheCtx.topology().localPartitions().get(partId);
GridIterator<CacheDataRow> cacheDataGridIter = cacheCtx.group().offheap().partitionIterator(locPart.id());
- GridQueryProcessor qryProcessor = internalCache.context().kernalContext().query();
+ GridQueryProcessor qryProc = internalCache.context().kernalContext().query();
while (cacheDataGridIter.hasNextX()) {
CacheDataRow cacheDataRow = cacheDataGridIter.nextX();
@@ -277,7 +277,7 @@ public class GridCommandHandlerIndexingUtils {
cacheCtx.shared().database().checkpointReadLock();
try {
- qryProcessor.remove(cacheCtx, cacheDataRow);
+ qryProc.remove(cacheCtx, cacheDataRow);
}
finally {
cacheCtx.shared().database().checkpointReadUnlock();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 5a47003b626..a6b90aab5d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1026,11 +1026,11 @@ public class IgniteKernal implements IgniteEx, Externalizable {
startProcessor(new PdsConsistentIdProcessor(ctx));
- MaintenanceProcessor mntcProcessor = new MaintenanceProcessor(ctx);
+ MaintenanceProcessor mntcProc = new MaintenanceProcessor(ctx);
- startProcessor(mntcProcessor);
+ startProcessor(mntcProc);
- if (mntcProcessor.isMaintenanceMode()) {
+ if (mntcProc.isMaintenanceMode()) {
if (log.isInfoEnabled()) {
log.info(
"Node is being started in maintenance mode. " +
@@ -1148,7 +1148,7 @@ public class IgniteKernal implements IgniteEx, Externalizable {
}
// All components exept Discovery are started, time to check if maintenance is still needed.
- mntcProcessor.prepareAndExecuteMaintenance();
+ mntcProc.prepareAndExecuteMaintenance();
gw.writeLock();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java
index 85479d93eeb..ed45957db33 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java
@@ -73,11 +73,11 @@ public class IndexForceRebuildTask extends VisorMultiNodeTask<CacheIndexesForceR
Set<GridCacheContext> cachesToRebuild = new HashSet<>();
Set<String> notFound = new HashSet<>();
- final GridCacheProcessor cacheProcessor = ignite.context().cache();
+ final GridCacheProcessor cacheProc = ignite.context().cache();
if (arg.cacheNames() != null) {
for (String cacheName : arg.cacheNames()) {
- IgniteInternalCache cache = cacheProcessor.cache(cacheName);
+ IgniteInternalCache cache = cacheProc.cache(cacheName);
if (cache != null)
cachesToRebuild.add(cache.context());
@@ -87,7 +87,7 @@ public class IndexForceRebuildTask extends VisorMultiNodeTask<CacheIndexesForceR
}
else {
for (String cacheGrpName : arg.groupNames()) {
- CacheGroupContext grpCtx = cacheProcessor.cacheGroup(CU.cacheId(cacheGrpName));
+ CacheGroupContext grpCtx = cacheProc.cacheGroup(CU.cacheId(cacheGrpName));
if (grpCtx != null)
cachesToRebuild.addAll(grpCtx.caches());
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java
index 7db4707246c..ca00d85abd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java
@@ -95,14 +95,14 @@ public class ScheduleIndexRebuildTask
Set<String> notFoundCaches = new HashSet<>();
Set<String> notFoundGroups = new HashSet<>();
- GridCacheProcessor cacheProcessor = ignite.context().cache();
+ GridCacheProcessor cacheProc = ignite.context().cache();
Map<String, Set<String>> cacheToIndexes = new HashMap<>();
Map<String, Set<String>> cacheToMissedIndexes = new HashMap<>();
if (argCacheGroups != null) {
argCacheGroups.forEach(groupName -> {
- CacheGroupContext grpCtx = cacheProcessor.cacheGroup(CU.cacheId(groupName));
+ CacheGroupContext grpCtx = cacheProc.cacheGroup(CU.cacheId(groupName));
if (grpCtx == null) {
notFoundGroups.add(groupName);
@@ -120,7 +120,7 @@ public class ScheduleIndexRebuildTask
Set<String> indexesArg = indexesByCache.getValue();
int cacheId = CU.cacheId(cache);
- GridCacheContext<?, ?> cacheCtx = cacheProcessor.context().cacheContext(cacheId);
+ GridCacheContext<?, ?> cacheCtx = cacheProc.context().cacheContext(cacheId);
if (cacheCtx == null) {
notFoundCaches.add(cache);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java
index efabb97f8d3..f084f5c194f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java
@@ -578,7 +578,7 @@ public class ValidateIndexesClosure implements IgniteCallable<ValidateIndexesJob
) throws IgniteCheckedException {
boolean enoughIssues = false;
- GridQueryProcessor qryProcessor = ignite.context().query();
+ GridQueryProcessor qryProc = ignite.context().query();
final boolean skipConditions = checkFirst > 0 || checkThrough > 0;
final boolean bothSkipConditions = checkFirst > 0 && checkThrough > 0;
@@ -634,7 +634,7 @@ public class ValidateIndexesClosure implements IgniteCallable<ValidateIndexesJob
continue;
}
- QueryTypeDescriptorImpl res = qryProcessor.typeByValue(
+ QueryTypeDescriptorImpl res = qryProc.typeByValue(
cacheCtx.name(),
cacheCtx.cacheObjectContext(),
row.key(),
@@ -930,7 +930,7 @@ public class ValidateIndexesClosure implements IgniteCallable<ValidateIndexesJob
GridIterator<CacheDataRow> partIter = grpCtx.offheap().partitionIterator(partId);
- GridQueryProcessor qryProcessor = ignite.context().query();
+ GridQueryProcessor qryProc = ignite.context().query();
while (partIter.hasNextX() && !failCalcCacheSizeGrpIds.contains(grpId)) {
CacheDataRow cacheDataRow = partIter.nextX();
@@ -948,7 +948,7 @@ public class ValidateIndexesClosure implements IgniteCallable<ValidateIndexesJob
String cacheName = cacheCtx.name();
- QueryTypeDescriptorImpl qryTypeDesc = qryProcessor.typeByValue(
+ QueryTypeDescriptorImpl qryTypeDesc = qryProc.typeByValue(
cacheName,
cacheCtx.cacheObjectContext(),
cacheDataRow.key(),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EntryProcessorResourceInjectorProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EntryProcessorResourceInjectorProxy.java
index 76b2511138d..a1f3e5ad292 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EntryProcessorResourceInjectorProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/EntryProcessorResourceInjectorProxy.java
@@ -87,9 +87,9 @@ public class EntryProcessorResourceInjectorProxy<K, V, T> implements EntryProces
if (proc == null || proc instanceof EntryProcessorResourceInjectorProxy)
return proc;
- GridResourceProcessor rsrcProcessor = ctx.resource();
+ GridResourceProcessor rsrcProc = ctx.resource();
- return rsrcProcessor.isAnnotationsPresent(null, proc, GridResourceIoc.AnnotationSet.ENTRY_PROCESSOR) ?
+ return rsrcProc.isAnnotationsPresent(null, proc, GridResourceIoc.AnnotationSet.ENTRY_PROCESSOR) ?
new EntryProcessorResourceInjectorProxy<>(proc) : proc;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 48bfae0f865..0a30d1f6159 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -1902,7 +1902,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
CacheObject evtVal;
if (op == GridCacheOperation.TRANSFORM) {
- EntryProcessor<Object, Object, ?> entryProcessor =
+ EntryProcessor<Object, Object, ?> entryProc =
(EntryProcessor<Object, Object, ?>)writeObj;
CacheInvokeEntry<Object, Object> entry =
@@ -1911,7 +1911,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteThread.onEntryProcessorEntered(true);
try {
- entryProcessor.process(entry, invokeArgs);
+ entryProc.process(entry, invokeArgs);
evtVal = entry.modified() ?
cctx.toCacheObject(cctx.unwrapTemporary(entry.getValue())) : prevVal;
@@ -5731,19 +5731,19 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
* @return Entry processor return value.
*/
private IgniteBiTuple<Object, Exception> runEntryProcessor(CacheInvokeEntry<Object, Object> invokeEntry) {
- EntryProcessor<Object, Object, ?> entryProcessor = SecurityUtils.sandboxedProxy(
+ EntryProcessor<Object, Object, ?> entryProc = SecurityUtils.sandboxedProxy(
entry.context().kernalContext(), EntryProcessor.class, (EntryProcessor<Object, Object, ?>)writeObj);
IgniteThread.onEntryProcessorEntered(true);
if (invokeEntry.cctx.kernalContext().deploy().enabled() &&
- invokeEntry.cctx.kernalContext().deploy().isGlobalLoader(entryProcessor.getClass().getClassLoader())) {
+ invokeEntry.cctx.kernalContext().deploy().isGlobalLoader(entryProc.getClass().getClassLoader())) {
U.restoreDeploymentContext(invokeEntry.cctx.kernalContext(), invokeEntry.cctx.kernalContext()
- .deploy().getClassLoaderId(entryProcessor.getClass().getClassLoader()));
+ .deploy().getClassLoaderId(entryProc.getClass().getClassLoader()));
}
try {
- Object computed = entryProcessor.process(invokeEntry, invokeArgs);
+ Object computed = entryProc.process(invokeEntry, invokeArgs);
if (invokeEntry.modified()) {
GridCacheContext cctx = entry.context();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 12d2c3114d0..6c3f87c2218 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -444,18 +444,18 @@ public final class GridDhtTxPrepareFuture extends GridCacheCompoundFuture<Ignite
CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry<>(key, val,
txEntry.cached().version(), keepBinary, txEntry.cached());
- EntryProcessor<Object, Object, Object> processor = t.get1();
+ EntryProcessor<Object, Object, Object> proc = t.get1();
IgniteThread.onEntryProcessorEntered(false);
if (cctx.kernalContext().deploy().enabled() &&
- cctx.kernalContext().deploy().isGlobalLoader(processor.getClass().getClassLoader())) {
+ cctx.kernalContext().deploy().isGlobalLoader(proc.getClass().getClassLoader())) {
U.restoreDeploymentContext(cctx.kernalContext(), cctx.kernalContext()
- .deploy().getClassLoaderId(processor.getClass().getClassLoader()));
+ .deploy().getClassLoaderId(proc.getClass().getClassLoader()));
}
try {
- procRes = processor.process(invokeEntry, t.get2());
+ procRes = proc.process(invokeEntry, t.get2());
val = cacheCtx.toCacheObject(invokeEntry.getValue(true));
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index c3b2da0a9b0..40f334e30b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2089,7 +2089,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
Map<KeyCacheObject, CacheObject> putMap = null;
- Map<KeyCacheObject, EntryProcessor<Object, Object, Object>> entryProcessorMap = null;
+ Map<KeyCacheObject, EntryProcessor<Object, Object, Object>> entryProcMap = null;
Collection<KeyCacheObject> rmvKeys = null;
@@ -2135,7 +2135,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
if (op == TRANSFORM) {
- EntryProcessor<Object, Object, Object> entryProcessor = req.entryProcessor(i);
+ EntryProcessor<Object, Object, Object> entryProc = req.entryProcessor(i);
CacheObject old = entry.innerGet(
ver,
@@ -2143,7 +2143,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
/*read through*/true,
/*metrics*/true,
/*event*/true,
- entryProcessor,
+ entryProc,
taskName,
null,
req.keepBinary());
@@ -2166,7 +2166,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
IgniteThread.onEntryProcessorEntered(true);
try {
- Object computed = entryProcessor.process(invokeEntry, req.invokeArguments());
+ Object computed = entryProc.process(invokeEntry, req.invokeArguments());
if (computed != null) {
computed = ctx.unwrapTemporary(computed);
@@ -2235,7 +2235,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
writeVals,
putMap,
null,
- entryProcessorMap,
+ entryProcMap,
req,
res,
replicate,
@@ -2248,7 +2248,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
putMap = null;
writeVals = null;
- entryProcessorMap = null;
+ entryProcMap = null;
filtered = new ArrayList<>();
}
@@ -2282,7 +2282,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
null,
null,
rmvKeys,
- entryProcessorMap,
+ entryProcMap,
req,
res,
replicate,
@@ -2294,7 +2294,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
firstEntryIdx = i;
rmvKeys = null;
- entryProcessorMap = null;
+ entryProcMap = null;
filtered = new ArrayList<>();
}
@@ -2308,10 +2308,10 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
writeVals.add(updated);
}
- if (entryProcessorMap == null)
- entryProcessorMap = new HashMap<>();
+ if (entryProcMap == null)
+ entryProcMap = new HashMap<>();
- entryProcessorMap.put(entry.key(), entryProcessor);
+ entryProcMap.put(entry.key(), entryProc);
}
else if (op == UPDATE) {
CacheObject updated = req.value(i);
@@ -2404,7 +2404,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
writeVals,
putMap,
rmvKeys,
- entryProcessorMap,
+ entryProcMap,
req,
res,
replicate,
@@ -2573,13 +2573,13 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
else if (conflictCtx.isMerge())
newConflictVer = null; // Conflict version is discarded in case of merge.
- EntryProcessor<Object, Object, Object> entryProcessor = null;
+ EntryProcessor<Object, Object, Object> entryProc = null;
dhtFut.addWriteEntry(
affAssignment,
entry,
updRes.newValue(),
- entryProcessor,
+ entryProc,
updRes.newTtl(),
updRes.conflictExpireTime(),
newConflictVer,
@@ -2595,7 +2595,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
readers,
entry,
updRes.newValue(),
- entryProcessor,
+ entryProc,
updRes.newTtl(),
updRes.conflictExpireTime(),
readRepairRecovery);
@@ -2813,7 +2813,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
// Get readers before innerUpdate (reader cleared after remove).
GridDhtCacheEntry.ReaderId[] readers = entry.readersLocked();
- EntryProcessor<Object, Object, Object> entryProcessor =
+ EntryProcessor<Object, Object, Object> entryProc =
entryProcessorMap == null ? null : entryProcessorMap.get(entry.key());
boolean readRepairRecovery = op == TRANSFORM && req.entryProcessor(i) instanceof AtomicReadRepairEntryProcessor;
@@ -2847,7 +2847,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
null,
null,
dhtFut,
- entryProcessor != null);
+ entryProc != null);
assert !updRes.success() || updRes.newTtl() == CU.TTL_NOT_CHANGED || expiry != null :
"success=" + updRes.success() + ", newTtl=" + updRes.newTtl() + ", expiry=" + expiry;
@@ -2876,7 +2876,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
affAssignment,
entry,
writeVal,
- entryProcessor,
+ entryProc,
updRes.newTtl(),
CU.EXPIRE_TIME_CALCULATE,
null,
@@ -2892,7 +2892,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
readers,
entry,
writeVal,
- entryProcessor,
+ entryProc,
updRes.newTtl(),
CU.EXPIRE_TIME_CALCULATE,
readRepairRecovery);
@@ -3277,10 +3277,10 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
CacheObject val = req.value(i);
CacheObject prevVal = req.previousValue(i);
- EntryProcessor<Object, Object, Object> entryProcessor = req.entryProcessor(i);
+ EntryProcessor<Object, Object, Object> entryProc = req.entryProcessor(i);
Long updateIdx = req.updateCounter(i);
- GridCacheOperation op = entryProcessor != null ? TRANSFORM :
+ GridCacheOperation op = entryProc != null ? TRANSFORM :
(val != null) ? UPDATE : DELETE;
long ttl = req.ttl(i);
@@ -3291,7 +3291,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
nodeId,
nodeId,
op,
- op == TRANSFORM ? entryProcessor : val,
+ op == TRANSFORM ? entryProc : val,
op == TRANSFORM ? req.invokeArguments() : null,
/*write-through*/(ctx.store().isLocal() && !ctx.shared().localStorePrimaryOnly())
&& writeThrough() && !req.skipStore(),
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 5c762899af3..95db4eac657 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -177,23 +177,23 @@ public class GridNearAtomicFullUpdateRequest extends GridNearAtomicAbstractUpdat
long conflictTtl,
long conflictExpireTime,
@Nullable GridCacheVersion conflictVer) {
- EntryProcessor<Object, Object, Object> entryProcessor = null;
+ EntryProcessor<Object, Object, Object> entryProc = null;
if (op == TRANSFORM) {
assert val instanceof EntryProcessor : val;
- entryProcessor = (EntryProcessor<Object, Object, Object>)val;
+ entryProc = (EntryProcessor<Object, Object, Object>)val;
}
assert val != null || op == DELETE;
keys.add(key);
- if (entryProcessor != null) {
+ if (entryProc != null) {
if (entryProcessors == null)
entryProcessors = new ArrayList<>(initSize);
- entryProcessors.add(entryProcessor);
+ entryProcessors.add(entryProc);
}
else if (val != null) {
assert val instanceof CacheObject : val;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 66b68d72999..b420134f72f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1174,9 +1174,9 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
* Start client caches if absent.
*/
private void ensureClientCachesStarted() {
- GridCacheProcessor cacheProcessor = cctx.cache();
+ GridCacheProcessor cacheProc = cctx.cache();
- Set<String> cacheNames = new HashSet<>(cacheProcessor.cacheNames());
+ Set<String> cacheNames = new HashSet<>(cacheProc.cacheNames());
List<CacheConfiguration> notStartedCacheConfigs = new ArrayList<>();
@@ -1186,7 +1186,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
if (!notStartedCacheConfigs.isEmpty())
- cacheProcessor.dynamicStartCaches(notStartedCacheConfigs, false, false, false);
+ cacheProc.dynamicStartCaches(notStartedCacheConfigs, false, false, false);
}
/**
@@ -2925,7 +2925,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
finishState0 = finishState;
}
else {
- boolean process = mergedJoinExchMsgs != null &&
+ boolean proc = mergedJoinExchMsgs != null &&
mergedJoinExchMsgs.containsKey(node.id()) &&
mergedJoinExchMsgs.get(node.id()) == null;
@@ -2933,11 +2933,11 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
log.info("Merge server join exchange, received message [curFut=" + initialVersion() +
", node=" + node.id() +
", msgVer=" + msg.exchangeId().topologyVersion() +
- ", process=" + process +
+ ", process=" + proc +
", awaited=" + awaitMergedMsgs + ']');
}
- if (process) {
+ if (proc) {
mergedJoinExchMsgs.put(node.id(), msg);
assert awaitMergedMsgs > 0 : awaitMergedMsgs;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 2a3cf58b139..ac361269221 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -344,9 +344,9 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
}
CacheObject val = req.nearValue(i);
- EntryProcessor<Object, Object, Object> entryProcessor = req.nearEntryProcessor(i);
+ EntryProcessor<Object, Object, Object> entryProc = req.nearEntryProcessor(i);
- GridCacheOperation op = entryProcessor != null ? TRANSFORM :
+ GridCacheOperation op = entryProc != null ? TRANSFORM :
(val != null) ? UPDATE : DELETE;
long ttl = req.nearTtl(i);
@@ -357,7 +357,7 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
nodeId,
nodeId,
op,
- op == TRANSFORM ? entryProcessor : val,
+ op == TRANSFORM ? entryProc : val,
op == TRANSFORM ? req.invokeArguments() : null,
/*write-through*/false,
/*read-through*/false,
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
index a2432fdc7e3..af8a24f503c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneGridKernalContext.java
@@ -235,10 +235,10 @@ public class StandaloneGridKernalContext implements GridKernalContext {
final GridKernalContext ctx,
final File binaryMetadataFileStoreDir) {
- final CacheObjectBinaryProcessorImpl processor = new CacheObjectBinaryProcessorImpl(ctx);
- processor.setBinaryMetadataFileStoreDir(binaryMetadataFileStoreDir);
+ final CacheObjectBinaryProcessorImpl proc = new CacheObjectBinaryProcessorImpl(ctx);
+ proc.setBinaryMetadataFileStoreDir(binaryMetadataFileStoreDir);
- return processor;
+ return proc;
}
/**
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
index e23543789a5..e4a16cc3608 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
@@ -347,14 +347,14 @@ class StandaloneWalRecordsIterator extends AbstractWalRecordsIterator {
/** {@inheritDoc} */
@Override protected @NotNull WALRecord postProcessRecord(@NotNull final WALRecord rec) {
GridKernalContext kernalCtx = sharedCtx.kernalContext();
- IgniteCacheObjectProcessor processor = kernalCtx.cacheObjects();
+ IgniteCacheObjectProcessor proc = kernalCtx.cacheObjects();
- if (processor != null && (rec.type() == RecordType.DATA_RECORD
+ if (proc != null && (rec.type() == RecordType.DATA_RECORD
|| rec.type() == RecordType.DATA_RECORD_V2
|| rec.type() == RecordType.CDC_DATA_RECORD
|| rec.type() == RecordType.MVCC_DATA_RECORD)) {
try {
- return postProcessDataRecord((DataRecord)rec, kernalCtx, processor);
+ return postProcessDataRecord((DataRecord)rec, kernalCtx, proc);
}
catch (Exception e) {
log.error("Failed to perform post processing for data record ", e);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 14647675e3d..98611dba9a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -795,9 +795,9 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
CacheInvokeEntry<Object, Object> invokeEntry = new CacheInvokeEntry(key, keyVal, cacheVal, val,
ver, keepBinary(), cached());
- EntryProcessor processor = t.get1();
+ EntryProcessor proc = t.get1();
- processor.process(invokeEntry, t.get2());
+ proc.process(invokeEntry, t.get2());
val = invokeEntry.getValue();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java
index 0240ede14b8..0876630dfea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/failure/FailureProcessor.java
@@ -204,10 +204,10 @@ public class FailureProcessor extends GridProcessorAdapter {
if (igniteDumpThreadsOnFailure && !throttleThreadDump(failureCtx.type()))
U.dumpThreads(log, !failureTypeIgnored(failureCtx, hnd));
- DiagnosticProcessor diagnosticProcessor = ctx.diagnostic();
+ DiagnosticProcessor diagnosticProc = ctx.diagnostic();
- if (diagnosticProcessor != null)
- diagnosticProcessor.onFailure(failureCtx);
+ if (diagnosticProc != null)
+ diagnosticProc.onFailure(failureCtx);
boolean invalidated = hnd.onFailure(ignite, failureCtx);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index 5c5034b7f9b..c4008110866 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
@@ -440,22 +440,22 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
return new JdbcResponse(IgniteQueryErrorCode.UNEXPECTED_OPERATION, "Unknown query ID: "
+ req.cursorId() + ". Bulk load session may have been reclaimed due to timeout.");
- JdbcBulkLoadProcessor processor = (JdbcBulkLoadProcessor)jdbcCursors.get(req.cursorId());
+ JdbcBulkLoadProcessor proc = (JdbcBulkLoadProcessor)jdbcCursors.get(req.cursorId());
- if (!prepareQueryCancellationMeta(processor))
+ if (!prepareQueryCancellationMeta(proc))
return JDBC_QUERY_CANCELLED_RESPONSE;
boolean unregisterReq = false;
try {
- processor.processBatch(req);
+ proc.processBatch(req);
switch (req.cmd()) {
case CMD_FINISHED_ERROR:
case CMD_FINISHED_EOF:
jdbcCursors.remove(req.cursorId());
- processor.close();
+ proc.close();
unregisterReq = true;
@@ -468,12 +468,12 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
throw new IllegalArgumentException();
}
- return resultToResonse(new JdbcQueryExecuteResult(req.cursorId(), processor.updateCnt(), null));
+ return resultToResonse(new JdbcQueryExecuteResult(req.cursorId(), proc.updateCnt(), null));
}
catch (Exception e) {
U.error(null, "Error processing file batch", e);
- processor.onFail(e);
+ proc.onFail(e);
if (X.cause(e, QueryCancelledException.class) != null)
return exceptionToResult(new QueryCancelledException());
@@ -481,7 +481,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
return new JdbcResponse(IgniteQueryErrorCode.UNKNOWN, "Server error: " + e);
}
finally {
- cleanupQueryCancellationMeta(unregisterReq, processor.requestId());
+ cleanupQueryCancellationMeta(unregisterReq, proc.requestId());
}
}
@@ -629,15 +629,15 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
if (fieldsCur instanceof BulkLoadContextCursor) {
BulkLoadContextCursor blCur = (BulkLoadContextCursor)fieldsCur;
- BulkLoadProcessor blProcessor = blCur.bulkLoadProcessor();
+ BulkLoadProcessor blProc = blCur.bulkLoadProcessor();
BulkLoadAckClientParameters clientParams = blCur.clientParams();
- JdbcBulkLoadProcessor processor = new JdbcBulkLoadProcessor(blProcessor, req.requestId());
+ JdbcBulkLoadProcessor proc = new JdbcBulkLoadProcessor(blProc, req.requestId());
- jdbcCursors.put(processor.cursorId(), processor);
+ jdbcCursors.put(proc.cursorId(), proc);
// responses for the same query on the client side
- return resultToResonse(new JdbcBulkLoadAckResult(processor.cursorId(), clientParams));
+ return resultToResonse(new JdbcBulkLoadAckResult(proc.cursorId(), clientParams));
}
if (results.size() == 1) {
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index e91148cfc65..558611d98c9 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -628,7 +628,7 @@ public class TcpCommunicationSpi extends TcpCommunicationConfigInitializer {
final Supplier<ClusterNode> locNodeSupplier = () -> getSpiContext().localNode();
final Supplier<Ignite> igniteExSupplier = this::ignite;
final Function<UUID, Boolean> pingNode = (nodeId) -> getSpiContext().pingNode(nodeId);
- final Supplier<FailureProcessor> failureProcessorSupplier =
+ final Supplier<FailureProcessor> failureProcSupplier =
() -> ignite instanceof IgniteEx ? ((IgniteEx)ignite).context().failure() : null;
final Supplier<Boolean> isStopped = () -> getSpiContext().isStopping();
@@ -677,7 +677,7 @@ public class TcpCommunicationSpi extends TcpCommunicationConfigInitializer {
clientPool,
commWorker,
connectGate,
- failureProcessorSupplier,
+ failureProcSupplier,
attributeNames,
metricsLsnr,
nioSrvWrapper,
@@ -831,7 +831,7 @@ public class TcpCommunicationSpi extends TcpCommunicationConfigInitializer {
cfg,
attributeNames,
clientPool,
- failureProcessorSupplier,
+ failureProcSupplier,
nodeGetter,
pingNode,
this::getExceptionRegistry,
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/CommunicationWorker.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/CommunicationWorker.java
index 2be20ea5b7d..6d18247c29c 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/CommunicationWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/CommunicationWorker.java
@@ -185,16 +185,16 @@ public class CommunicationWorker extends GridWorker {
throw t;
}
finally {
- FailureProcessor failureProcessor = failureProcessorSupplier.get();
+ FailureProcessor failureProc = failureProcessorSupplier.get();
- if (failureProcessor != null) {
+ if (failureProc != null) {
if (err == null && !stopping)
err = new IllegalStateException("Thread " + spiName + " is terminated unexpectedly.");
if (err instanceof OutOfMemoryError)
- failureProcessor.process(new FailureContext(CRITICAL_ERROR, err));
+ failureProc.process(new FailureContext(CRITICAL_ERROR, err));
else if (err != null)
- failureProcessor.process(new FailureContext(SYSTEM_WORKER_TERMINATION, err));
+ failureProc.process(new FailureContext(SYSTEM_WORKER_TERMINATION, err));
}
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java
index 4532667c595..3463be42d04 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/InboundConnectionHandler.java
@@ -395,10 +395,10 @@ public class InboundConnectionHandler extends GridNioServerListenerAdapter<Messa
/** {@inheritDoc} */
@Override public void onFailure(FailureType failureType, Throwable failure) {
- FailureProcessor failureProcessor = failureProcessorSupplier.get();
+ FailureProcessor failureProc = failureProcessorSupplier.get();
- if (failureProcessor != null)
- failureProcessor.process(new FailureContext(failureType, failure));
+ if (failureProc != null)
+ failureProc.process(new FailureContext(failureType, failure));
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteCacheEntryProcessorSequentialCallTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteCacheEntryProcessorSequentialCallTest.java
index 2a8b41b190a..a1b781573ea 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteCacheEntryProcessorSequentialCallTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteCacheEntryProcessorSequentialCallTest.java
@@ -171,13 +171,13 @@ public class IgniteCacheEntryProcessorSequentialCallTest extends GridCommonAbstr
cache.put(key, val);
- NotNullCacheEntryProcessor cacheEntryProcessor = new NotNullCacheEntryProcessor();
+ NotNullCacheEntryProcessor cacheEntryProc = new NotNullCacheEntryProcessor();
try (Transaction transaction = primaryIgnite.transactions().txStart(transactionConcurrency,
transactionIsolation)) {
- cache.invoke(key, cacheEntryProcessor);
- cache.invoke(key, cacheEntryProcessor);
+ cache.invoke(key, cacheEntryProc);
+ cache.invoke(key, cacheEntryProc);
transaction.commit();
}
@@ -216,13 +216,13 @@ public class IgniteCacheEntryProcessorSequentialCallTest extends GridCommonAbstr
IgniteCache<TestKey, TestValue> nearCache = nearIgnite.cache(cacheName);
- NotNullCacheEntryProcessor cacheEntryProcessor = new NotNullCacheEntryProcessor();
+ NotNullCacheEntryProcessor cacheEntryProc = new NotNullCacheEntryProcessor();
try (Transaction transaction = nearIgnite.transactions().txStart(transactionConcurrency,
transactionIsolation)) {
- nearCache.invoke(key, cacheEntryProcessor);
- nearCache.invoke(key, cacheEntryProcessor);
+ nearCache.invoke(key, cacheEntryProc);
+ nearCache.invoke(key, cacheEntryProc);
transaction.commit();
}
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 f406613890c..cf3f2887b20 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
@@ -1542,11 +1542,11 @@ public class BinaryObjectBuilderAdditionalSelfTest extends AbstractBinaryArraysT
* @return Wrapper.
*/
private BinaryObjectBuilderImpl newWrapper(String typeName) {
- CacheObjectBinaryProcessorImpl processor = (CacheObjectBinaryProcessorImpl)(
+ CacheObjectBinaryProcessorImpl proc = (CacheObjectBinaryProcessorImpl)(
(IgniteBinaryImpl)binaries()).processor();
- return new BinaryObjectBuilderImpl(processor.binaryContext(), processor.typeId(typeName),
- processor.binaryContext().userTypeName(typeName));
+ return new BinaryObjectBuilderImpl(proc.binaryContext(), proc.typeId(typeName),
+ proc.binaryContext().userTypeName(typeName));
}
/** */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 95177ac4d7d..c178abb77b3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -1859,11 +1859,11 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract
for (int i = 0; i < gridCount(); i++)
assertNull(jcache(i).localPeek("k1", ONHEAP));
- final EntryProcessor<String, Integer, Integer> errProcessor = new FailedEntryProcessor();
+ final EntryProcessor<String, Integer, Integer> errProc = new FailedEntryProcessor();
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- cache.invoke("k1", errProcessor);
+ cache.invoke("k1", errProc);
return null;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDataTypesCoverageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDataTypesCoverageTest.java
index 389322e841d..26b2a97ae99 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDataTypesCoverageTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDataTypesCoverageTest.java
@@ -403,7 +403,7 @@ public class GridCacheDataTypesCoverageTest extends AbstractDataTypesCoverageTes
// so that EqualsBuilder.reflectionEquals returns false.
// As a result in case of BigDecimal data type Objects.equals is used.
// Same is about BigInteger.
- BiFunction<Object, Object, Boolean> equalsProcessor =
+ BiFunction<Object, Object, Boolean> equalsProc =
valsToCheck[0] instanceof BigDecimal || valsToCheck[0] instanceof BigInteger ?
Objects::equals :
(lhs, rhs) -> EqualsBuilder.reflectionEquals(
@@ -439,7 +439,7 @@ public class GridCacheDataTypesCoverageTest extends AbstractDataTypesCoverageTes
fail("Unable to retrieve value for key = [" + clonedKey + "].");
// Check Put/Get.
- assertTrue(equalsProcessor.apply(keyValEntry.getValue(), cache.get(clonedKey)));
+ assertTrue(equalsProc.apply(keyValEntry.getValue(), cache.get(clonedKey)));
// Remove.
cache.remove(clonedKey);
@@ -463,7 +463,7 @@ public class GridCacheDataTypesCoverageTest extends AbstractDataTypesCoverageTes
!waitForCondition(() -> cache.get(clonedKey) != null, TIMEOUT_FOR_KEY_RETRIEVAL_IN_FULL_ASYNC_MODE))
fail("Unable to retrieve value for key = [" + clonedKey + "].");
- assertTrue(equalsProcessor.apply(keyValEntry.getValue(), cache.get(clonedKey)));
+ assertTrue(equalsProc.apply(keyValEntry.getValue(), cache.get(clonedKey)));
}
Set<Serializable> clonedKeySet =
@@ -481,10 +481,10 @@ public class GridCacheDataTypesCoverageTest extends AbstractDataTypesCoverageTes
for (Map.Entry<Serializable, Serializable> keyValEntry : keyValMap.entrySet()) {
boolean keyFound = false;
for (Map.Entry<Object, Object> keyValEntryToCheck : mapToCheck.entrySet()) {
- if (equalsProcessor.apply(keyValEntry.getKey(), keyValEntryToCheck.getKey())) {
+ if (equalsProc.apply(keyValEntry.getKey(), keyValEntryToCheck.getKey())) {
keyFound = true;
- assertTrue(equalsProcessor.apply(keyValEntry.getValue(), keyValEntryToCheck.getValue()));
+ assertTrue(equalsProc.apply(keyValEntry.getValue(), keyValEntryToCheck.getValue()));
break;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
index 894e9d4e60c..41914ac8eed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGetAndTransformStoreAbstractTest.java
@@ -106,7 +106,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm
startGrid(1);
startGrid(2);
- final Processor entryProcessor = new Processor();
+ final Processor entryProc = new Processor();
IgniteInternalFuture<?> fut = multithreadedAsync(
new Callable<Object>() {
@@ -120,7 +120,7 @@ public abstract class GridCacheGetAndTransformStoreAbstractTest extends GridComm
c.invoke(
ThreadLocalRandom.current().nextInt(100),
- entryProcessor);
+ entryProc);
}
return null;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheProcessorActiveTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheProcessorActiveTxTest.java
index 65764e37970..1176e11ead7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheProcessorActiveTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheProcessorActiveTxTest.java
@@ -141,14 +141,14 @@ public class GridCacheProcessorActiveTxTest extends GridCommonAbstractTest {
*/
@Test
public void testDynamicCacheClose() {
- GridCacheProcessor cacheProcessor = NODE.context().cache();
+ GridCacheProcessor cacheProc = NODE.context().cache();
String cacheName = DEFAULT_CACHE_NAME;
NODE.getOrCreateCache(new CacheConfiguration<>(cacheName));
opInActiveTx(
- () -> cacheProcessor.dynamicCloseCache(cacheName),
+ () -> cacheProc.dynamicCloseCache(cacheName),
cacheName,
"dynamicCloseCache"
);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index d0f01d0fe01..f528d534e25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -1787,11 +1787,11 @@ public class IgniteCacheConfigVariationsFullApiTest extends IgniteCacheConfigVar
for (int i = 0; i < gridCount(); i++)
assertNull(jcache(i).localPeek(k1, ONHEAP));
- final EntryProcessor<Object, Object, Object> errProcessor = new FailedEntryProcessor();
+ final EntryProcessor<Object, Object, Object> errProc = new FailedEntryProcessor();
GridTestUtils.assertThrows(log, new Callable<Void>() {
@Override public Void call() throws Exception {
- cache.invoke(k1, errProcessor);
+ cache.invoke(k1, errProc);
return null;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
index dd3affa32ea..25eb0cdfd2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java
@@ -88,13 +88,13 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
public void testInternalInvokeNullable() throws Exception {
IgniteInternalCache<Integer, Integer> cache = grid(0).cachex(DEFAULT_CACHE_NAME);
- EntryProcessor<Integer, Integer, Void> processor = new NullableProcessor();
+ EntryProcessor<Integer, Integer, Void> proc = new NullableProcessor();
for (final Integer key : keys()) {
log.info("Test invoke with a nullable result [key=" + key + ']');
- EntryProcessorResult<Void> result = cache.invoke(key, processor);
- EntryProcessorResult<Void> resultAsync = cache.invokeAsync(key, processor).get();
+ EntryProcessorResult<Void> result = cache.invoke(key, proc);
+ EntryProcessorResult<Void> resultAsync = cache.invokeAsync(key, proc).get();
assertNotNull(result);
assertNotNull(resultAsync);
@@ -111,7 +111,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
*/
private void invoke(final IgniteCache<Integer, Integer> cache, @Nullable TransactionConcurrency txMode)
throws Exception {
- IncrementProcessor incProcessor = new IncrementProcessor();
+ IncrementProcessor incProc = new IncrementProcessor();
for (final Integer key : keys()) {
log.info("Test invoke [key=" + key + ", txMode=" + txMode + ']');
@@ -120,7 +120,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
Transaction tx = startTx(txMode);
- Integer res = cache.invoke(key, incProcessor);
+ Integer res = cache.invoke(key, incProc);
if (tx != null)
tx.commit();
@@ -131,7 +131,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
tx = startTx(txMode);
- res = cache.invoke(key, incProcessor);
+ res = cache.invoke(key, incProc);
if (tx != null)
tx.commit();
@@ -142,7 +142,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
tx = startTx(txMode);
- res = cache.invoke(key, incProcessor);
+ res = cache.invoke(key, incProc);
if (tx != null)
tx.commit();
@@ -213,7 +213,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
checkValue(key, 63);
- IgniteFuture<Integer> fut = cache.invokeAsync(key, incProcessor);
+ IgniteFuture<Integer> fut = cache.invokeAsync(key, incProc);
assertNotNull(fut);
@@ -435,12 +435,12 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
log.info("Test invokeAll [keys=" + keys + ", txMode=" + txMode + ']');
- IncrementProcessor incProcessor = new IncrementProcessor();
+ IncrementProcessor incProc = new IncrementProcessor();
{
Transaction tx = startTx(txMode);
- Map<Integer, EntryProcessorResult<Integer>> resMap = cache.invokeAll(keys, incProcessor);
+ Map<Integer, EntryProcessorResult<Integer>> resMap = cache.invokeAll(keys, incProc);
if (tx != null)
tx.commit();
@@ -504,7 +504,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
{
Transaction tx = startTx(txMode);
- Map<Integer, EntryProcessorResult<Integer>> resMap = cache.invokeAll(keys, incProcessor);
+ Map<Integer, EntryProcessorResult<Integer>> resMap = cache.invokeAll(keys, incProc);
if (tx != null)
tx.commit();
@@ -675,7 +675,7 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT
Map<Integer, EntryProcessor<Integer, Integer, Integer>> invokeMap = new HashMap<>();
for (Integer key : keys)
- invokeMap.put(key, incProcessor);
+ invokeMap.put(key, incProc);
fut = cache.invokeAllAsync(invokeMap);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/RestorePartitionStateDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/RestorePartitionStateDuringCheckpointTest.java
index 1395161fd89..4e9f288402c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/RestorePartitionStateDuringCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/RestorePartitionStateDuringCheckpointTest.java
@@ -86,13 +86,13 @@ public class RestorePartitionStateDuringCheckpointTest extends GridCommonAbstrac
cache.put(key, key);
- GridCacheProcessor cacheProcessor = ignite0.context().cache();
+ GridCacheProcessor cacheProc = ignite0.context().cache();
- cacheProcessor.dynamicDestroyCaches(Collections.singleton(DEFAULT_CACHE_NAME), false, false).get();
+ cacheProc.dynamicDestroyCaches(Collections.singleton(DEFAULT_CACHE_NAME), false, false).get();
assertNull(ignite0.cache(DEFAULT_CACHE_NAME));
- DataRegion region = cacheProcessor.context().database().dataRegion(DataStorageConfiguration.DFLT_DATA_REG_DEFAULT_NAME);
+ DataRegion region = cacheProc.context().database().dataRegion(DataStorageConfiguration.DFLT_DATA_REG_DEFAULT_NAME);
PageMemoryEx pageMemorySpy = spy((PageMemoryEx)region.pageMemory());
@@ -102,7 +102,7 @@ public class RestorePartitionStateDuringCheckpointTest extends GridCommonAbstrac
AtomicBoolean checkpointTriggered = new AtomicBoolean(false);
doAnswer(invocation -> {
- IgniteCacheOffheapManager.CacheDataStore partDataStore = cacheProcessor.cacheGroup(grpId).topology()
+ IgniteCacheOffheapManager.CacheDataStore partDataStore = cacheProc.cacheGroup(grpId).topology()
.localPartition(partId).dataStore();
assertNotNull(partDataStore);
@@ -135,6 +135,6 @@ public class RestorePartitionStateDuringCheckpointTest extends GridCommonAbstrac
assertTrue(checkpointTriggered.get());
- assertSame(GridDhtPartitionState.OWNING, cacheProcessor.cacheGroup(grpId).topology().localPartition(partId).state());
+ assertSame(GridDhtPartitionState.OWNING, cacheProc.cacheGroup(grpId).topology().localPartition(partId).state());
}
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index 18e81551fe6..1fbe97d3a2a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -1696,7 +1696,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
boolean filtered = false;
- boolean processorPut = false;
+ boolean procPut = false;
while (System.currentTimeMillis() < stopTime) {
Integer key = rnd.nextInt(PARTS);
@@ -1751,7 +1751,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
boolean updated = false;
while (!updated) {
- if (processorPut && prevVal != null) {
+ if (procPut && prevVal != null) {
qryClnCache.invoke(key, new CacheEntryProcessor<Object, Object, Void>() {
@Override public Void process(MutableEntry<Object, Object> entry,
Object... arguments) throws EntryProcessorException {
@@ -1767,7 +1767,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
updated = true;
}
- processorPut = !processorPut;
+ procPut = !procPut;
vals.put(key, val);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessCoordinatorLeftTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessCoordinatorLeftTest.java
index 424be5a3918..d4f696106a8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessCoordinatorLeftTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessCoordinatorLeftTest.java
@@ -111,7 +111,7 @@ public class DistributedProcessCoordinatorLeftTest extends GridCommonAbstractTes
HashMap<String, DistributedProcess<Integer, Integer>> processes = new HashMap<>();
- int processRes = 1;
+ int procRes = 1;
for (Ignite grid : G.allGrids()) {
DistributedProcess<Integer, Integer> dp = new DistributedProcess<>(((IgniteEx)grid).context(), TEST_PROCESS,
@@ -137,7 +137,7 @@ public class DistributedProcessCoordinatorLeftTest extends GridCommonAbstractTes
return fut;
},
(uuid, res, err) -> {
- if (res.values().size() == NODES_CNT - 1 && res.values().stream().allMatch(i -> i == processRes))
+ if (res.values().size() == NODES_CNT - 1 && res.values().stream().allMatch(i -> i == procRes))
finishLatch.countDown();
else
fail("Unexpected process result [res=" + res + ", err=" + err + ']');
@@ -147,7 +147,7 @@ public class DistributedProcessCoordinatorLeftTest extends GridCommonAbstractTes
processes.put(grid.name(), dp);
}
- processes.get(grid(STOP_NODE_IDX).name()).start(UUID.randomUUID(), processRes);
+ processes.get(grid(STOP_NODE_IDX).name()).start(UUID.randomUUID(), procRes);
assertTrue(startLatch.await(TIMEOUT, MILLISECONDS));
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessErrorHandlingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessErrorHandlingTest.java
index 674157e4328..08292c01d6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessErrorHandlingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/DistributedProcessErrorHandlingTest.java
@@ -140,14 +140,14 @@ public class DistributedProcessErrorHandlingTest extends GridCommonAbstractTest
private void checkDistributedProcess(
BiFunction<IgniteEx, CountDownLatch, DistributedProcess<Integer, Integer>> processFactory
) throws Exception {
- DistributedProcess<Integer, Integer> process = null;
+ DistributedProcess<Integer, Integer> proc = null;
CountDownLatch latch = new CountDownLatch(SRV_NODES + 1);
for (Ignite g: G.allGrids())
- process = processFactory.apply((IgniteEx)g, latch);
+ proc = processFactory.apply((IgniteEx)g, latch);
- process.start(UUID.randomUUID(), 0);
+ proc.start(UUID.randomUUID(), 0);
assertTrue(latch.await(5, TimeUnit.SECONDS));
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 69a532432ce..bf53f6eabbf 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
@@ -183,9 +183,9 @@ public class P2PClassLoadingFailureHandlingTest extends GridCommonAbstractTest {
IgniteCache<Integer, String> cache = client.createCache(CACHE_NAME);
cache.put(1, "1");
- EntryProcessor<Integer, String, String> processor = instantiateCacheEntryProcessorCausingP2PClassLoadProblem();
+ EntryProcessor<Integer, String, String> proc = instantiateCacheEntryProcessorCausingP2PClassLoadProblem();
- assertThrows(log, () -> cache.invoke(1, processor), CacheException.class,
+ assertThrows(log, () -> cache.invoke(1, proc), CacheException.class,
"Failed to unmarshal object");
assertThatFailureHandlerIsNotCalled();
@@ -205,9 +205,9 @@ public class P2PClassLoadingFailureHandlingTest extends GridCommonAbstractTest {
IgniteCache<Integer, String> cache = client.createCache(CACHE_NAME);
cache.put(1, "1");
- CacheEntryProcessor<Integer, String, String> processor = instantiateCacheEntryProcessorCausingP2PClassLoadProblem();
+ CacheEntryProcessor<Integer, String, String> proc = instantiateCacheEntryProcessorCausingP2PClassLoadProblem();
- assertThrows(log, () -> cache.invoke(1, processor), CacheException.class,
+ assertThrows(log, () -> cache.invoke(1, proc), CacheException.class,
"Failed to unmarshal object");
assertThatFailureHandlerIsNotCalled();
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 c0ebf16df05..80fa5be2d25 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
@@ -39,16 +39,16 @@ class JavaVersionCommand {
* @throws IOException If something goes wrong.
*/
int majorVersion(String javaHome) throws IOException, InterruptedException {
- Process process = new ProcessBuilder(GridJavaProcess.resolveJavaBin(javaHome), "-version").start();
- assertTrue(process.waitFor(10, TimeUnit.SECONDS));
+ Process proc = new ProcessBuilder(GridJavaProcess.resolveJavaBin(javaHome), "-version").start();
+ assertTrue(proc.waitFor(10, TimeUnit.SECONDS));
- if (process.exitValue() != 0) {
+ if (proc.exitValue() != 0) {
throw new IllegalStateException("'java -version' failed, stdin '" +
- readStream(process.getInputStream()) + "', stdout '" +
- readStream(process.getErrorStream()) + "'");
+ readStream(proc.getInputStream()) + "', stdout '" +
+ readStream(proc.getErrorStream()) + "'");
}
- String versionOutput = readStream(process.getErrorStream());
+ String versionOutput = readStream(proc.getErrorStream());
return JavaVersionCommandParser.extractMajorVersion(versionOutput);
}
diff --git a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
index bc30d2ae7ce..8142eb8bcc6 100644
--- a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
+++ b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverterArguments.java
@@ -352,7 +352,7 @@ public class IgniteWalConverterArguments {
Long fromTime = null;
Long toTime = null;
String recordContainsText = null;
- ProcessSensitiveData processSensitiveData = ProcessSensitiveData.SHOW;
+ ProcessSensitiveData procSensitiveData = ProcessSensitiveData.SHOW;
boolean printStat = false;
boolean skipCrc = false;
Collection<T2<Integer, Long>> pages = emptyList();
@@ -447,12 +447,12 @@ public class IgniteWalConverterArguments {
recordContainsText = arg.substring(RECORD_CONTAINS_TEXT.length() + 1);
}
else if (arg.startsWith(PROCESS_SENSITIVE_DATA + "=")) {
- final String processSensitiveDataStr = arg.substring(PROCESS_SENSITIVE_DATA.length() + 1);
+ final String procSensitiveDataStr = arg.substring(PROCESS_SENSITIVE_DATA.length() + 1);
try {
- processSensitiveData = ProcessSensitiveData.valueOf(processSensitiveDataStr);
+ procSensitiveData = ProcessSensitiveData.valueOf(procSensitiveDataStr);
}
catch (Exception e) {
- throw new IllegalArgumentException("Unknown processSensitiveData: " + processSensitiveDataStr +
+ throw new IllegalArgumentException("Unknown processSensitiveData: " + procSensitiveDataStr +
". Supported: " + Arrays.toString(ProcessSensitiveData.values()));
}
}
@@ -513,7 +513,7 @@ public class IgniteWalConverterArguments {
return new IgniteWalConverterArguments(walDir, walArchiveDir, pageSize,
binaryMetadataFileStoreDir, marshallerMappingFileStoreDir,
- keepBinary, recordTypes, fromTime, toTime, recordContainsText, processSensitiveData, printStat, skipCrc,
+ keepBinary, recordTypes, fromTime, toTime, recordContainsText, procSensitiveData, printStat, skipCrc,
pages);
}
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java
index 17d6c40126e..0020d6ba868 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/CommandProcessor.java
@@ -662,11 +662,11 @@ public class CommandProcessor extends SqlCommandProcessor {
BulkLoadParser inputParser = BulkLoadParser.createParser(cmd.inputFormat());
- BulkLoadProcessor processor = new BulkLoadProcessor(inputParser, dataConverter, outputWriter,
+ BulkLoadProcessor proc = new BulkLoadProcessor(inputParser, dataConverter, outputWriter,
idx.runningQueryManager(), qryId, ctx.tracing());
BulkLoadAckClientParameters params = new BulkLoadAckClientParameters(cmd.localFileName(), cmd.packetSize());
- return new BulkLoadContextCursor(processor, params);
+ return new BulkLoadContextCursor(proc, params);
}
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java
index 73f67d0b1a9..8ea3764add8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/KillQueryTest.java
@@ -755,12 +755,12 @@ public class KillQueryTest extends GridCommonAbstractTest {
public void testCancelQueryPartitionPruning() throws Exception {
IgniteInternalFuture cancelRes = cancel(1, asyncCancel);
- final int ROWS_ALLOWED_TO_PROCESS_AFTER_CANCEL = 400;
+ final int ROWS_ALLOWED_TO_PROC_AFTER_CANCEL = 400;
GridTestUtils.assertThrows(log, () -> {
stmt.executeQuery("select * from Integer where _key between 1000 and 2000 " +
"and awaitLatchCancelled() = 0 " +
- "and shouldNotBeCalledMoreThan(" + ROWS_ALLOWED_TO_PROCESS_AFTER_CANCEL + ")");
+ "and shouldNotBeCalledMoreThan(" + ROWS_ALLOWED_TO_PROC_AFTER_CANCEL + ")");
return null;
}, SQLException.class, "The query was cancelled while executing.");
@@ -822,14 +822,14 @@ public class KillQueryTest extends GridCommonAbstractTest {
public void testCancelDistributeJoin() throws Exception {
IgniteInternalFuture cancelRes = cancel(1, asyncCancel);
- final int ROWS_ALLOWED_TO_PROCESS_AFTER_CANCEL = MAX_ROWS - 1;
+ final int ROWS_ALLOWED_TO_PROC_AFTER_CANCEL = MAX_ROWS - 1;
GridTestUtils.assertThrows(log, () -> {
ignite.cache(DEFAULT_CACHE_NAME).query(
new SqlFieldsQuery("SELECT p1.rec_id, p1.id, p2.rec_id " +
"FROM PERS1.Person p1 JOIN PERS2.Person p2 " +
"ON p1.id = p2.id " +
- "AND shouldNotBeCalledMoreThan(" + ROWS_ALLOWED_TO_PROCESS_AFTER_CANCEL + ")" +
+ "AND shouldNotBeCalledMoreThan(" + ROWS_ALLOWED_TO_PROC_AFTER_CANCEL + ")" +
"AND awaitLatchCancelled() = 0")
.setDistributedJoins(true)
).getAll();
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java
index 2171dec3343..b15b55f680e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepositoryTest.java
@@ -92,13 +92,13 @@ public class IgniteStatisticsRepositoryTest extends StatisticsAbstractTest {
// With persistence
MetastorageLifecycleListener lsnr[] = new MetastorageLifecycleListener[1];
- GridInternalSubscriptionProcessor subscriptionProcessor = Mockito.mock(GridInternalSubscriptionProcessor.class);
+ GridInternalSubscriptionProcessor subscriptionProc = Mockito.mock(GridInternalSubscriptionProcessor.class);
Mockito.doAnswer(invocation -> lsnr[0] = invocation.getArgument(0))
- .when(subscriptionProcessor).registerMetastorageListener(Mockito.any(MetastorageLifecycleListener.class));
+ .when(subscriptionProc).registerMetastorageListener(Mockito.any(MetastorageLifecycleListener.class));
IgniteCacheDatabaseSharedManager db = Mockito.mock(IgniteCacheDatabaseSharedManager.class);
IgniteStatisticsRepository statsRepos[] = new IgniteStatisticsRepository[1];
- IgniteStatisticsStore storePersistent = new IgniteStatisticsPersistenceStoreImpl(subscriptionProcessor, db,
+ IgniteStatisticsStore storePersistent = new IgniteStatisticsPersistenceStoreImpl(subscriptionProc, db,
IgniteStatisticsRepositoryTest::getLogger);
IgniteStatisticsHelper helper = Mockito.mock(IgniteStatisticsHelper.class);
statsRepos[0] = new IgniteStatisticsRepository(storePersistent, sysViewMgr, helper,
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsStorageUnitTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsStorageUnitTest.java
index cb82c07bf68..71d4b09b9ca 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsStorageUnitTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsStorageUnitTest.java
@@ -62,9 +62,9 @@ public class StatisticsStorageUnitTest extends StatisticsAbstractTest {
IgniteStatisticsHelper helper = Mockito.mock(IgniteStatisticsHelper.class);
- GridInternalSubscriptionProcessor subscriptionProcessor = Mockito.mock(GridInternalSubscriptionProcessor.class);
+ GridInternalSubscriptionProcessor subscriptionProc = Mockito.mock(GridInternalSubscriptionProcessor.class);
Mockito.doAnswer(invocation -> lsnr[0] = invocation.getArgument(0))
- .when(subscriptionProcessor).registerMetastorageListener(Mockito.any(MetastorageLifecycleListener.class));
+ .when(subscriptionProc).registerMetastorageListener(Mockito.any(MetastorageLifecycleListener.class));
IgniteStatisticsStore inMemoryStore = new IgniteStatisticsInMemoryStoreImpl(cls -> log);
GridSystemViewManager sysViewMgr = Mockito.mock(GridSystemViewManager.class);
@@ -74,7 +74,7 @@ public class StatisticsStorageUnitTest extends StatisticsAbstractTest {
GridTestLog4jLogger log = new GridTestLog4jLogger();
IgniteCacheDatabaseSharedManager dbMgr = new IgniteCacheDatabaseSharedManager(new GridTestKernalContext(log));
- IgniteStatisticsPersistenceStoreImpl persStore = new IgniteStatisticsPersistenceStoreImpl(subscriptionProcessor,
+ IgniteStatisticsPersistenceStoreImpl persStore = new IgniteStatisticsPersistenceStoreImpl(subscriptionProc,
dbMgr, cls -> log);
ReadWriteMetaStorageMock metastorage = new ReadWriteMetaStorageMock();
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java
index 9a7683df759..08bfe9725ce 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/sql/IgniteCachePartitionedAtomicColumnConstraintsTest.java
@@ -631,7 +631,7 @@ public class IgniteCachePartitionedAtomicColumnConstraintsTest extends AbstractI
cache.put(k, okVal);
- CacheEntryProcessor<K, V, ?> entryProcessor = (e, arguments) -> {
+ CacheEntryProcessor<K, V, ?> entryProc = (e, arguments) -> {
e.setValue((V)arguments[0]);
return null;
@@ -641,11 +641,11 @@ public class IgniteCachePartitionedAtomicColumnConstraintsTest extends AbstractI
() -> cache.replace(k, v),
() -> cache.getAndReplace(k, v),
() -> cache.replace(k, okVal, v),
- () -> cache.invoke(k, entryProcessor, v),
+ () -> cache.invoke(k, entryProc, v),
() -> cache.replaceAsync(k, v).get(FUT_TIMEOUT),
() -> cache.getAndReplaceAsync(k, v).get(FUT_TIMEOUT),
() -> cache.replaceAsync(k, okVal, v).get(FUT_TIMEOUT),
- () -> cache.invokeAsync(k, entryProcessor, v).get(FUT_TIMEOUT)
+ () -> cache.invokeAsync(k, entryProc, v).get(FUT_TIMEOUT)
);
ops.forEach(checker);
@@ -672,7 +672,7 @@ public class IgniteCachePartitionedAtomicColumnConstraintsTest extends AbstractI
/** */
private <K, V> void checkPutAll(Consumer<Runnable> checker, IgniteCache<K, V> cache, T2<K, V>... entries) {
- CacheEntryProcessor<K, V, ?> entryProcessor = (e, arguments) -> {
+ CacheEntryProcessor<K, V, ?> entryProc = (e, arguments) -> {
e.setValue(((Iterator<V>)arguments[0]).next());
return null;
@@ -685,14 +685,14 @@ public class IgniteCachePartitionedAtomicColumnConstraintsTest extends AbstractI
() -> cache.putAllAsync(vals).get(FUT_TIMEOUT),
() -> {
Map<K, ? extends EntryProcessorResult<?>> map =
- cache.invokeAll(vals.keySet(), entryProcessor, vals.values().iterator());
+ cache.invokeAll(vals.keySet(), entryProc, vals.values().iterator());
for (EntryProcessorResult<?> result : map.values())
log.info(">>> " + result.get());
},
() -> {
Map<K, ? extends EntryProcessorResult<?>> map =
- cache.invokeAllAsync(vals.keySet(), entryProcessor, vals.values().iterator()).get(FUT_TIMEOUT);
+ cache.invokeAllAsync(vals.keySet(), entryProc, vals.values().iterator()).get(FUT_TIMEOUT);
for (EntryProcessorResult<?> result : map.values())
log.info(">>> " + result.get());
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index 8b6718e5b99..bb1418918d8 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -2588,7 +2588,7 @@ public class ZookeeperDiscoveryImpl {
if (log.isDebugEnabled())
log.debug("Generated CUSTOM event [evt=" + evtData + ", msg=" + msg + ']');
- boolean fastStopProcess = false;
+ boolean fastStopProc = false;
if (msg instanceof ZkInternalMessage)
processInternalMessage(evtData, (ZkInternalMessage)msg);
@@ -2599,7 +2599,7 @@ public class ZookeeperDiscoveryImpl {
if (log.isDebugEnabled())
log.debug("Fast stop process custom event [evt=" + evtData + ", msg=" + msg + ']');
- fastStopProcess = true;
+ fastStopProc = true;
// No need to process this event on others nodes, skip this event.
evtsData.evts.remove(evtData.eventId());
@@ -2628,7 +2628,7 @@ public class ZookeeperDiscoveryImpl {
saveAndProcessNewEvents();
- if (fastStopProcess)
+ if (fastStopProc)
deleteCustomEventDataAsync(zkClient, evtPath);
if (failedNode != null) {