This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-19753
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/IGNITE-19753 by this push:
new 10f29e37008 IGNITE-19754 Cache commands moved (#10782)
10f29e37008 is described below
commit 10f29e37008888f26d55481fb4481a0ffbd9b054
Author: Valery Shorin <[email protected]>
AuthorDate: Fri Jun 16 17:48:18 2023 +0300
IGNITE-19754 Cache commands moved (#10782)
---
.../snapshot/SnapshotCompressionBasicTest.java | 2 +-
.../util/GridCommandHandlerAbstractTest.java | 2 +-
...CommandHandlerCheckIncrementalSnapshotTest.java | 2 +-
.../GridCommandHandlerIndexingCheckSizeTest.java | 9 +--
.../GridCommandHandlerInterruptCommandTest.java | 4 +-
.../management/cache/CacheContentionCommand.java | 11 ++--
.../cache}/CacheFilterEnum.java | 4 +-
.../management/cache/CacheIdleVerifyCommand.java | 8 +--
.../cache/CacheIdleVerifyCommandArg.java | 2 +-
.../cache/CacheIdleVerifyDumpCommand.java | 10 ++--
.../verify => management/cache}/CacheInfo.java | 7 +--
.../management/cache/CacheListCommand.java | 25 ++++----
.../cache/CacheValidateIndexesCommand.java | 21 ++-----
.../cache}/ContentionClosure.java | 2 +-
.../cache}/ContentionInfo.java | 2 +-
.../cache/ContentionJobResult.java} | 11 ++--
.../cache/ContentionTask.java} | 29 ++++-----
.../cache/ContentionTaskResult.java} | 17 +++---
.../cache}/IdleVerifyDumpResult.java | 3 +-
.../cache/IdleVerifyDumpTask.java} | 8 +--
.../cache}/IdleVerifyException.java | 2 +-
.../cache/IdleVerifyJob.java} | 9 ++-
.../cache}/IdleVerifyResultV2.java | 4 +-
.../cache/IdleVerifyTaskV2.java} | 9 +--
.../cache}/IndexIntegrityCheckIssue.java | 2 +-
.../cache}/IndexValidationIssue.java | 2 +-
.../cache}/NoMatchingCachesException.java | 2 +-
.../verify => management/cache}/PartitionKey.java | 2 +-
.../cache}/PartitionKeyV2.java | 2 +-
.../cache}/ValidateIndexesCheckSizeIssue.java | 2 +-
.../cache}/ValidateIndexesCheckSizeResult.java | 2 +-
.../cache}/ValidateIndexesClosure.java | 11 ++--
.../cache}/ValidateIndexesContext.java | 2 +-
.../cache/ValidateIndexesJobResult.java} | 11 ++--
.../cache}/ValidateIndexesPartitionResult.java | 2 +-
.../cache/ValidateIndexesTask.java} | 19 +++---
.../cache/ValidateIndexesTaskResult.java} | 14 ++---
.../cache}/VerifyBackupPartitionsDumpTask.java | 5 +-
.../cache}/VerifyBackupPartitionsTaskV2.java | 5 +-
.../cache}/ViewCacheClosure.java | 9 ++-
.../cache/ViewCacheCmd.java} | 8 +--
.../cache/ViewCacheTask.java} | 22 ++++---
.../cache/ViewCacheTaskResult.java} | 11 ++--
.../snapshot/IgniteSnapshotManager.java | 2 +-
.../IncrementalSnapshotVerificationTask.java | 4 +-
.../IncrementalSnapshotVerificationTaskResult.java | 2 +-
.../SnapshotPartitionsQuickVerifyHandler.java | 2 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 4 +-
.../snapshot/SnapshotPartitionsVerifyTask.java | 6 +-
.../SnapshotPartitionsVerifyTaskResult.java | 2 +-
.../verify/CollectConflictPartitionKeysTask.java | 1 +
.../processors/cache/verify/IdleVerifyUtility.java | 1 +
.../cache/verify/PartitionHashRecord.java | 1 +
.../cache/verify/PartitionHashRecordV2.java | 1 +
.../RetrieveConflictPartitionValuesTask.java | 1 +
.../main/resources/META-INF/classnames.properties | 70 +++++++++++-----------
.../GridCacheFastNodeLeftForTransactionTest.java | 2 +-
.../HistoricalRebalanceCheckpointTest.java | 2 +-
.../snapshot/EncryptedSnapshotTest.java | 2 +-
.../snapshot/IgniteClusterSnapshotCheckTest.java | 9 +--
.../IgniteClusterSnapshotRestoreSelfTest.java | 2 +-
.../snapshot/IgniteSnapshotConsistencyTest.java | 2 +-
.../IgniteSnapshotRestoreFromRemoteTest.java | 2 +-
.../TxRollbackOnTimeoutOnePhaseCommitTest.java | 2 +-
.../TxWithSmallTimeoutAndContentionOneKeyTest.java | 4 +-
.../junits/common/GridCommonAbstractTest.java | 7 ++-
.../cache/index/IndexCorruptionRebuildTest.java | 6 +-
.../IgnitePdsIndexingDefragmentationTest.java | 6 +-
...xingMultithreadedLoadContinuousRestartTest.java | 6 +-
.../db/LongDestroyDurableBackgroundTaskTest.java | 17 +++---
.../IgniteClusterSnapshotCheckWithIndexesTest.java | 2 +-
.../IgniteClusterSnapshotWithIndexesTest.java | 2 +-
.../processors/database/RebuildIndexTest.java | 2 +-
.../RebuildIndexWithHistoricalRebalanceTest.java | 6 +-
.../processors/query/h2/GridIndexRebuildTest.java | 26 ++++----
75 files changed, 258 insertions(+), 282 deletions(-)
diff --git
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
index d895b430b94..4ccdf4ca3c3 100644
---
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
+++
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
@@ -49,9 +49,9 @@ import org.apache.ignite.configuration.DiskPageCompression;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.GridKernalContextImpl;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
import
org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIO;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
index 28b99912d18..efb93665a57 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerAbstractTest.java
@@ -81,7 +81,7 @@ import static
org.apache.ignite.events.EventType.EVT_CONSISTENCY_VIOLATION;
import static
org.apache.ignite.internal.commandline.ArgumentParser.CMD_AUTO_CONFIRMATION;
import static
org.apache.ignite.internal.encryption.AbstractEncryptionTest.KEYSTORE_PASSWORD;
import static
org.apache.ignite.internal.encryption.AbstractEncryptionTest.KEYSTORE_PATH;
-import static
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsDumpTask.IDLE_DUMP_FILE_PREFIX;
+import static
org.apache.ignite.internal.management.cache.VerifyBackupPartitionsDumpTask.IDLE_DUMP_FILE_PREFIX;
/**
* Common abstract class for testing {@link CommandHandler}.
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIncrementalSnapshotTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIncrementalSnapshotTest.java
index f597ae6e263..6cf4a640139 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIncrementalSnapshotTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerCheckIncrementalSnapshotTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
import org.apache.ignite.internal.commandline.CommandHandler;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
import org.apache.ignite.internal.pagemem.wal.record.TxRecord;
@@ -39,7 +40,6 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPr
import
org.apache.ignite.internal.processors.cache.persistence.StorageException;
import
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager;
import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteUuid;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingCheckSizeTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingCheckSizeTest.java
index b3f9bada2c8..e31bd4fc0f2 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingCheckSizeTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingCheckSizeTest.java
@@ -37,14 +37,15 @@ import
org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.management.cache.CacheValidateIndexesCommand;
+import
org.apache.ignite.internal.management.cache.ValidateIndexesCheckSizeIssue;
+import
org.apache.ignite.internal.management.cache.ValidateIndexesCheckSizeResult;
+import org.apache.ignite.internal.management.cache.ValidateIndexesTaskResult;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesCheckSizeIssue;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesCheckSizeResult;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult;
import org.apache.ignite.util.GridCommandHandlerIndexingUtils.Organization;
import org.apache.ignite.util.GridCommandHandlerIndexingUtils.Person;
import org.junit.Test;
+
import static java.lang.String.valueOf;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyMap;
@@ -470,7 +471,7 @@ public class GridCommandHandlerIndexingCheckSizeTest
extends GridCommandHandlerC
assertContains(log, out, "Size check");
Map<String, ValidateIndexesCheckSizeResult> valIdxCheckSizeResults =
-
((VisorValidateIndexesTaskResult)lastOperationResult).results().get(node.localNode().id())
+
((ValidateIndexesTaskResult)lastOperationResult).results().get(node.localNode().id())
.checkSizeResult();
assertEquals(rmvByTbl.size(), valIdxCheckSizeResults.size());
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
index 56db6267d7b..a6db6a42d23 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerInterruptCommandTest.java
@@ -36,8 +36,8 @@ import org.apache.ignite.events.DeploymentEvent;
import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.ListeningTestLogger;
import org.apache.ignite.testframework.LogListener;
@@ -56,7 +56,7 @@ public class GridCommandHandlerInterruptCommandTest extends
GridCommandHandlerAb
private static final String IDLE_VERIFY_TASK_V2 =
"org.apache.ignite.internal.visor.verify.VisorIdleVerifyTaskV2";
/** Validate index task name. */
- private static final String VALIDATE_INDEX_TASK =
"org.apache.ignite.internal.visor.verify.VisorValidateIndexesTask";
+ private static final String VALIDATE_INDEX_TASK =
"org.apache.ignite.internal.visor.verify.ValidateIndexesTask";
/** Log listener. */
private ListeningTestLogger lnsrLog;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommand.java
index 691fec0acb2..92c92de1e4e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommand.java
@@ -25,12 +25,9 @@ import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.CommandUtils;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.processors.cache.verify.ContentionInfo;
-import org.apache.ignite.internal.visor.verify.VisorContentionTask;
-import org.apache.ignite.internal.visor.verify.VisorContentionTaskResult;
/** Prints info about contended keys (the keys concurrently locked from
multiple transactions). */
-public class CacheContentionCommand implements
ComputeCommand<CacheContentionCommandArg, VisorContentionTaskResult> {
+public class CacheContentionCommand implements
ComputeCommand<CacheContentionCommandArg, ContentionTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Show the keys that are point of contention for multiple
transactions";
@@ -42,8 +39,8 @@ public class CacheContentionCommand implements
ComputeCommand<CacheContentionCom
}
/** {@inheritDoc} */
- @Override public Class<VisorContentionTask> taskClass() {
- return VisorContentionTask.class;
+ @Override public Class<ContentionTask> taskClass() {
+ return ContentionTask.class;
}
/** {@inheritDoc} */
@@ -52,7 +49,7 @@ public class CacheContentionCommand implements
ComputeCommand<CacheContentionCom
}
/** {@inheritDoc} */
- @Override public void printResult(CacheContentionCommandArg arg,
VisorContentionTaskResult res, Consumer<String> printer) {
+ @Override public void printResult(CacheContentionCommandArg arg,
ContentionTaskResult res, Consumer<String> printer) {
CommandUtils.printErrors(res.exceptions(), "Contention check failed on
nodes:", printer);
for (ContentionInfo info : res.getInfos())
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/CacheFilterEnum.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFilterEnum.java
similarity index 92%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/CacheFilterEnum.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFilterEnum.java
index eeec5bf45b8..08ace4012f7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/CacheFilterEnum.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFilterEnum.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import org.jetbrains.annotations.Nullable;
/**
* Represents a type of cache(s) that can be used for comparing update
counters and checksums between primary and backup partitions.
* <br>
- * @see
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2
+ * @see VerifyBackupPartitionsTaskV2
*/
public enum CacheFilterEnum {
/** Default - user only, or all caches specified by name. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommand.java
index 472a4c8fd90..867d37b1628 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommand.java
@@ -28,12 +28,10 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.management.api.CliSubcommandsWithPrefix;
import org.apache.ignite.internal.management.api.CommandRegistryImpl;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.verify.VisorIdleVerifyTaskV2;
import org.apache.ignite.logger.java.JavaLoggerFileHandler;
-import static
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsDumpTask.logParsedArgs;
+import static
org.apache.ignite.internal.management.cache.VerifyBackupPartitionsDumpTask.logParsedArgs;
/** Checks consistency of primary and backup partitions assuming no concurrent
updates are happening in the cluster. */
@CliSubcommandsWithPrefix
@@ -69,8 +67,8 @@ public class CacheIdleVerifyCommand
}
/** {@inheritDoc} */
- @Override public Class<VisorIdleVerifyTaskV2> taskClass() {
- return VisorIdleVerifyTaskV2.class;
+ @Override public Class<IdleVerifyTaskV2> taskClass() {
+ return IdleVerifyTaskV2.class;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java
index cfb61dff462..83add99b21b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java
@@ -27,7 +27,7 @@ import
org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.management.api.Argument;
import org.apache.ignite.internal.management.api.Positional;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.verify.CacheFilterEnum;
+
import static java.lang.String.format;
/** */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyDumpCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyDumpCommand.java
index d5375d5b4ce..ec26836cc3d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyDumpCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyDumpCommand.java
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.management.cache;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.verify.VisorIdleVerifyDumpTask;
-import static
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsDumpTask.logParsedArgs;
+
+import static
org.apache.ignite.internal.management.cache.VerifyBackupPartitionsDumpTask.logParsedArgs;
/** */
public class CacheIdleVerifyDumpCommand implements
ComputeCommand<CacheIdleVerifyCommandArg, String> {
@@ -35,13 +35,13 @@ public class CacheIdleVerifyDumpCommand implements
ComputeCommand<CacheIdleVerif
}
/** {@inheritDoc} */
- @Override public Class<VisorIdleVerifyDumpTask> taskClass() {
- return VisorIdleVerifyDumpTask.class;
+ @Override public Class<IdleVerifyDumpTask> taskClass() {
+ return IdleVerifyDumpTask.class;
}
/** {@inheritDoc} */
@Override public void printResult(CacheIdleVerifyCommandArg arg, String
path, Consumer<String> printer) {
- printer.accept("VisorIdleVerifyDumpTask successfully written output to
'" + path + "'");
+ printer.accept("IdleVerifyDumpTask successfully written output to '" +
path + "'");
logParsedArgs(arg, printer);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CacheInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CacheInfo.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java
index 4b2aeee56d8..fcd6f23c24f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CacheInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -28,7 +28,6 @@ import
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
-import org.apache.ignite.internal.visor.verify.VisorViewCacheCmd;
/**
* Cache info DTO.
@@ -279,7 +278,7 @@ public class CacheInfo extends VisorDataTransferObject {
* @param cmd Cache command.
* @return Header.
*/
- public Object name(VisorViewCacheCmd cmd) {
+ public Object name(ViewCacheCmd cmd) {
switch (cmd) {
case CACHES:
return getCacheName();
@@ -298,7 +297,7 @@ public class CacheInfo extends VisorDataTransferObject {
/**
* @param cmd Command.
*/
- public Map<String, Object> toMap(VisorViewCacheCmd cmd) {
+ public Map<String, Object> toMap(ViewCacheCmd cmd) {
Map<String, Object> map;
switch (cmd) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java
index fd27d101e15..3d8aee107f1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommand.java
@@ -31,7 +31,6 @@ import org.apache.ignite.internal.client.GridClient;
import org.apache.ignite.internal.client.GridClientException;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.LocalCommand;
-import org.apache.ignite.internal.processors.cache.verify.CacheInfo;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.visor.VisorTaskArgument;
import org.apache.ignite.internal.visor.cache.VisorCacheAffinityConfiguration;
@@ -43,15 +42,13 @@ import
org.apache.ignite.internal.visor.cache.VisorCacheNearConfiguration;
import org.apache.ignite.internal.visor.cache.VisorCacheRebalanceConfiguration;
import org.apache.ignite.internal.visor.cache.VisorCacheStoreConfiguration;
import org.apache.ignite.internal.visor.query.VisorQueryConfiguration;
-import org.apache.ignite.internal.visor.verify.VisorViewCacheCmd;
-import org.apache.ignite.internal.visor.verify.VisorViewCacheTask;
-import org.apache.ignite.internal.visor.verify.VisorViewCacheTaskResult;
-import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.CACHES;
-import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.GROUPS;
-import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.SEQ;
+
+import static org.apache.ignite.internal.management.cache.ViewCacheCmd.CACHES;
+import static org.apache.ignite.internal.management.cache.ViewCacheCmd.GROUPS;
+import static org.apache.ignite.internal.management.cache.ViewCacheCmd.SEQ;
/** Prints info regarding caches, groups or sequences. */
-public class CacheListCommand implements LocalCommand<CacheListCommandArg,
VisorViewCacheTaskResult> {
+public class CacheListCommand implements LocalCommand<CacheListCommandArg,
ViewCacheTaskResult> {
/** */
Function<CacheListCommandArg, Predicate<GridClientNode>> FILTER = arg ->
node ->
node.connectable() && (arg.nodeId() == null ||
Objects.equals(node.nodeId(), arg.nodeId()));
@@ -68,12 +65,12 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, Visor
}
/** {@inheritDoc} */
- @Override public VisorViewCacheTaskResult execute(
+ @Override public ViewCacheTaskResult execute(
GridClient cli,
CacheListCommandArg arg,
Consumer<String> printer
) throws Exception {
- VisorViewCacheCmd cmd = arg.groups()
+ ViewCacheCmd cmd = arg.groups()
? GROUPS
: (arg.seq() ? SEQ : CACHES);
@@ -85,8 +82,8 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, Visor
if (!node.isPresent())
throw new IllegalArgumentException("Node not found: id=" +
arg.nodeId());
- VisorViewCacheTaskResult res =
cli.compute().projection(node.get()).execute(
- VisorViewCacheTask.class.getName(),
+ ViewCacheTaskResult res = cli.compute().projection(node.get()).execute(
+ ViewCacheTask.class.getName(),
new
VisorTaskArgument<>(Collections.singleton(node.get().nodeId()), arg, false)
);
@@ -106,7 +103,7 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, Visor
private void cachesConfig(
GridClient cli,
CacheListCommandArg arg,
- VisorViewCacheTaskResult viewRes,
+ ViewCacheTaskResult viewRes,
Consumer<String> printer
) throws GridClientException {
Collection<GridClientNode> nodes = cli.compute().nodes()
@@ -135,7 +132,7 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, Visor
* @param infos Caches info.
* @param cmd Command.
*/
- private void printCacheInfos(Collection<CacheInfo> infos,
VisorViewCacheCmd cmd, Consumer<String> printer) {
+ private void printCacheInfos(Collection<CacheInfo> infos, ViewCacheCmd
cmd, Consumer<String> printer) {
for (CacheInfo info : infos) {
Map<String, Object> map = info.toMap(cmd);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommand.java
index 7bdf0dd3afa..d953f69969e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommand.java
@@ -25,15 +25,6 @@ import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.CommandUtils;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKey;
-import org.apache.ignite.internal.visor.verify.IndexIntegrityCheckIssue;
-import org.apache.ignite.internal.visor.verify.IndexValidationIssue;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesCheckSizeIssue;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesCheckSizeResult;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesPartitionResult;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTask;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult;
import static
org.apache.ignite.internal.management.api.CommandUtils.DOUBLE_INDENT;
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
@@ -41,7 +32,7 @@ import static
org.apache.ignite.internal.management.api.CommandUtils.join;
/** Validates indexes attempting to read each indexed entry. */
public class CacheValidateIndexesCommand
- implements ComputeCommand<CacheValidateIndexesCommandArg,
VisorValidateIndexesTaskResult> {
+ implements ComputeCommand<CacheValidateIndexesCommandArg,
ValidateIndexesTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Validates indexes for the specified caches/cache groups on an
idle cluster " +
@@ -55,8 +46,8 @@ public class CacheValidateIndexesCommand
}
/** {@inheritDoc} */
- @Override public Class<VisorValidateIndexesTask> taskClass() {
- return VisorValidateIndexesTask.class;
+ @Override public Class<ValidateIndexesTask> taskClass() {
+ return ValidateIndexesTask.class;
}
/** {@inheritDoc} */
@@ -67,13 +58,13 @@ public class CacheValidateIndexesCommand
/** {@inheritDoc} */
@Override public void printResult(
CacheValidateIndexesCommandArg arg,
- VisorValidateIndexesTaskResult res0,
+ ValidateIndexesTaskResult res0,
Consumer<String> printer
) {
boolean errors = CommandUtils.printErrors(res0.exceptions(), "Index
validation failed on nodes:", printer);
- for (Map.Entry<UUID, VisorValidateIndexesJobResult> nodeEntry :
res0.results().entrySet()) {
- VisorValidateIndexesJobResult jobRes = nodeEntry.getValue();
+ for (Map.Entry<UUID, ValidateIndexesJobResult> nodeEntry :
res0.results().entrySet()) {
+ ValidateIndexesJobResult jobRes = nodeEntry.getValue();
if (!jobRes.hasIssues())
continue;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionClosure.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionClosure.java
index 8e3089fdcaa..e5453331d15 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionClosure.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionInfo.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionInfo.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionInfo.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionInfo.java
index c7bfbebef43..533fb360359 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ContentionInfo.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.Serializable;
import java.util.List;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionJobResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionJobResult.java
similarity index 85%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionJobResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionJobResult.java
index 427224423c6..9ad2c7c4294 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionJobResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionJobResult.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.internal.processors.cache.verify.ContentionInfo;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
@@ -30,7 +29,7 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
*
*/
-public class VisorContentionJobResult extends VisorDataTransferObject {
+public class ContentionJobResult extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -40,14 +39,14 @@ public class VisorContentionJobResult extends
VisorDataTransferObject {
/**
* @param info Info.
*/
- public VisorContentionJobResult(ContentionInfo info) {
+ public ContentionJobResult(ContentionInfo info) {
this.info = info;
}
/**
* For externalization only.
*/
- public VisorContentionJobResult() {
+ public ContentionJobResult() {
}
/**
@@ -75,6 +74,6 @@ public class VisorContentionJobResult extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorContentionJobResult.class, this);
+ return S.toString(ContentionJobResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTask.java
similarity index 65%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTask.java
index 994edda447b..d878f0de1f6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,9 +24,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
-import org.apache.ignite.internal.management.cache.CacheContentionCommandArg;
-import org.apache.ignite.internal.processors.cache.verify.ContentionClosure;
-import org.apache.ignite.internal.processors.cache.verify.ContentionInfo;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
@@ -37,15 +34,15 @@ import org.jetbrains.annotations.Nullable;
*
*/
@GridInternal
-public class VisorContentionTask extends
VisorMultiNodeTask<CacheContentionCommandArg,
- VisorContentionTaskResult, VisorContentionJobResult> {
+public class ContentionTask extends
VisorMultiNodeTask<CacheContentionCommandArg,
+ ContentionTaskResult, ContentionJobResult> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Nullable @Override protected VisorContentionTaskResult
reduce0(List<ComputeJobResult> list) throws IgniteException {
+ @Nullable @Override protected ContentionTaskResult
reduce0(List<ComputeJobResult> list) throws IgniteException {
Map<UUID, Exception> exceptions = new HashMap<>();
- List<VisorContentionJobResult> infos = new ArrayList<>();
+ List<ContentionJobResult> infos = new ArrayList<>();
for (ComputeJobResult res : list) {
if (res.getException() != null)
@@ -54,18 +51,18 @@ public class VisorContentionTask extends
VisorMultiNodeTask<CacheContentionComma
infos.add(res.getData());
}
- return new VisorContentionTaskResult(infos, exceptions);
+ return new ContentionTaskResult(infos, exceptions);
}
/** {@inheritDoc} */
- @Override protected VisorJob<CacheContentionCommandArg,
VisorContentionJobResult> job(CacheContentionCommandArg arg) {
- return new VisorContentionJob(arg, debug);
+ @Override protected VisorJob<CacheContentionCommandArg,
ContentionJobResult> job(CacheContentionCommandArg arg) {
+ return new CacheContentionJob(arg, debug);
}
/**
*
*/
- private static class VisorContentionJob extends
VisorJob<CacheContentionCommandArg, VisorContentionJobResult> {
+ private static class CacheContentionJob extends
VisorJob<CacheContentionCommandArg, ContentionJobResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -73,12 +70,12 @@ public class VisorContentionTask extends
VisorMultiNodeTask<CacheContentionComma
* @param arg Argument.
* @param debug Debug.
*/
- protected VisorContentionJob(@Nullable CacheContentionCommandArg arg,
boolean debug) {
+ protected CacheContentionJob(@Nullable CacheContentionCommandArg arg,
boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorContentionJobResult run(@Nullable
CacheContentionCommandArg arg) throws IgniteException {
+ @Override protected ContentionJobResult run(@Nullable
CacheContentionCommandArg arg) throws IgniteException {
try {
ContentionClosure clo = new
ContentionClosure(arg.minQueueSize(), arg.maxPrint());
@@ -86,7 +83,7 @@ public class VisorContentionTask extends
VisorMultiNodeTask<CacheContentionComma
ContentionInfo info = clo.call();
- return new VisorContentionJobResult(info);
+ return new ContentionJobResult(info);
}
catch (Exception e) {
throw new IgniteException(e);
@@ -95,7 +92,7 @@ public class VisorContentionTask extends
VisorMultiNodeTask<CacheContentionComma
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorContentionJob.class, this);
+ return S.toString(CacheContentionJob.class, this);
}
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java
similarity index 80%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java
index 5c452caf0e9..ba01a4bf8fd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorContentionTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -25,7 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.apache.ignite.internal.processors.cache.verify.ContentionInfo;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
@@ -33,12 +32,12 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
*
*/
-public class VisorContentionTaskResult extends VisorDataTransferObject {
+public class ContentionTaskResult extends VisorDataTransferObject {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** Cluster infos. */
- private List<VisorContentionJobResult> clusterInfos;
+ private List<ContentionJobResult> clusterInfos;
/** Exceptions. */
private Map<UUID, Exception> exceptions;
@@ -47,7 +46,7 @@ public class VisorContentionTaskResult extends
VisorDataTransferObject {
* @param clusterInfos Cluster infos.
* @param exceptions Exceptions.
*/
- public VisorContentionTaskResult(List<VisorContentionJobResult>
clusterInfos,
+ public ContentionTaskResult(List<ContentionJobResult> clusterInfos,
Map<UUID, Exception> exceptions) {
this.clusterInfos = clusterInfos;
this.exceptions = exceptions;
@@ -56,13 +55,13 @@ public class VisorContentionTaskResult extends
VisorDataTransferObject {
/**
* For externalization only.
*/
- public VisorContentionTaskResult() {
+ public ContentionTaskResult() {
}
/**
* @return Cluster infos.
*/
- public Collection<VisorContentionJobResult> jobResults() {
+ public Collection<ContentionJobResult> jobResults() {
return clusterInfos;
}
@@ -70,7 +69,7 @@ public class VisorContentionTaskResult extends
VisorDataTransferObject {
* @return Collection of {@link ContentionInfo} collected during task
execution.
*/
public Collection<ContentionInfo> getInfos() {
- return
clusterInfos.stream().map(VisorContentionJobResult::info).collect(Collectors.toList());
+ return
clusterInfos.stream().map(ContentionJobResult::info).collect(Collectors.toList());
}
/**
@@ -95,6 +94,6 @@ public class VisorContentionTaskResult extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorContentionTaskResult.class, this);
+ return S.toString(ContentionTaskResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyDumpResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java
similarity index 94%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyDumpResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java
index 6a744050ad8..9e3554d428e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyDumpResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.List;
import java.util.Map;
+import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyDumpTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpTask.java
similarity index 75%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyDumpTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpTask.java
index 5a314f4771a..d1ae89561b6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyDumpTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpTask.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
-import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
-import
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsDumpTask;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
@@ -27,12 +25,12 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
* Task to verify checksums of backup partitions and return all collected
information.
*/
@GridInternal
-public class VisorIdleVerifyDumpTask extends
VisorOneNodeTask<CacheIdleVerifyCommandArg, String> {
+public class IdleVerifyDumpTask extends
VisorOneNodeTask<CacheIdleVerifyCommandArg, String> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<CacheIdleVerifyCommandArg, String>
job(CacheIdleVerifyCommandArg arg) {
- return new VisorIdleVerifyJob<>(arg, debug,
VerifyBackupPartitionsDumpTask.class);
+ return new IdleVerifyJob<>(arg, debug,
VerifyBackupPartitionsDumpTask.class);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyException.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyException.java
index cec22f4ee6e..5f4b430b9a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyException.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.Collection;
import java.util.stream.Collectors;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyJob.java
similarity index 91%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyJob.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyJob.java
index f0f47bd26cf..11c65f5f520 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyJob.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -23,7 +23,6 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.compute.ComputeJobContext;
import org.apache.ignite.compute.ComputeTask;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorJob;
@@ -35,7 +34,7 @@ import static
org.apache.ignite.internal.processors.task.TaskExecutionOptions.op
/**
*
*/
-class VisorIdleVerifyJob<ResultT> extends VisorJob<CacheIdleVerifyCommandArg,
ResultT> {
+class IdleVerifyJob<ResultT> extends VisorJob<CacheIdleVerifyCommandArg,
ResultT> {
/** */
private static final long serialVersionUID = 0L;
@@ -58,7 +57,7 @@ class VisorIdleVerifyJob<ResultT> extends
VisorJob<CacheIdleVerifyCommandArg, Re
* @param debug Debug.
* @param taskCls Task class for execution.
*/
- VisorIdleVerifyJob(
+ IdleVerifyJob(
CacheIdleVerifyCommandArg arg,
boolean debug,
Class<? extends ComputeTask<CacheIdleVerifyCommandArg, ResultT>>
taskCls
@@ -98,6 +97,6 @@ class VisorIdleVerifyJob<ResultT> extends
VisorJob<CacheIdleVerifyCommandArg, Re
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorIdleVerifyJob.class, this);
+ return S.toString(IdleVerifyJob.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyResultV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResultV2.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyResultV2.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResultV2.java
index 5277058fd1e..52e7deb93f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyResultV2.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResultV2.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -32,6 +32,8 @@ import java.util.TreeSet;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.apache.ignite.cluster.ClusterNode;
+import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
+import
org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyTaskV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyTaskV2.java
similarity index 71%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyTaskV2.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyTaskV2.java
index 2c2f94bea58..36b3654198c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorIdleVerifyTaskV2.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyTaskV2.java
@@ -15,11 +15,8 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
-import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
-import
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
@@ -28,12 +25,12 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
* Task to verify checksums of backup partitions.
*/
@GridInternal
-public class VisorIdleVerifyTaskV2 extends
VisorOneNodeTask<CacheIdleVerifyCommandArg, IdleVerifyResultV2> {
+public class IdleVerifyTaskV2 extends
VisorOneNodeTask<CacheIdleVerifyCommandArg, IdleVerifyResultV2> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<CacheIdleVerifyCommandArg,
IdleVerifyResultV2> job(CacheIdleVerifyCommandArg arg) {
- return new VisorIdleVerifyJob<>(arg, debug,
VerifyBackupPartitionsTaskV2.class);
+ return new IdleVerifyJob<>(arg, debug,
VerifyBackupPartitionsTaskV2.class);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/IndexIntegrityCheckIssue.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/IndexIntegrityCheckIssue.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java
index ec6e5b24407..f861945f574 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/IndexIntegrityCheckIssue.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/IndexValidationIssue.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/IndexValidationIssue.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java
index 37f936088b4..a74a7fcc11e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/IndexValidationIssue.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/NoMatchingCachesException.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/NoMatchingCachesException.java
similarity index 94%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/NoMatchingCachesException.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/NoMatchingCachesException.java
index a073a423b28..323c75992f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/NoMatchingCachesException.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/NoMatchingCachesException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import org.apache.ignite.IgniteException;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionKey.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKey.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionKey.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKey.java
index 7c9371e6d48..886bc1dee8c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionKey.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKey.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.Serializable;
import org.apache.ignite.internal.util.typedef.internal.S;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionKeyV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKeyV2.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionKeyV2.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKeyV2.java
index 1332b0a0e30..7688c6c1dbd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionKeyV2.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/PartitionKeyV2.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesCheckSizeIssue.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesCheckSizeIssue.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java
index b87f2a65021..9b8d3d5d221 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesCheckSizeIssue.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesCheckSizeResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesCheckSizeResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java
index c610163c4f4..8c58f056a62 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesCheckSizeResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java
similarity index 99%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java
index 634768ac9fd..4bc27a679af 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesClosure.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Collection;
@@ -64,7 +64,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree;
import
org.apache.ignite.internal.processors.cache.persistence.tree.CorruptedTreeException;
import org.apache.ignite.internal.processors.cache.verify.GridNotIdleException;
import org.apache.ignite.internal.processors.cache.verify.IdleVerifyUtility;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKey;
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.processors.query.QueryTypeDescriptorImpl;
import org.apache.ignite.internal.util.lang.GridCursor;
@@ -103,7 +102,7 @@ import static
org.apache.ignite.internal.util.IgniteUtils.error;
* 3. If entry is present in cache SQL index, it's present in cache data tree
* 4. If size of cache and index on same table are not same
*/
-public class ValidateIndexesClosure implements
IgniteCallable<VisorValidateIndexesJobResult> {
+public class ValidateIndexesClosure implements
IgniteCallable<ValidateIndexesJobResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -196,7 +195,7 @@ public class ValidateIndexesClosure implements
IgniteCallable<VisorValidateIndex
}
/** {@inheritDoc} */
- @Override public VisorValidateIndexesJobResult call() throws Exception {
+ @Override public ValidateIndexesJobResult call() throws Exception {
calcExecutor =
Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
try {
@@ -249,7 +248,7 @@ public class ValidateIndexesClosure implements
IgniteCallable<VisorValidateIndex
/**
*
*/
- private VisorValidateIndexesJobResult call0() {
+ private ValidateIndexesJobResult call0() {
if (validateCtx.isCancelled())
throw new IgniteException(CANCELLED_MSG);
@@ -397,7 +396,7 @@ public class ValidateIndexesClosure implements
IgniteCallable<VisorValidateIndex
if (validateCtx.isCancelled())
throw new IgniteException(CANCELLED_MSG);
- return new VisorValidateIndexesJobResult(
+ return new ValidateIndexesJobResult(
partResults,
idxResults,
integrityCheckResults.values(),
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesContext.java
similarity index 95%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesContext.java
index 48909d65a25..cb32875f2f0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
/**
* Validate indexes context.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesJobResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java
similarity index 93%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesJobResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java
index 4b056d84c28..9c884525bc5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesJobResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -23,7 +23,6 @@ import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Map;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKey;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.jetbrains.annotations.Nullable;
@@ -38,7 +37,7 @@ import static
org.apache.ignite.internal.util.IgniteUtils.writeMap;
/**
*
*/
-public class VisorValidateIndexesJobResult extends IgniteDataTransferObject {
+public class ValidateIndexesJobResult extends IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -66,7 +65,7 @@ public class VisorValidateIndexesJobResult extends
IgniteDataTransferObject {
* @param integrityCheckFailures Collection of indexes integrity check
failures.
* @param checkSizeRes Results of checking size cache and index.
*/
- public VisorValidateIndexesJobResult(
+ public ValidateIndexesJobResult(
Map<PartitionKey, ValidateIndexesPartitionResult> partRes,
@Nullable Map<String, ValidateIndexesPartitionResult> idxRes,
@Nullable Collection<IndexIntegrityCheckIssue> integrityCheckFailures,
@@ -81,7 +80,7 @@ public class VisorValidateIndexesJobResult extends
IgniteDataTransferObject {
/**
* For externalization only.
*/
- public VisorValidateIndexesJobResult() {
+ public ValidateIndexesJobResult() {
}
/**
@@ -145,6 +144,6 @@ public class VisorValidateIndexesJobResult extends
IgniteDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorValidateIndexesJobResult.class, this);
+ return S.toString(ValidateIndexesJobResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesPartitionResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesPartitionResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java
index 5ff666a12a6..d74dad3ace2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesPartitionResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTask.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTask.java
index ef3fe93014f..317f7102d11 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Arrays;
@@ -30,7 +30,6 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
-import
org.apache.ignite.internal.management.cache.CacheValidateIndexesCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -46,15 +45,15 @@ import org.jetbrains.annotations.Nullable;
*/
@GridInternal
@InterruptibleVisorTask
-public class VisorValidateIndexesTask extends
VisorMultiNodeTask<CacheValidateIndexesCommandArg,
- VisorValidateIndexesTaskResult, VisorValidateIndexesJobResult> {
+public class ValidateIndexesTask extends
VisorMultiNodeTask<CacheValidateIndexesCommandArg,
+ ValidateIndexesTaskResult, ValidateIndexesJobResult> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Nullable @Override protected VisorValidateIndexesTaskResult
reduce0(List<ComputeJobResult> list) throws IgniteException {
+ @Nullable @Override protected ValidateIndexesTaskResult
reduce0(List<ComputeJobResult> list) throws IgniteException {
Map<UUID, Exception> exceptions = new HashMap<>();
- Map<UUID, VisorValidateIndexesJobResult> jobResults = new HashMap<>();
+ Map<UUID, ValidateIndexesJobResult> jobResults = new HashMap<>();
for (ComputeJobResult res : list) {
if (res.getException() != null)
@@ -63,11 +62,11 @@ public class VisorValidateIndexesTask extends
VisorMultiNodeTask<CacheValidateIn
jobResults.put(res.getNode().id(), res.getData());
}
- return new VisorValidateIndexesTaskResult(jobResults, exceptions);
+ return new ValidateIndexesTaskResult(jobResults, exceptions);
}
/** {@inheritDoc} */
- @Override protected VisorJob<CacheValidateIndexesCommandArg,
VisorValidateIndexesJobResult> job(CacheValidateIndexesCommandArg arg) {
+ @Override protected VisorJob<CacheValidateIndexesCommandArg,
ValidateIndexesJobResult> job(CacheValidateIndexesCommandArg arg) {
return new VisorValidateIndexesJob(arg, debug);
}
@@ -97,7 +96,7 @@ public class VisorValidateIndexesTask extends
VisorMultiNodeTask<CacheValidateIn
/**
*
*/
- private static class VisorValidateIndexesJob extends
VisorJob<CacheValidateIndexesCommandArg, VisorValidateIndexesJobResult> {
+ private static class VisorValidateIndexesJob extends
VisorJob<CacheValidateIndexesCommandArg, ValidateIndexesJobResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -114,7 +113,7 @@ public class VisorValidateIndexesTask extends
VisorMultiNodeTask<CacheValidateIn
}
/** {@inheritDoc} */
- @Override protected VisorValidateIndexesJobResult
run(CacheValidateIndexesCommandArg arg) throws IgniteException {
+ @Override protected ValidateIndexesJobResult
run(CacheValidateIndexesCommandArg arg) throws IgniteException {
A.notNull(arg, "arg");
try {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java
similarity index 82%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java
index e206448c43c..6ce7c2b2f4d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -29,7 +29,7 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
*
*/
-public class VisorValidateIndexesTaskResult extends VisorDataTransferObject {
+public class ValidateIndexesTaskResult extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -37,13 +37,13 @@ public class VisorValidateIndexesTaskResult extends
VisorDataTransferObject {
private Map<UUID, Exception> exceptions;
/** Results from cluster. */
- private Map<UUID, VisorValidateIndexesJobResult> results;
+ private Map<UUID, ValidateIndexesJobResult> results;
/**
* @param results Results.
* @param exceptions Exceptions.
*/
- public VisorValidateIndexesTaskResult(Map<UUID,
VisorValidateIndexesJobResult> results,
+ public ValidateIndexesTaskResult(Map<UUID, ValidateIndexesJobResult>
results,
Map<UUID, Exception> exceptions) {
this.exceptions = exceptions;
this.results = results;
@@ -52,7 +52,7 @@ public class VisorValidateIndexesTaskResult extends
VisorDataTransferObject {
/**
* For externalization only.
*/
- public VisorValidateIndexesTaskResult() {
+ public ValidateIndexesTaskResult() {
}
/**
@@ -65,7 +65,7 @@ public class VisorValidateIndexesTaskResult extends
VisorDataTransferObject {
/**
* @return Results from cluster.
*/
- public Map<UUID, VisorValidateIndexesJobResult> results() {
+ public Map<UUID, ValidateIndexesJobResult> results() {
return results;
}
@@ -83,6 +83,6 @@ public class VisorValidateIndexesTaskResult extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorValidateIndexesTaskResult.class, this);
+ return S.toString(ValidateIndexesTaskResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/VerifyBackupPartitionsDumpTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/VerifyBackupPartitionsDumpTask.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/VerifyBackupPartitionsDumpTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/VerifyBackupPartitionsDumpTask.java
index 3cafeebf177..fb06fbd9b98 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/VerifyBackupPartitionsDumpTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/VerifyBackupPartitionsDumpTask.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.File;
import java.io.FileWriter;
@@ -37,8 +37,7 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
-import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
-import
org.apache.ignite.internal.management.cache.CacheIdleVerifyDumpCommandArg;
+import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.SB;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/VerifyBackupPartitionsTaskV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/VerifyBackupPartitionsTaskV2.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/VerifyBackupPartitionsTaskV2.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/VerifyBackupPartitionsTaskV2.java
index 78e1bbd6474..2cf11997534 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/VerifyBackupPartitionsTaskV2.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/VerifyBackupPartitionsTaskV2.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,7 +44,6 @@ import org.apache.ignite.compute.ComputeTaskAdapter;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -53,6 +52,8 @@ import
org.apache.ignite.internal.processors.cache.PartitionUpdateCounter;
import
org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition;
import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStore;
import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
+import org.apache.ignite.internal.processors.cache.verify.GridNotIdleException;
+import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheClosure.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheClosure.java
index 2b8a9b8c904..23f00c30279 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/ViewCacheClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheClosure.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.processors.cache.verify;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,7 +38,6 @@ import
org.apache.ignite.internal.processors.datastructures.DataStructureType;
import
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor;
import
org.apache.ignite.internal.processors.datastructures.GridCacheAtomicSequenceValue;
import
org.apache.ignite.internal.processors.datastructures.GridCacheInternalKey;
-import org.apache.ignite.internal.visor.verify.VisorViewCacheCmd;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.resources.IgniteInstanceResource;
@@ -53,7 +52,7 @@ public class ViewCacheClosure implements
IgniteCallable<List<CacheInfo>> {
private String regex;
/** {@code true} to skip cache destroying. */
- private VisorViewCacheCmd cmd;
+ private ViewCacheCmd cmd;
/** */
@IgniteInstanceResource
@@ -63,7 +62,7 @@ public class ViewCacheClosure implements
IgniteCallable<List<CacheInfo>> {
* @param regex Regex name for stopping caches.
* @param cmd Command.
*/
- public ViewCacheClosure(String regex, VisorViewCacheCmd cmd) {
+ public ViewCacheClosure(String regex, ViewCacheCmd cmd) {
this.regex = regex;
this.cmd = cmd;
}
@@ -77,7 +76,7 @@ public class ViewCacheClosure implements
IgniteCallable<List<CacheInfo>> {
IgniteKernal k = (IgniteKernal)ignite;
if (cmd == null)
- cmd = VisorViewCacheCmd.CACHES;
+ cmd = ViewCacheCmd.CACHES;
switch (cmd) {
case SEQ:
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheCmd.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheCmd.java
similarity index 85%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheCmd.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheCmd.java
index 0d9ce3ae20a..4a7bf8b75f1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheCmd.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheCmd.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import org.jetbrains.annotations.Nullable;
/**
*
*/
-public enum VisorViewCacheCmd {
+public enum ViewCacheCmd {
/** Caches. */
CACHES,
@@ -33,7 +33,7 @@ public enum VisorViewCacheCmd {
SEQ;
/** Enumerated values. */
- private static final VisorViewCacheCmd[] VALS = values();
+ private static final ViewCacheCmd[] VALS = values();
/**
* Efficiently gets enumerated value from its ordinal.
@@ -41,7 +41,7 @@ public enum VisorViewCacheCmd {
* @param ord Ordinal value.
* @return Enumerated value or {@code null} if ordinal out of range.
*/
- @Nullable public static VisorViewCacheCmd fromOrdinal(int ord) {
+ @Nullable public static ViewCacheCmd fromOrdinal(int ord) {
return ord >= 0 && ord < VALS.length ? VALS[ord] : null;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTask.java
similarity index 70%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTask.java
index f96e5812355..eebb3560847 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTask.java
@@ -15,37 +15,35 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.management.cache.CacheListCommandArg;
-import org.apache.ignite.internal.processors.cache.verify.ViewCacheClosure;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
-import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.CACHES;
-import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.GROUPS;
-import static org.apache.ignite.internal.visor.verify.VisorViewCacheCmd.SEQ;
+import static org.apache.ignite.internal.management.cache.ViewCacheCmd.CACHES;
+import static org.apache.ignite.internal.management.cache.ViewCacheCmd.GROUPS;
+import static org.apache.ignite.internal.management.cache.ViewCacheCmd.SEQ;
/**
*
*/
@GridInternal
-public class VisorViewCacheTask extends VisorOneNodeTask<CacheListCommandArg,
VisorViewCacheTaskResult> {
+public class ViewCacheTask extends VisorOneNodeTask<CacheListCommandArg,
ViewCacheTaskResult> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorJob<CacheListCommandArg,
VisorViewCacheTaskResult> job(CacheListCommandArg arg) {
+ @Override protected VisorJob<CacheListCommandArg, ViewCacheTaskResult>
job(CacheListCommandArg arg) {
return new VisorViewCacheJob(arg, debug);
}
/**
*
*/
- private static class VisorViewCacheJob extends
VisorJob<CacheListCommandArg, VisorViewCacheTaskResult> {
+ private static class VisorViewCacheJob extends
VisorJob<CacheListCommandArg, ViewCacheTaskResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -58,9 +56,9 @@ public class VisorViewCacheTask extends
VisorOneNodeTask<CacheListCommandArg, Vi
}
/** {@inheritDoc} */
- @Override protected VisorViewCacheTaskResult run(CacheListCommandArg
arg) throws IgniteException {
+ @Override protected ViewCacheTaskResult run(CacheListCommandArg arg)
throws IgniteException {
try {
- VisorViewCacheCmd cmd = arg.groups()
+ ViewCacheCmd cmd = arg.groups()
? GROUPS
: (arg.seq() ? SEQ : CACHES);
@@ -68,7 +66,7 @@ public class VisorViewCacheTask extends
VisorOneNodeTask<CacheListCommandArg, Vi
ignite.context().resource().injectGeneric(clo);
- return new VisorViewCacheTaskResult(clo.call());
+ return new ViewCacheTaskResult(clo.call());
}
catch (Exception e) {
throw new IgniteException(e);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java
index 138bf064710..dffa347f336 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorViewCacheTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.verify;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Collection;
import java.util.List;
-import org.apache.ignite.internal.processors.cache.verify.CacheInfo;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
@@ -30,7 +29,7 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
*
*/
-public class VisorViewCacheTaskResult extends VisorDataTransferObject {
+public class ViewCacheTaskResult extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -40,14 +39,14 @@ public class VisorViewCacheTaskResult extends
VisorDataTransferObject {
/**
* @param cacheInfos Cache infos.
*/
- public VisorViewCacheTaskResult(List<CacheInfo> cacheInfos) {
+ public ViewCacheTaskResult(List<CacheInfo> cacheInfos) {
this.cacheInfos = cacheInfos;
}
/**
* For externalization only.
*/
- public VisorViewCacheTaskResult() {
+ public ViewCacheTaskResult() {
}
/**
@@ -69,6 +68,6 @@ public class VisorViewCacheTaskResult extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorViewCacheTaskResult.class, this);
+ return S.toString(ViewCacheTaskResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index de06c731446..1a49899e9bc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@ -100,6 +100,7 @@ import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
import org.apache.ignite.internal.cluster.DistributedConfigurationUtils;
import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.managers.communication.GridIoManager;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import
org.apache.ignite.internal.managers.communication.TransmissionCancelledException;
@@ -148,7 +149,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.wal.crc.FastCrc;
import
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext;
import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.tree.DataRow;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.processors.cluster.DiscoveryDataClusterState;
import
org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport;
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
index cc19303804c..c64cadb0f1e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTask.java
@@ -43,12 +43,12 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobAdapter;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import org.apache.ignite.internal.processors.cache.GridCacheOperation;
import org.apache.ignite.internal.processors.cache.GridLocalConfigManager;
import org.apache.ignite.internal.processors.cache.StoredCacheData;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
import
org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.cluster.BaselineTopology;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
index 021a6c12891..6dcd1515160 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IncrementalSnapshotVerificationTaskResult.java
@@ -23,9 +23,9 @@ import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Map;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import org.apache.ignite.internal.pagemem.wal.record.DataEntry;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
import
org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsQuickVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsQuickVerifyHandler.java
index a655104a4fc..78efc2af109 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsQuickVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsQuickVerifyHandler.java
@@ -24,9 +24,9 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index 9973c1e2426..e0e654d49ae 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -40,6 +40,8 @@ import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.GridComponent;
import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import
org.apache.ignite.internal.managers.encryption.EncryptionCacheKeyProvider;
import org.apache.ignite.internal.managers.encryption.GroupKey;
import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted;
@@ -51,9 +53,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStor
import
org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
import org.apache.ignite.internal.util.GridStringBuilder;
import org.apache.ignite.internal.util.GridUnsafe;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTask.java
index 1168674f1c1..999da6f8af1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTask.java
@@ -30,16 +30,16 @@ import org.apache.ignite.compute.ComputeJob;
import org.apache.ignite.compute.ComputeJobAdapter;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
+import
org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTaskV2;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
-import
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
import org.jetbrains.annotations.Nullable;
-import static
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2.reduce0;
+import static
org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTaskV2.reduce0;
/**
* Task for checking snapshot partitions consistency the same way as {@link
VerifyBackupPartitionsTaskV2} does.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTaskResult.java
index 902a3ae5e35..a32397742ec 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyTaskResult.java
@@ -28,7 +28,7 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.dto.IgniteDataTransferObject;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.util.GridStringBuilder;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CollectConflictPartitionKeysTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CollectConflictPartitionKeysTask.java
index 25d12c9293b..d07fe9a6859 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CollectConflictPartitionKeysTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/CollectConflictPartitionKeysTask.java
@@ -34,6 +34,7 @@ import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.PartitionKey;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.CacheObjectUtils;
import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
index e288679e69a..eb3ff6f62aa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/IdleVerifyUtility.java
@@ -31,6 +31,7 @@ import java.util.function.BiConsumer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java
index 0f6e2e45e9e..ef432f1f3ed 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.verify;
import java.io.Serializable;
+import org.apache.ignite.internal.management.cache.PartitionKey;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.typedef.internal.S;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecordV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecordV2.java
index efa93952f7e..418517833dc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecordV2.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecordV2.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Objects;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.internal.S;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/RetrieveConflictPartitionValuesTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/RetrieveConflictPartitionValuesTask.java
index b51622bb030..f50a7c72048 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/RetrieveConflictPartitionValuesTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/RetrieveConflictPartitionValuesTask.java
@@ -30,6 +30,7 @@ import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.compute.ComputeJobResultPolicy;
import org.apache.ignite.compute.ComputeTaskAdapter;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.PartitionKey;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.CacheObjectUtils;
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index acd70f7b6d0..9ec4e07db50 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1387,30 +1387,30 @@
org.apache.ignite.internal.processors.cache.transactions.TxLockList
org.apache.ignite.internal.processors.cache.transactions.TxLocksRequest
org.apache.ignite.internal.processors.cache.transactions.TxLocksResponse
org.apache.ignite.internal.processors.cache.tree.mvcc.data.ResultType
-org.apache.ignite.internal.processors.cache.verify.CacheInfo
+org.apache.ignite.internal.management.cache.CacheInfo
org.apache.ignite.internal.processors.cache.verify.CollectConflictPartitionKeysTask
org.apache.ignite.internal.processors.cache.verify.CollectConflictPartitionKeysTask$CollectPartitionEntryHashesJob
-org.apache.ignite.internal.processors.cache.verify.ContentionClosure
-org.apache.ignite.internal.processors.cache.verify.ContentionInfo
+org.apache.ignite.internal.management.cache.ContentionClosure
+org.apache.ignite.internal.management.cache.ContentionInfo
org.apache.ignite.internal.processors.cache.verify.GridNotIdleException
-org.apache.ignite.internal.processors.cache.verify.IdleVerifyDumpResult
-org.apache.ignite.internal.processors.cache.verify.IdleVerifyException
-org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2
+org.apache.ignite.internal.management.cache.IdleVerifyDumpResult
+org.apache.ignite.internal.management.cache.IdleVerifyException
+org.apache.ignite.internal.management.cache.IdleVerifyResultV2
org.apache.ignite.internal.processors.cache.verify.IdleVerifyUtility$IdleChecker
-org.apache.ignite.internal.processors.cache.verify.NoMatchingCachesException
+org.apache.ignite.internal.management.cache.NoMatchingCachesException
org.apache.ignite.internal.processors.cache.verify.PartitionEntryHashRecord
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecord
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2$PartitionState
-org.apache.ignite.internal.processors.cache.verify.PartitionKey
-org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2
+org.apache.ignite.internal.management.cache.PartitionKey
+org.apache.ignite.internal.management.cache.PartitionKeyV2
org.apache.ignite.internal.processors.cache.verify.RetrieveConflictPartitionValuesTask
org.apache.ignite.internal.processors.cache.verify.RetrieveConflictPartitionValuesTask$RetrieveConflictValuesJob
org.apache.ignite.internal.processors.cache.verify.TransactionsHashRecord
-org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsDumpTask
-org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2
-org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2$VerifyBackupPartitionsJobV2
-org.apache.ignite.internal.processors.cache.verify.ViewCacheClosure
+org.apache.ignite.internal.management.cache.VerifyBackupPartitionsDumpTask
+org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTaskV2
+org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTaskV2$VerifyBackupPartitionsJobV2
+org.apache.ignite.internal.management.cache.ViewCacheClosure
org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry
org.apache.ignite.internal.processors.cache.version.GridCacheVersion
org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State
@@ -2319,28 +2319,28 @@
org.apache.ignite.internal.visor.tx.VisorTxTask$VisorTxJob
org.apache.ignite.internal.visor.tx.VisorTxTaskResult
org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException
org.apache.ignite.internal.visor.util.VisorExceptionWrapper
-org.apache.ignite.internal.visor.verify.CacheFilterEnum
-org.apache.ignite.internal.visor.verify.IndexIntegrityCheckIssue
-org.apache.ignite.internal.visor.verify.IndexValidationIssue
-org.apache.ignite.internal.visor.verify.ValidateIndexesCheckSizeIssue
-org.apache.ignite.internal.visor.verify.ValidateIndexesCheckSizeResult
-org.apache.ignite.internal.visor.verify.ValidateIndexesClosure
-org.apache.ignite.internal.visor.verify.ValidateIndexesPartitionResult
-org.apache.ignite.internal.visor.verify.VisorContentionJobResult
-org.apache.ignite.internal.visor.verify.VisorContentionTask
-org.apache.ignite.internal.visor.verify.VisorContentionTask$VisorContentionJob
-org.apache.ignite.internal.visor.verify.VisorContentionTaskResult
-org.apache.ignite.internal.visor.verify.VisorIdleVerifyDumpTask
-org.apache.ignite.internal.visor.verify.VisorIdleVerifyJob
-org.apache.ignite.internal.visor.verify.VisorIdleVerifyTaskV2
-org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult
-org.apache.ignite.internal.visor.verify.VisorValidateIndexesTask
-org.apache.ignite.internal.visor.verify.VisorValidateIndexesTask$VisorValidateIndexesJob
-org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult
-org.apache.ignite.internal.visor.verify.VisorViewCacheCmd
-org.apache.ignite.internal.visor.verify.VisorViewCacheTask
-org.apache.ignite.internal.visor.verify.VisorViewCacheTask$VisorViewCacheJob
-org.apache.ignite.internal.visor.verify.VisorViewCacheTaskResult
+org.apache.ignite.internal.management.cache.CacheFilterEnum
+org.apache.ignite.internal.management.cache.IndexIntegrityCheckIssue
+org.apache.ignite.internal.management.cache.IndexValidationIssue
+org.apache.ignite.internal.management.cache.ValidateIndexesCheckSizeIssue
+org.apache.ignite.internal.management.cache.ValidateIndexesCheckSizeResult
+org.apache.ignite.internal.management.cache.ValidateIndexesClosure
+org.apache.ignite.internal.management.cache.ValidateIndexesPartitionResult
+org.apache.ignite.internal.management.cache.ContentionJobResult
+org.apache.ignite.internal.management.cache.ContentionTask
+org.apache.ignite.internal.management.cache.ContentionTask$CacheContentionJob
+org.apache.ignite.internal.management.cache.ContentionTaskResult
+org.apache.ignite.internal.management.cache.IdleVerifyDumpTask
+org.apache.ignite.internal.management.cache.IdleVerifyJob
+org.apache.ignite.internal.management.cache.IdleVerifyTaskV2
+org.apache.ignite.internal.management.cache.ValidateIndexesJobResult
+org.apache.ignite.internal.management.cache.ValidateIndexesTask
+org.apache.ignite.internal.management.cache.ValidateIndexesTask$VisorValidateIndexesJob
+org.apache.ignite.internal.management.cache.ValidateIndexesTaskResult
+org.apache.ignite.internal.management.cache.ViewCacheCmd
+org.apache.ignite.internal.management.cache.ViewCacheTask
+org.apache.ignite.internal.management.cache.ViewCacheTask$VisorViewCacheJob
+org.apache.ignite.internal.management.cache.ViewCacheTaskResult
org.apache.ignite.internal.websession.WebSessionAttributeProcessor
org.apache.ignite.internal.websession.WebSessionEntity
org.apache.ignite.lang.IgniteBiClosure
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
index c66a35bcf17..5a2f5dc06a1 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
@@ -30,9 +30,9 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishFuture;
import
org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.ListeningTestLogger;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/HistoricalRebalanceCheckpointTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/HistoricalRebalanceCheckpointTest.java
index 34cc306e41d..52e2b39cc92 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/HistoricalRebalanceCheckpointTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/HistoricalRebalanceCheckpointTest.java
@@ -44,13 +44,13 @@ import org.apache.ignite.events.EventType;
import org.apache.ignite.failure.StopNodeFailureHandler;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxFinishRequest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
import
org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
import
org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteBiPredicate;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/EncryptedSnapshotTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/EncryptedSnapshotTest.java
index a66eabf45e1..d16d6074f52 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/EncryptedSnapshotTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/EncryptedSnapshotTest.java
@@ -29,7 +29,7 @@ import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.encryption.AbstractEncryptionTest;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.util.distributed.FullMessage;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
index 1f40bdae71f..f9286a2510d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckTest.java
@@ -47,7 +47,11 @@ import org.apache.ignite.internal.GridTopic;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.binary.BinaryContext;
import org.apache.ignite.internal.binary.BinaryObjectImpl;
+import org.apache.ignite.internal.management.cache.CacheFilterEnum;
import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
+import
org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTaskV2;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
@@ -64,10 +68,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStor
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
import
org.apache.ignite.internal.processors.cache.persistence.wal.crc.IgniteDataIntegrityViolationException;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
-import
org.apache.ignite.internal.processors.cache.verify.VerifyBackupPartitionsTaskV2;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
import org.apache.ignite.internal.util.GridUnsafe;
@@ -76,11 +77,11 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.verify.CacheFilterEnum;
import org.jetbrains.annotations.Nullable;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
+
import static org.apache.ignite.cluster.ClusterState.ACTIVE;
import static
org.apache.ignite.configuration.IgniteConfiguration.DFLT_SNAPSHOT_DIRECTORY;
import static
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion.NONE;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
index 41cfef6fda9..3fd9d6dde40 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotRestoreSelfTest.java
@@ -51,13 +51,13 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch;
import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsSingleMessage;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
import
org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
import
org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import
org.apache.ignite.internal.util.distributed.DistributedProcess.DistributedProcessType;
import org.apache.ignite.internal.util.distributed.SingleNodeMessage;
import org.apache.ignite.internal.util.typedef.F;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotConsistencyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotConsistencyTest.java
index 53b4fcb4d09..370b92cdd07 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotConsistencyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotConsistencyTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.managers.communication.GridMessageListener;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheMessage;
@@ -45,7 +46,6 @@ import
org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridNe
import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest;
import
org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager;
import
org.apache.ignite.internal.processors.cache.persistence.checkpoint.CheckpointListener;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.util.future.IgniteFutureImpl;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.testframework.GridTestUtils;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRestoreFromRemoteTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRestoreFromRemoteTest.java
index 822efe4a67f..40bd60290e6 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRestoreFromRemoteTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRestoreFromRemoteTest.java
@@ -43,9 +43,9 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.failure.StopNodeOrHaltFailureHandler;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionDemandMessage;
import
org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutOnePhaseCommitTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutOnePhaseCommitTest.java
index 4a6a1e74447..c0c24bd969f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutOnePhaseCommitTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutOnePhaseCommitTest.java
@@ -27,8 +27,8 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.TestRecordingCommunicationSpi;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareResponse;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java
index b4e80690413..236ec0eb2e8 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxWithSmallTimeoutAndContentionOneKeyTest.java
@@ -34,9 +34,9 @@ import
org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.PartitionKeyV2;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
-import org.apache.ignite.internal.processors.cache.verify.PartitionKeyV2;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.testframework.MvccFeatureChecker;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 603b4649646..2f72c87c8dc 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -81,6 +81,8 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.management.cache.CacheIdleVerifyCommandArg;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.IdleVerifyTaskV2;
import org.apache.ignite.internal.pagemem.wal.record.DataRecord;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import
org.apache.ignite.internal.processors.affinity.GridAffinityFunctionContextImpl;
@@ -115,7 +117,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAhea
import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer;
import
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import
org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
import
org.apache.ignite.internal.processors.configuration.distributed.DistributedChangeableProperty;
import org.apache.ignite.internal.processors.job.GridJobProcessor;
import org.apache.ignite.internal.processors.service.IgniteServiceProcessor;
@@ -129,7 +130,6 @@ import org.apache.ignite.internal.util.typedef.T3;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.verify.VisorIdleVerifyTaskV2;
import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteInClosure;
@@ -147,6 +147,7 @@ import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.transactions.TransactionRollbackException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+
import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
@@ -2247,7 +2248,7 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
taskArg.caches(cacheNames.toArray(U.EMPTY_STRS));
return ig.compute().execute(
- VisorIdleVerifyTaskV2.class.getName(),
+ IdleVerifyTaskV2.class.getName(),
new VisorTaskArgument<>(node.id(), taskArg, false)
);
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IndexCorruptionRebuildTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IndexCorruptionRebuildTest.java
index 7be4cbba5d0..7e7baae2560 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IndexCorruptionRebuildTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/IndexCorruptionRebuildTest.java
@@ -40,6 +40,8 @@ import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexImp
import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexTree;
import org.apache.ignite.internal.cache.query.index.sorted.inline.io.LeafIO;
import
org.apache.ignite.internal.cache.query.index.sorted.maintenance.MaintenanceRebuildIndexTarget;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
+import org.apache.ignite.internal.management.cache.ValidateIndexesJobResult;
import org.apache.ignite.internal.managers.indexing.IndexesRebuildTask;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import
org.apache.ignite.internal.processors.cache.persistence.CacheDataRowAdapter;
@@ -53,8 +55,6 @@ import
org.apache.ignite.internal.processors.query.schema.IndexRebuildCancelToke
import
org.apache.ignite.internal.processors.query.schema.management.IndexDescriptor;
import
org.apache.ignite.internal.processors.query.schema.management.SchemaManager;
import org.apache.ignite.internal.util.typedef.internal.CU;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
import org.apache.ignite.maintenance.MaintenanceRegistry;
import org.apache.ignite.maintenance.MaintenanceTask;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -298,7 +298,7 @@ public class IndexCorruptionRebuildTest extends
GridCommonAbstractTest {
node.context().resource().injectGeneric(clo);
- VisorValidateIndexesJobResult call = clo.call();
+ ValidateIndexesJobResult call = clo.call();
assertFalse(call.hasIssues());
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsIndexingDefragmentationTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsIndexingDefragmentationTest.java
index a840b91b99c..18f8cb14811 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsIndexingDefragmentationTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsIndexingDefragmentationTest.java
@@ -34,6 +34,8 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.cache.query.index.IndexProcessor;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
+import org.apache.ignite.internal.management.cache.ValidateIndexesJobResult;
import org.apache.ignite.internal.managers.indexing.IndexesRebuildTask;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -43,8 +45,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStor
import
org.apache.ignite.internal.processors.query.schema.IndexRebuildCancelToken;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
@@ -196,7 +196,7 @@ public class IgnitePdsIndexingDefragmentationTest extends
IgnitePdsDefragmentati
node.context().resource().injectGeneric(clo);
- VisorValidateIndexesJobResult call = clo.call();
+ ValidateIndexesJobResult call = clo.call();
assertFalse(call.hasIssues());
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
index fa7293dc65b..9ccacda38fc 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IndexingMultithreadedLoadContinuousRestartTest.java
@@ -34,8 +34,8 @@ import
org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
+import org.apache.ignite.internal.management.cache.ValidateIndexesJobResult;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -161,7 +161,7 @@ public class IndexingMultithreadedLoadContinuousRestartTest
extends GridCommonAb
ValidateIndexesClosure clo = new ValidateIndexesClosure(() ->
false, Collections.singleton(CACHE_NAME),
0, 0, false, true);
ignite.context().resource().injectGeneric(clo);
- VisorValidateIndexesJobResult res = clo.call();
+ ValidateIndexesJobResult res = clo.call();
assertFalse(res.hasIssues());
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
index 1f822fb3ead..cdc81b0371c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/LongDestroyDurableBackgroundTaskTest.java
@@ -62,6 +62,10 @@ import
org.apache.ignite.internal.cache.query.index.sorted.SortedIndexDefinition
import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexTree;
import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineRecommender;
import
org.apache.ignite.internal.management.cache.CacheValidateIndexesCommandArg;
+import org.apache.ignite.internal.management.cache.ValidateIndexesJobResult;
+import
org.apache.ignite.internal.management.cache.ValidateIndexesPartitionResult;
+import org.apache.ignite.internal.management.cache.ValidateIndexesTask;
+import org.apache.ignite.internal.management.cache.ValidateIndexesTaskResult;
import org.apache.ignite.internal.metric.IoStatisticsHolder;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
@@ -79,10 +83,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseL
import org.apache.ignite.internal.util.lang.GridTuple3;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesPartitionResult;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTask;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.testframework.CallbackExecutorLogListener;
import org.apache.ignite.testframework.ListeningTestLogger;
@@ -92,6 +92,7 @@ import
org.apache.ignite.testframework.junits.WithSystemProperty;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.thread.IgniteThread;
import org.junit.Test;
+
import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.toList;
import static
org.apache.ignite.IgniteSystemProperties.IGNITE_SYSTEM_WORKER_BLOCKED_TIMEOUT;
@@ -375,15 +376,15 @@ public class LongDestroyDurableBackgroundTaskTest extends
GridCommonAbstractTest
taskArg.checkCrc(true);
taskArg.checkSizes(true);
- VisorValidateIndexesTaskResult taskRes =
- ignite.compute().execute(VisorValidateIndexesTask.class.getName(),
new VisorTaskArgument<>(nodeIds, taskArg, false));
+ ValidateIndexesTaskResult taskRes =
+ ignite.compute().execute(ValidateIndexesTask.class.getName(), new
VisorTaskArgument<>(nodeIds, taskArg, false));
if (!taskRes.exceptions().isEmpty()) {
for (Map.Entry<UUID, Exception> e :
taskRes.exceptions().entrySet())
log.error("Exception while validation indexes on node id=" +
e.getKey().toString(), e.getValue());
}
- for (Map.Entry<UUID, VisorValidateIndexesJobResult> nodeEntry :
taskRes.results().entrySet()) {
+ for (Map.Entry<UUID, ValidateIndexesJobResult> nodeEntry :
taskRes.results().entrySet()) {
if (nodeEntry.getValue().hasIssues()) {
log.error("Validate indexes issues had been found on node id="
+ nodeEntry.getKey().toString());
@@ -399,7 +400,7 @@ public class LongDestroyDurableBackgroundTaskTest extends
GridCommonAbstractTest
assertTrue(taskRes.exceptions().isEmpty());
- for (VisorValidateIndexesJobResult res : taskRes.results().values())
+ for (ValidateIndexesJobResult res : taskRes.results().values())
assertFalse(res.hasIssues());
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckWithIndexesTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckWithIndexesTest.java
index 6f6c160884d..39c6926a230 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckWithIndexesTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotCheckWithIndexesTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.processors.cache.verify.IdleVerifyResultV2;
+import org.apache.ignite.internal.management.cache.IdleVerifyResultV2;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgnitePredicate;
import org.junit.Test;
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
index 838887be5ec..4a113a61a30 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotWithIndexesTest.java
@@ -30,9 +30,9 @@ import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexTest.java
index f8b70040a5a..a6f2aeecd84 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexTest.java
@@ -35,9 +35,9 @@ import
org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
import org.apache.ignite.testframework.ListeningTestLogger;
import org.apache.ignite.testframework.LogListener;
import org.apache.ignite.testframework.junits.WithSystemProperty;
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexWithHistoricalRebalanceTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexWithHistoricalRebalanceTest.java
index d66793c57ab..cc5a54b338e 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexWithHistoricalRebalanceTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/RebuildIndexWithHistoricalRebalanceTest.java
@@ -39,13 +39,13 @@ import
org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.management.cache.ValidateIndexesClosure;
+import org.apache.ignite.internal.management.cache.ValidateIndexesJobResult;
import org.apache.ignite.internal.managers.communication.GridIoMessage;
import org.apache.ignite.internal.processors.cache.GridCacheGroupIdMessage;
import
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionSupplyMessage;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.verify.ValidateIndexesClosure;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.IgniteSpiException;
@@ -232,7 +232,7 @@ public class RebuildIndexWithHistoricalRebalanceTest
extends GridCommonAbstractT
ValidateIndexesClosure clo = new ValidateIndexesClosure(() -> false,
Collections.singleton(CACHE_NAME), 0, 0, false, true);
node2.context().resource().injectGeneric(clo);
- VisorValidateIndexesJobResult res = clo.call();
+ ValidateIndexesJobResult res = clo.call();
assertFalse(res.hasIssues());
}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
index 2e50946681b..8fb52068f8c 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexRebuildTest.java
@@ -45,11 +45,11 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.ComputeTaskInternalFuture;
import org.apache.ignite.internal.IgniteEx;
import
org.apache.ignite.internal.management.cache.CacheValidateIndexesCommandArg;
+import org.apache.ignite.internal.management.cache.ValidateIndexesJobResult;
+import org.apache.ignite.internal.management.cache.ValidateIndexesTask;
+import org.apache.ignite.internal.management.cache.ValidateIndexesTaskResult;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesJobResult;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTask;
-import org.apache.ignite.internal.visor.verify.VisorValidateIndexesTaskResult;
import org.apache.ignite.testframework.ListeningTestLogger;
import org.apache.ignite.testframework.LogListener;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -225,16 +225,16 @@ public class GridIndexRebuildTest extends
GridCommonAbstractTest {
VisorTaskArgument<CacheValidateIndexesCommandArg> visorTaskArg = new
VisorTaskArgument<>(nodes, arg, true);
- ComputeTaskInternalFuture<VisorValidateIndexesTaskResult> exec =
grid1.context().task().
- execute(new VisorValidateIndexesTask(), visorTaskArg);
+ ComputeTaskInternalFuture<ValidateIndexesTaskResult> exec =
grid1.context().task().
+ execute(new ValidateIndexesTask(), visorTaskArg);
- VisorValidateIndexesTaskResult res = exec.get();
+ ValidateIndexesTaskResult res = exec.get();
- Map<UUID, VisorValidateIndexesJobResult> results = res.results();
+ Map<UUID, ValidateIndexesJobResult> results = res.results();
boolean hasIssue = false;
- for (VisorValidateIndexesJobResult jobResult : results.values()) {
+ for (ValidateIndexesJobResult jobResult : results.values()) {
System.err.println(jobResult);
hasIssue |= jobResult.hasIssues();
@@ -324,16 +324,16 @@ public class GridIndexRebuildTest extends
GridCommonAbstractTest {
VisorTaskArgument<CacheValidateIndexesCommandArg> visorTaskArg = new
VisorTaskArgument<>(nodes, arg, true);
- ComputeTaskInternalFuture<VisorValidateIndexesTaskResult> execute =
grid1.context().task().
- execute(new VisorValidateIndexesTask(), visorTaskArg);
+ ComputeTaskInternalFuture<ValidateIndexesTaskResult> execute =
grid1.context().task().
+ execute(new ValidateIndexesTask(), visorTaskArg);
- VisorValidateIndexesTaskResult res = execute.get();
+ ValidateIndexesTaskResult res = execute.get();
- Map<UUID, VisorValidateIndexesJobResult> results = res.results();
+ Map<UUID, ValidateIndexesJobResult> results = res.results();
boolean hasIssue = false;
- for (VisorValidateIndexesJobResult jobResult : results.values()) {
+ for (ValidateIndexesJobResult jobResult : results.values()) {
System.err.println(jobResult);
hasIssue |= jobResult.hasIssues();
