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 0cf16d22930 IGNITE-19754 Move remaining Cache classes to command
classes package (#10796)
0cf16d22930 is described below
commit 0cf16d229305163f186202bb372d7631c9e23255
Author: Valery Shorin <[email protected]>
AuthorDate: Wed Jun 21 12:45:57 2023 +0300
IGNITE-19754 Move remaining Cache classes to command classes package
(#10796)
---
.../ignite/util/CacheMetricsCommandTest.java | 2 +-
.../util/GridCommandHandlerIndexListTest.java | 2 +-
.../GridCommandHandlerIndexRebuildStatusTest.java | 2 +-
.../apache/ignite/util/GridCommandHandlerTest.java | 4 +-
.../cache/CacheAffinityConfiguration.java} | 10 +--
.../cache/CacheConfiguration.java} | 73 +++++++++---------
.../cache/CacheConfigurationCollectorJob.java} | 24 +++---
.../cache/CacheConfigurationCollectorTask.java} | 14 ++--
.../cache/CacheConfigurationCollectorTaskArg.java} | 14 ++--
.../management/cache/CacheCreateCommand.java | 6 +-
.../cache/CacheCreateTask.java} | 12 +--
.../management/cache/CacheDestroyCommand.java | 3 +-
.../cache/CacheEvictionConfiguration.java} | 10 +--
.../management/cache/CacheFindGarbageCommand.java | 16 ++--
.../cache/CacheIndexesForceRebuildCommand.java | 3 -
.../management/cache/CacheIndexesListCommand.java | 2 -
.../cache/CacheIndexesRebuildStatusCommand.java | 2 -
.../cache/CacheJdbcType.java} | 28 +++----
.../cache/CacheJdbcTypeField.java} | 10 +--
.../management/cache/CacheListCommand.java | 37 ++++-----
.../management/cache/CacheMetricsCommand.java | 11 ++-
.../management/cache/CacheMetricsCommandArg.java | 1 -
.../cache}/CacheMetricsOperation.java | 2 +-
.../cache/CacheMetricsTask.java} | 25 +++---
.../cache/CacheMetricsTaskResult.java} | 12 +--
.../cache/CacheNearConfiguration.java} | 10 +--
.../cache/CacheRebalanceConfiguration.java} | 10 +--
.../management/cache/CacheScanCommand.java | 10 +--
.../cache/CacheScanTask.java} | 19 +++--
.../cache/CacheScanTaskResult.java} | 12 +--
.../cache/CacheScheduleIndexesRebuildCommand.java | 2 -
.../cache/CacheStopTask.java} | 15 ++--
.../cache/CacheStoreConfiguration.java} | 10 +--
.../FindAndDeleteGarbageInPersistenceClosure.java} | 16 ++--
...indAndDeleteGarbageInPersistenceJobResult.java} | 10 +--
.../FindAndDeleteGarbageInPersistenceTask.java} | 23 +++---
...ndAndDeleteGarbageInPersistenceTaskResult.java} | 18 ++---
.../cache}/IndexForceRebuildTask.java | 3 +-
.../cache}/IndexForceRebuildTaskRes.java | 2 +-
.../cache}/IndexListInfoContainer.java | 2 +-
.../index => management/cache}/IndexListTask.java | 3 +-
.../cache}/IndexRebuildStatusInfoContainer.java | 2 +-
.../cache}/IndexRebuildStatusTask.java | 3 +-
.../cache/QueryConfiguration.java} | 10 +--
.../cache/QueryEntity.java} | 32 ++++----
.../cache/QueryIndex.java} | 19 +++--
.../cache/QueryIndexField.java} | 16 ++--
.../cache}/ScheduleIndexRebuildJobRes.java | 2 +-
.../cache}/ScheduleIndexRebuildTask.java | 3 +-
.../cache}/ScheduleIndexRebuildTaskRes.java | 2 +-
.../main/resources/META-INF/classnames.properties | 88 +++++++++++-----------
.../db/IgniteCacheGroupsWithRestartsTest.java | 19 ++---
52 files changed, 324 insertions(+), 362 deletions(-)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/CacheMetricsCommandTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/CacheMetricsCommandTest.java
index dafb3022b3a..5f36276a957 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/CacheMetricsCommandTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/CacheMetricsCommandTest.java
@@ -24,9 +24,9 @@ import java.util.regex.Pattern;
import org.apache.ignite.Ignite;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.management.cache.CacheMetricsCommand;
+import org.apache.ignite.internal.management.cache.CacheMetricsOperation;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
-import org.apache.ignite.internal.visor.cache.metrics.CacheMetricsOperation;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
index c0a0fa4b3cd..bff0d012c4f 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexListTest.java
@@ -25,7 +25,7 @@ import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cluster.ClusterState;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.commandline.CommandHandler;
-import org.apache.ignite.internal.visor.cache.index.IndexListInfoContainer;
+import org.apache.ignite.internal.management.cache.IndexListInfoContainer;
import org.junit.Test;
import static
org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
index df287d27d52..5e4f91819d4 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexRebuildStatusTest.java
@@ -31,6 +31,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.cache.query.index.IndexProcessor;
import org.apache.ignite.internal.commandline.CommandHandler;
+import
org.apache.ignite.internal.management.cache.IndexRebuildStatusInfoContainer;
import org.apache.ignite.internal.managers.indexing.IndexesRebuildTask;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
@@ -38,7 +39,6 @@ import
org.apache.ignite.internal.processors.query.schema.IndexRebuildCancelToke
import
org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitorClosure;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.typedef.CI1;
-import
org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusInfoContainer;
import org.apache.ignite.testframework.GridTestUtils;
import org.junit.Test;
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index 36189dda5f7..75a7110d9b7 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -79,6 +79,7 @@ import org.apache.ignite.internal.client.GridClientFactory;
import org.apache.ignite.internal.client.impl.GridClientImpl;
import org.apache.ignite.internal.client.util.GridConcurrentHashSet;
import org.apache.ignite.internal.commandline.CommandHandler;
+import
org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTaskResult;
import org.apache.ignite.internal.management.snapshot.SnapshotTaskResult;
import org.apache.ignite.internal.management.tx.TxInfo;
import org.apache.ignite.internal.management.tx.TxTaskResult;
@@ -120,7 +121,6 @@ import org.apache.ignite.internal.util.typedef.G;
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.cache.VisorFindAndDeleteGarbageInPersistenceTaskResult;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteInClosure;
@@ -3898,7 +3898,7 @@ public class GridCommandHandlerTest extends
GridCommandHandlerClusterPerMethodAb
* @param delFoundGarbage If clearing mode should be used.
* @return Result of task run.
*/
- private VisorFindAndDeleteGarbageInPersistenceTaskResult
executeTaskViaControlConsoleUtil(
+ private FindAndDeleteGarbageInPersistenceTaskResult
executeTaskViaControlConsoleUtil(
IgniteEx ignite,
boolean delFoundGarbage
) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java
similarity index 92%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java
index eb4eb35d5a9..51f442a55a3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -35,7 +35,7 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
/**
* Data transfer object for affinity configuration properties.
*/
-public class VisorCacheAffinityConfiguration extends VisorDataTransferObject {
+public class CacheAffinityConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -57,7 +57,7 @@ public class VisorCacheAffinityConfiguration extends
VisorDataTransferObject {
/**
* Default constructor
*/
- public VisorCacheAffinityConfiguration() {
+ public CacheAffinityConfiguration() {
// No-op.
}
@@ -66,7 +66,7 @@ public class VisorCacheAffinityConfiguration extends
VisorDataTransferObject {
*
* @param ccfg Cache configuration.
*/
- public VisorCacheAffinityConfiguration(CacheConfiguration ccfg) {
+ public CacheAffinityConfiguration(CacheConfiguration ccfg) {
AffinityFunction aff = ccfg.getAffinity();
function = compactClass(aff);
@@ -141,6 +141,6 @@ public class VisorCacheAffinityConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheAffinityConfiguration.class, this);
+ return S.toString(CacheAffinityConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java
similarity index 87%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java
index 769a282fe11..6ef560694d0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -25,15 +25,12 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.PartitionLossPolicy;
-import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DiskPageCompression;
import org.apache.ignite.internal.IgniteEx;
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.query.VisorQueryConfiguration;
-import org.apache.ignite.internal.visor.query.VisorQueryEntity;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
@@ -42,7 +39,7 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.compactIterab
/**
* Data transfer object for cache configuration properties.
*/
-public class VisorCacheConfiguration extends VisorDataTransferObject {
+public class CacheConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -77,25 +74,25 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
private long dfltLockTimeout;
/** Cache affinity config. */
- private VisorCacheAffinityConfiguration affinityCfg;
+ private CacheAffinityConfiguration affinityCfg;
/** Preload config. */
- private VisorCacheRebalanceConfiguration rebalanceCfg;
+ private CacheRebalanceConfiguration rebalanceCfg;
/** Eviction config. */
- private VisorCacheEvictionConfiguration evictCfg;
+ private CacheEvictionConfiguration evictCfg;
/** Near cache config. */
- private VisorCacheNearConfiguration nearCfg;
+ private CacheNearConfiguration nearCfg;
/** Store config. */
- private VisorCacheStoreConfiguration storeCfg;
+ private CacheStoreConfiguration storeCfg;
/** Collection of query entities. */
- private List<VisorQueryEntity> qryEntities;
+ private List<QueryEntity> qryEntities;
/** Collection of type metadata. */
- private List<VisorCacheJdbcType> jdbcTypes;
+ private List<CacheJdbcType> jdbcTypes;
/** Whether statistics collection is enabled. */
private boolean statisticsEnabled;
@@ -113,7 +110,7 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
private String expiryPlcFactory;
/** Query configuration. */
- private VisorQueryConfiguration qryCfg;
+ private QueryConfiguration qryCfg;
/** System cache flag. */
private boolean sys;
@@ -175,7 +172,7 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
/**
* Default constructor.
*/
- public VisorCacheConfiguration() {
+ public CacheConfiguration() {
// No-op.
}
@@ -186,7 +183,7 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
* @param ccfg Cache configuration.
* @param dynamicDeploymentId Dynamic deployment ID.
*/
- public VisorCacheConfiguration(IgniteEx ignite, CacheConfiguration ccfg,
IgniteUuid dynamicDeploymentId) {
+ public CacheConfiguration(IgniteEx ignite,
org.apache.ignite.configuration.CacheConfiguration ccfg, IgniteUuid
dynamicDeploymentId) {
name = ccfg.getName();
grpName = ccfg.getGroupName();
this.dynamicDeploymentId = dynamicDeploymentId;
@@ -198,8 +195,8 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
maxConcurrentAsyncOps = ccfg.getMaxConcurrentAsyncOperations();
interceptor = compactClass(ccfg.getInterceptor());
dfltLockTimeout = ccfg.getDefaultLockTimeout();
- qryEntities = VisorQueryEntity.list(ccfg.getQueryEntities());
- jdbcTypes = VisorCacheJdbcType.list(ccfg.getCacheStoreFactory());
+ qryEntities = QueryEntity.list(ccfg.getQueryEntities());
+ jdbcTypes = CacheJdbcType.list(ccfg.getCacheStoreFactory());
statisticsEnabled = ccfg.isStatisticsEnabled();
mgmtEnabled = ccfg.isManagementEnabled();
ldrFactory = compactClass(ccfg.getCacheLoaderFactory());
@@ -212,14 +209,14 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
partLossPlc = ccfg.getPartitionLossPolicy();
qryParallelism = ccfg.getQueryParallelism();
- affinityCfg = new VisorCacheAffinityConfiguration(ccfg);
- rebalanceCfg = new VisorCacheRebalanceConfiguration(ccfg);
- evictCfg = new VisorCacheEvictionConfiguration(ccfg);
- nearCfg = new VisorCacheNearConfiguration(ccfg);
+ affinityCfg = new CacheAffinityConfiguration(ccfg);
+ rebalanceCfg = new CacheRebalanceConfiguration(ccfg);
+ evictCfg = new CacheEvictionConfiguration(ccfg);
+ nearCfg = new CacheNearConfiguration(ccfg);
- storeCfg = new VisorCacheStoreConfiguration(ignite, ccfg);
+ storeCfg = new CacheStoreConfiguration(ignite, ccfg);
- qryCfg = new VisorQueryConfiguration(ccfg);
+ qryCfg = new QueryConfiguration(ccfg);
cpOnRead = ccfg.isCopyOnRead();
evictFilter = compactClass(ccfg.getEvictionFilter());
@@ -310,14 +307,14 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
/**
* @return Collection of type metadata.
*/
- public List<VisorCacheJdbcType> getJdbcTypes() {
+ public List<CacheJdbcType> getJdbcTypes() {
return jdbcTypes;
}
/**
* @return Near cache config.
*/
- public VisorCacheNearConfiguration getNearConfiguration() {
+ public CacheNearConfiguration getNearConfiguration() {
return nearCfg;
}
@@ -366,42 +363,42 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
/**
* @return Cache affinity config.
*/
- public VisorCacheAffinityConfiguration getAffinityConfiguration() {
+ public CacheAffinityConfiguration getAffinityConfiguration() {
return affinityCfg;
}
/**
* @return Preload config.
*/
- public VisorCacheRebalanceConfiguration getRebalanceConfiguration() {
+ public CacheRebalanceConfiguration getRebalanceConfiguration() {
return rebalanceCfg;
}
/**
* @return Eviction config.
*/
- public VisorCacheEvictionConfiguration getEvictionConfiguration() {
+ public CacheEvictionConfiguration getEvictionConfiguration() {
return evictCfg;
}
/**
* @return Store config
*/
- public VisorCacheStoreConfiguration getStoreConfiguration() {
+ public CacheStoreConfiguration getStoreConfiguration() {
return storeCfg;
}
/**
* @return Collection of query entities.
*/
- public List<VisorQueryEntity> getQueryEntities() {
+ public List<QueryEntity> getQueryEntities() {
return qryEntities;
}
/**
* @return Collection of query entities.
*/
- public VisorQueryConfiguration getQueryConfiguration() {
+ public QueryConfiguration getQueryConfiguration() {
return qryCfg;
}
@@ -606,11 +603,11 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
maxConcurrentAsyncOps = in.readInt();
interceptor = U.readString(in);
dfltLockTimeout = in.readLong();
- affinityCfg = (VisorCacheAffinityConfiguration)in.readObject();
- rebalanceCfg = (VisorCacheRebalanceConfiguration)in.readObject();
- evictCfg = (VisorCacheEvictionConfiguration)in.readObject();
- nearCfg = (VisorCacheNearConfiguration)in.readObject();
- storeCfg = (VisorCacheStoreConfiguration)in.readObject();
+ affinityCfg = (CacheAffinityConfiguration)in.readObject();
+ rebalanceCfg = (CacheRebalanceConfiguration)in.readObject();
+ evictCfg = (CacheEvictionConfiguration)in.readObject();
+ nearCfg = (CacheNearConfiguration)in.readObject();
+ storeCfg = (CacheStoreConfiguration)in.readObject();
qryEntities = U.readList(in);
jdbcTypes = U.readList(in);
statisticsEnabled = in.readBoolean();
@@ -618,7 +615,7 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
ldrFactory = U.readString(in);
writerFactory = U.readString(in);
expiryPlcFactory = U.readString(in);
- qryCfg = (VisorQueryConfiguration)in.readObject();
+ qryCfg = (QueryConfiguration)in.readObject();
sys = in.readBoolean();
storeKeepBinary = in.readBoolean();
onheapCache = in.readBoolean();
@@ -645,6 +642,6 @@ public class VisorCacheConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheConfiguration.class, this);
+ return S.toString(CacheConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorJob.java
similarity index 72%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorJob.java
index 70112ee3326..0ec5e6e7f66 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorJob.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorJob.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.util.Collection;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -32,8 +31,8 @@ import org.apache.ignite.lang.IgniteUuid;
/**
* Job that collect cache configuration from node.
*/
-public class VisorCacheConfigurationCollectorJob
- extends VisorJob<VisorCacheConfigurationCollectorTaskArg, Map<String,
VisorCacheConfiguration>> {
+public class CacheConfigurationCollectorJob
+ extends VisorJob<CacheConfigurationCollectorTaskArg, Map<String,
CacheConfiguration>> {
/** */
private static final long serialVersionUID = 0L;
@@ -43,12 +42,12 @@ public class VisorCacheConfigurationCollectorJob
* @param arg Whether to collect metrics for all caches or for specified
cache name only or by regex.
* @param debug Debug flag.
*/
- public
VisorCacheConfigurationCollectorJob(VisorCacheConfigurationCollectorTaskArg
arg, boolean debug) {
+ public CacheConfigurationCollectorJob(CacheConfigurationCollectorTaskArg
arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected Map<String, VisorCacheConfiguration>
run(VisorCacheConfigurationCollectorTaskArg arg) {
+ @Override protected Map<String, CacheConfiguration>
run(CacheConfigurationCollectorTaskArg arg) {
Collection<IgniteCacheProxy<?, ?>> caches =
ignite.context().cache().jcaches();
Pattern ptrn = arg.getRegex() != null ?
Pattern.compile(arg.getRegex()) : null;
@@ -57,7 +56,7 @@ public class VisorCacheConfigurationCollectorJob
boolean hasPtrn = ptrn != null;
- Map<String, VisorCacheConfiguration> res = U.newHashMap(caches.size());
+ Map<String, CacheConfiguration> res = U.newHashMap(caches.size());
for (IgniteCacheProxy<?, ?> cache : caches) {
if (!cache.context().userCache())
@@ -68,8 +67,9 @@ public class VisorCacheConfigurationCollectorJob
boolean matched = hasPtrn ? ptrn.matcher(cacheName).find() : all
|| arg.getCacheNames().contains(cacheName);
if (!VisorTaskUtils.isRestartingCache(ignite, cacheName) &&
matched) {
- VisorCacheConfiguration cfg =
- config(cache.getConfiguration(CacheConfiguration.class),
cache.context().dynamicDeploymentId());
+ CacheConfiguration cfg =
+
config(cache.getConfiguration(org.apache.ignite.configuration.CacheConfiguration.class),
+ cache.context().dynamicDeploymentId());
res.put(cacheName, cfg);
}
@@ -82,12 +82,12 @@ public class VisorCacheConfigurationCollectorJob
* @param ccfg Cache configuration.
* @return Data transfer object to send it to Visor.
*/
- protected VisorCacheConfiguration config(CacheConfiguration ccfg,
IgniteUuid dynamicDeploymentId) {
- return new VisorCacheConfiguration(ignite, ccfg, dynamicDeploymentId);
+ protected CacheConfiguration
config(org.apache.ignite.configuration.CacheConfiguration ccfg, IgniteUuid
dynamicDeploymentId) {
+ return new CacheConfiguration(ignite, ccfg, dynamicDeploymentId);
}
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheConfigurationCollectorJob.class, this);
+ return S.toString(CacheConfigurationCollectorJob.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTask.java
similarity index 80%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTask.java
index 418eb1b57b8..19e299faebd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.HashMap;
@@ -31,24 +31,24 @@ import org.jetbrains.annotations.Nullable;
* Task that collect cache metrics from all nodes.
*/
@GridInternal
-public class VisorCacheConfigurationCollectorTask
- extends VisorOneNodeTask<VisorCacheConfigurationCollectorTaskArg,
Map<String, VisorCacheConfiguration>> {
+public class CacheConfigurationCollectorTask
+ extends VisorOneNodeTask<CacheConfigurationCollectorTaskArg, Map<String,
CacheConfiguration>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorCacheConfigurationCollectorJob
job(VisorCacheConfigurationCollectorTaskArg arg) {
- return new VisorCacheConfigurationCollectorJob(arg, debug);
+ @Override protected CacheConfigurationCollectorJob
job(CacheConfigurationCollectorTaskArg arg) {
+ return new CacheConfigurationCollectorJob(arg, debug);
}
/** {@inheritDoc} */
- @Override protected @Nullable Map<String, VisorCacheConfiguration> reduce0(
+ @Override protected @Nullable Map<String, CacheConfiguration> reduce0(
List<ComputeJobResult> results
) throws IgniteException {
if (results == null)
return null;
- Map<String, VisorCacheConfiguration> map = new HashMap<>();
+ Map<String, CacheConfiguration> map = new HashMap<>();
List<Exception> resultsExceptions = null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTaskArg.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTaskArg.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java
index b4b8143be0d..12c3c887b07 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfigurationCollectorTaskArg.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -27,9 +27,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
- * Argument for {@link VisorCacheConfigurationCollectorTask}.
+ * Argument for {@link CacheConfigurationCollectorTask}.
*/
-public class VisorCacheConfigurationCollectorTaskArg extends
VisorDataTransferObject {
+public class CacheConfigurationCollectorTaskArg extends
VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -42,21 +42,21 @@ public class VisorCacheConfigurationCollectorTaskArg
extends VisorDataTransferOb
/**
* Default constructor.
*/
- public VisorCacheConfigurationCollectorTaskArg() {
+ public CacheConfigurationCollectorTaskArg() {
// No-op.
}
/**
* @param cacheNames Collection of cache names.
*/
- public VisorCacheConfigurationCollectorTaskArg(Collection<String>
cacheNames) {
+ public CacheConfigurationCollectorTaskArg(Collection<String> cacheNames) {
this.cacheNames = cacheNames;
}
/**
* @param regex Cache name regexp.
*/
- public VisorCacheConfigurationCollectorTaskArg(String regex) {
+ public CacheConfigurationCollectorTaskArg(String regex) {
// Checks, that regex is correct.
Pattern.compile(regex);
@@ -98,6 +98,6 @@ public class VisorCacheConfigurationCollectorTaskArg extends
VisorDataTransferOb
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheConfigurationCollectorTaskArg.class, this);
+ return S.toString(CacheConfigurationCollectorTaskArg.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommand.java
index 3085ab293b9..8b5a4af5654 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommand.java
@@ -19,7 +19,7 @@ package org.apache.ignite.internal.management.cache;
import java.util.Set;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.cache.VisorCacheCreateTask;
+
import static org.apache.ignite.internal.IgniteComponentType.SPRING;
/** Create caches. */
@@ -36,7 +36,7 @@ public class CacheCreateCommand implements
ComputeCommand<CacheCreateCommandArg,
}
/** {@inheritDoc} */
- @Override public Class<VisorCacheCreateTask> taskClass() {
- return VisorCacheCreateTask.class;
+ @Override public Class<CacheCreateTask> taskClass() {
+ return CacheCreateTask.class;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCreateTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateTask.java
similarity index 87%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCreateTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateTask.java
index 0296cc3003b..b8435492328 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheCreateTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.ByteArrayInputStream;
import java.util.Collection;
@@ -28,30 +28,30 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.management.cache.CacheCreateCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.spring.IgniteSpringHelper;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
import org.apache.ignite.resources.IgniteInstanceResource;
+
import static org.apache.ignite.internal.IgniteComponentType.SPRING;
/**
* Task to create caches from Spring XML configuration.
*/
@GridInternal
-public class VisorCacheCreateTask extends
VisorOneNodeTask<CacheCreateCommandArg, Set<String>> {
+public class CacheCreateTask extends VisorOneNodeTask<CacheCreateCommandArg,
Set<String>> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
@Override protected VisorJob<CacheCreateCommandArg, Set<String>>
job(CacheCreateCommandArg springXmlConfig) {
- return new VisorCacheCreateJob(springXmlConfig, false);
+ return new CacheCreateJob(springXmlConfig, false);
}
/** */
- private static class VisorCacheCreateJob extends
VisorJob<CacheCreateCommandArg, Set<String>> {
+ private static class CacheCreateJob extends
VisorJob<CacheCreateCommandArg, Set<String>> {
/** */
private static final long serialVersionUID = 0L;
@@ -60,7 +60,7 @@ public class VisorCacheCreateTask extends
VisorOneNodeTask<CacheCreateCommandArg
protected transient IgniteEx ignite;
/** */
- protected VisorCacheCreateJob(CacheCreateCommandArg arg, boolean
debug) {
+ protected CacheCreateJob(CacheCreateCommandArg arg, boolean debug) {
super(arg, debug);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java
index 17ca956db1b..65acae9a306 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommand.java
@@ -29,7 +29,6 @@ import
org.apache.ignite.internal.management.api.PreparableCommand;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.cache.VisorCacheStopTask;
/** Destroy caches. */
public class CacheDestroyCommand
@@ -86,6 +85,6 @@ public class CacheDestroyCommand
/** {@inheritDoc} */
@Override public Class taskClass() {
- return VisorCacheStopTask.class;
+ return CacheStopTask.class;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java
similarity index 90%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java
index 496c609c8a8..3e301b7380d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheEvictionConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -33,7 +33,7 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.evictionPolic
/**
* Data transfer object for eviction configuration properties.
*/
-public class VisorCacheEvictionConfiguration extends VisorDataTransferObject {
+public class CacheEvictionConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -49,7 +49,7 @@ public class VisorCacheEvictionConfiguration extends
VisorDataTransferObject {
/**
* Default constructor.
*/
- public VisorCacheEvictionConfiguration() {
+ public CacheEvictionConfiguration() {
// No-op.
}
@@ -57,7 +57,7 @@ public class VisorCacheEvictionConfiguration extends
VisorDataTransferObject {
* Create data transfer object for eviction configuration properties.
* @param ccfg Cache configuration.
*/
- public VisorCacheEvictionConfiguration(CacheConfiguration ccfg) {
+ public CacheEvictionConfiguration(CacheConfiguration ccfg) {
final Factory evictionPlc = ccfg.getEvictionPolicyFactory();
plc = compactClass(evictionPlc);
@@ -102,6 +102,6 @@ public class VisorCacheEvictionConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheEvictionConfiguration.class, this);
+ return S.toString(CacheEvictionConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommand.java
index 3cf1bb332fd..7effd9e82b8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommand.java
@@ -22,14 +22,12 @@ import java.util.UUID;
import java.util.function.Consumer;
import org.apache.ignite.internal.management.api.CommandUtils;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceJobResult;
-import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTask;
-import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTaskResult;
+
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
/** Find and remove garbage. */
public class CacheFindGarbageCommand
- implements ComputeCommand<CacheFindGarbageCommandArg,
VisorFindAndDeleteGarbageInPersistenceTaskResult> {
+ implements ComputeCommand<CacheFindGarbageCommandArg,
FindAndDeleteGarbageInPersistenceTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Find and optionally delete garbage from shared cache groups
which could be left after cache destroy";
@@ -41,19 +39,19 @@ public class CacheFindGarbageCommand
}
/** {@inheritDoc} */
- @Override public Class<VisorFindAndDeleteGarbageInPersistenceTask>
taskClass() {
- return VisorFindAndDeleteGarbageInPersistenceTask.class;
+ @Override public Class<FindAndDeleteGarbageInPersistenceTask> taskClass() {
+ return FindAndDeleteGarbageInPersistenceTask.class;
}
/** {@inheritDoc} */
@Override public void printResult(
CacheFindGarbageCommandArg arg,
- VisorFindAndDeleteGarbageInPersistenceTaskResult res,
+ FindAndDeleteGarbageInPersistenceTaskResult res,
Consumer<String> printer
) {
CommandUtils.printErrors(res.exceptions(), "Scanning for garbage
failed on nodes:", printer);
- for (Map.Entry<UUID, VisorFindAndDeleteGarbageInPersistenceJobResult>
nodeEntry : res.result().entrySet()) {
+ for (Map.Entry<UUID, FindAndDeleteGarbageInPersistenceJobResult>
nodeEntry : res.result().entrySet()) {
if (!nodeEntry.getValue().hasGarbage()) {
printer.accept("Node " + nodeEntry.getKey() + " - garbage not
found.");
@@ -62,7 +60,7 @@ public class CacheFindGarbageCommand
printer.accept("Garbage found on node " + nodeEntry.getKey() +
":");
- VisorFindAndDeleteGarbageInPersistenceJobResult value =
nodeEntry.getValue();
+ FindAndDeleteGarbageInPersistenceJobResult value =
nodeEntry.getValue();
Map<Integer, Map<Integer, Long>> grpPartErrorsCount =
value.checkResult();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommand.java
index 53dfe81a913..a504f9e3009 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommand.java
@@ -25,9 +25,6 @@ import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.visor.cache.index.IndexForceRebuildTask;
-import org.apache.ignite.internal.visor.cache.index.IndexForceRebuildTaskRes;
-import
org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusInfoContainer;
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommand.java
index 5ab0c76cbaf..2f02ee4f1b7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommand.java
@@ -27,8 +27,6 @@ import java.util.UUID;
import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.cache.index.IndexListInfoContainer;
-import org.apache.ignite.internal.visor.cache.index.IndexListTask;
/** Index list. */
public class CacheIndexesListCommand implements
ComputeCommand<CacheIndexesListCommandArg, Set<IndexListInfoContainer>> {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommand.java
index 56e4bf7049e..b2fcb835727 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommand.java
@@ -25,8 +25,6 @@ import java.util.UUID;
import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import
org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusInfoContainer;
-import org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusTask;
/** Index rebuild status. */
public class CacheIndexesRebuildStatusCommand
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java
old mode 100755
new mode 100644
similarity index 86%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java
index 5469b2b259d..33396110cab
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcType.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -34,7 +34,7 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
* Data transfer object for {@link JdbcType}.
*/
-public class VisorCacheJdbcType extends VisorDataTransferObject {
+public class CacheJdbcType extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -51,17 +51,17 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
private String valType;
/** Key fields. */
- private List<VisorCacheJdbcTypeField> keyFields;
+ private List<CacheJdbcTypeField> keyFields;
/** Value fields. */
- private List<VisorCacheJdbcTypeField> valFields;
+ private List<CacheJdbcTypeField> valFields;
/**
* @param factory Store factory to extract JDBC types info.
* @return Data transfer object for cache type metadata configurations.
*/
- public static List<VisorCacheJdbcType> list(Factory factory) {
- List<VisorCacheJdbcType> res = new ArrayList<>();
+ public static List<CacheJdbcType> list(Factory factory) {
+ List<CacheJdbcType> res = new ArrayList<>();
if (factory instanceof CacheJdbcPojoStoreFactory) {
CacheJdbcPojoStoreFactory jdbcFactory =
(CacheJdbcPojoStoreFactory)factory;
@@ -70,7 +70,7 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
if (!F.isEmpty(jdbcTypes)) {
for (JdbcType jdbcType : jdbcTypes)
- res.add(new VisorCacheJdbcType(jdbcType));
+ res.add(new CacheJdbcType(jdbcType));
}
}
@@ -80,7 +80,7 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
/**
* Create data transfer object for given cache type metadata.
*/
- public VisorCacheJdbcType() {
+ public CacheJdbcType() {
// No-op.
}
@@ -89,7 +89,7 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
*
* @param jdbcType JDBC type.
*/
- public VisorCacheJdbcType(JdbcType jdbcType) {
+ public CacheJdbcType(JdbcType jdbcType) {
keyType = jdbcType.getKeyType();
valType = jdbcType.getValueType();
@@ -102,7 +102,7 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
keyFields = new ArrayList<>(kFields.length);
for (JdbcTypeField fld : kFields)
- keyFields.add(new VisorCacheJdbcTypeField(
+ keyFields.add(new CacheJdbcTypeField(
fld.getDatabaseFieldName(), fld.getDatabaseFieldType(),
fld.getDatabaseFieldName(),
U.compact(fld.getJavaFieldType().getName())));
}
@@ -113,7 +113,7 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
valFields = new ArrayList<>(vFields.length);
for (JdbcTypeField fld : vFields)
- valFields.add(new VisorCacheJdbcTypeField(
+ valFields.add(new CacheJdbcTypeField(
fld.getDatabaseFieldName(), fld.getDatabaseFieldType(),
fld.getDatabaseFieldName(),
U.compact(fld.getJavaFieldType().getName())));
}
@@ -150,14 +150,14 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
/**
* @return Key fields.
*/
- public List<VisorCacheJdbcTypeField> getKeyFields() {
+ public List<CacheJdbcTypeField> getKeyFields() {
return keyFields;
}
/**
* @return Value fields.
*/
- public List<VisorCacheJdbcTypeField> getValueFields() {
+ public List<CacheJdbcTypeField> getValueFields() {
return valFields;
}
@@ -183,6 +183,6 @@ public class VisorCacheJdbcType extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheJdbcType.class, this);
+ return S.toString(CacheJdbcType.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcTypeField.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java
similarity index 90%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcTypeField.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java
index 5486aaf6053..fed1da167c3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheJdbcTypeField.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -28,7 +28,7 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
* Data transfer object for {@link JdbcTypeField}.
*/
-public class VisorCacheJdbcTypeField extends VisorDataTransferObject {
+public class CacheJdbcTypeField extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -47,7 +47,7 @@ public class VisorCacheJdbcTypeField extends
VisorDataTransferObject {
/**
* Empty constructor.
*/
- public VisorCacheJdbcTypeField() {
+ public CacheJdbcTypeField() {
// No-op.
}
@@ -59,7 +59,7 @@ public class VisorCacheJdbcTypeField extends
VisorDataTransferObject {
* @param javaName Field name in java object.
* @param javaType Corresponding java type.
*/
- public VisorCacheJdbcTypeField(String dbName, int dbType, String javaName,
String javaType) {
+ public CacheJdbcTypeField(String dbName, int dbType, String javaName,
String javaType) {
this.dbName = dbName;
this.dbType = dbType;
this.javaName = javaName;
@@ -112,6 +112,6 @@ public class VisorCacheJdbcTypeField extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheJdbcTypeField.class, this);
+ return S.toString(CacheJdbcTypeField.class, this);
}
}
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 3d8aee107f1..6826c179c6e 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
@@ -33,15 +33,6 @@ import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.LocalCommand;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import org.apache.ignite.internal.visor.cache.VisorCacheAffinityConfiguration;
-import org.apache.ignite.internal.visor.cache.VisorCacheConfiguration;
-import
org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTask;
-import
org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTaskArg;
-import org.apache.ignite.internal.visor.cache.VisorCacheEvictionConfiguration;
-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 static org.apache.ignite.internal.management.cache.ViewCacheCmd.CACHES;
import static org.apache.ignite.internal.management.cache.ViewCacheCmd.GROUPS;
@@ -111,11 +102,11 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, ViewC
.filter(FILTER.apply(arg))
.collect(Collectors.toSet());
- Map<String, VisorCacheConfiguration> res =
cli.compute().projection(nodes).execute(
- VisorCacheConfigurationCollectorTask.class.getName(),
+ Map<String, CacheConfiguration> res =
cli.compute().projection(nodes).execute(
+ CacheConfigurationCollectorTask.class.getName(),
new VisorTaskArgument<>(
nodes.stream().map(GridClientNode::nodeId).collect(Collectors.toSet()),
- new VisorCacheConfigurationCollectorTaskArg(arg.regex()),
+ new CacheConfigurationCollectorTaskArg(arg.regex()),
false
)
);
@@ -157,13 +148,13 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, ViewC
* @param cacheToMapped Map cache name to mapped.
*/
private void printCachesConfig(
- Map<String, VisorCacheConfiguration> caches,
+ Map<String, CacheConfiguration> caches,
OutputFormat outputFormat,
Map<String, Integer> cacheToMapped,
Consumer<String> printer
) {
- for (Map.Entry<String, VisorCacheConfiguration> entry :
caches.entrySet()) {
+ for (Map.Entry<String, CacheConfiguration> entry : caches.entrySet()) {
String cacheName = entry.getKey();
switch (outputFormat) {
@@ -192,20 +183,20 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, ViewC
}
/**
- * Maps VisorCacheConfiguration to key-value pairs.
+ * Maps CacheConfiguration to key-value pairs.
*
* @param cfg Visor cache configuration.
* @return map of key-value pairs.
*/
- private static Map<String, Object> mapToPairs(VisorCacheConfiguration cfg)
{
+ private static Map<String, Object> mapToPairs(CacheConfiguration cfg) {
Map<String, Object> params = new LinkedHashMap<>();
- VisorCacheAffinityConfiguration affinityCfg =
cfg.getAffinityConfiguration();
- VisorCacheNearConfiguration nearCfg = cfg.getNearConfiguration();
- VisorCacheRebalanceConfiguration rebalanceCfg =
cfg.getRebalanceConfiguration();
- VisorCacheEvictionConfiguration evictCfg =
cfg.getEvictionConfiguration();
- VisorCacheStoreConfiguration storeCfg = cfg.getStoreConfiguration();
- VisorQueryConfiguration qryCfg = cfg.getQueryConfiguration();
+ CacheAffinityConfiguration affinityCfg =
cfg.getAffinityConfiguration();
+ CacheNearConfiguration nearCfg = cfg.getNearConfiguration();
+ CacheRebalanceConfiguration rebalanceCfg =
cfg.getRebalanceConfiguration();
+ CacheEvictionConfiguration evictCfg = cfg.getEvictionConfiguration();
+ CacheStoreConfiguration storeCfg = cfg.getStoreConfiguration();
+ QueryConfiguration qryCfg = cfg.getQueryConfiguration();
params.put("Name", cfg.getName());
params.put("Group", cfg.getGroupName());
@@ -298,7 +289,7 @@ public class CacheListCommand implements
LocalCommand<CacheListCommandArg, ViewC
* @param cfg Visor cache configuration for invocation.
* @return String representation without class name in begin of string.
*/
- private String toString(VisorCacheConfiguration cfg) {
+ private String toString(CacheConfiguration cfg) {
return
cfg.toString().substring(cfg.getClass().getSimpleName().length() + 1);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
index 9798da146b3..d4d68cfa494 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommand.java
@@ -22,14 +22,13 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTask;
-import
org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTaskResult;
+
import static java.util.Arrays.asList;
import static
org.apache.ignite.internal.management.SystemViewCommand.printTable;
import static
org.apache.ignite.internal.management.SystemViewTask.SimpleType.STRING;
/** Enable / disable cache metrics collection or show metrics collection
status. */
-public class CacheMetricsCommand implements
ComputeCommand<CacheMetricsCommandArg, VisorCacheMetricsTaskResult> {
+public class CacheMetricsCommand implements
ComputeCommand<CacheMetricsCommandArg, CacheMetricsTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Manages user cache metrics collection: enables, disables it or
shows status";
@@ -41,12 +40,12 @@ public class CacheMetricsCommand implements
ComputeCommand<CacheMetricsCommandAr
}
/** {@inheritDoc} */
- @Override public Class<VisorCacheMetricsTask> taskClass() {
- return VisorCacheMetricsTask.class;
+ @Override public Class<CacheMetricsTask> taskClass() {
+ return CacheMetricsTask.class;
}
/** {@inheritDoc} */
- @Override public void printResult(CacheMetricsCommandArg arg,
VisorCacheMetricsTaskResult res, Consumer<String> printer) {
+ @Override public void printResult(CacheMetricsCommandArg arg,
CacheMetricsTaskResult res, Consumer<String> printer) {
try {
List<List<?>> values = res.result().entrySet()
.stream()
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java
index 8e01b6e4750..00691f5a488 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.management.api.Argument;
import org.apache.ignite.internal.management.api.ArgumentGroup;
import org.apache.ignite.internal.management.api.Positional;
import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.cache.metrics.CacheMetricsOperation;
/** */
@ArgumentGroup(value = {"caches", "allCaches"}, onlyOneOf = true, optional =
false)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/CacheMetricsOperation.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsOperation.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/CacheMetricsOperation.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsOperation.java
index 133e454fca8..75ecd821dd0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/CacheMetricsOperation.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsOperation.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.metrics;
+package org.apache.ignite.internal.management.cache;
import org.jetbrains.annotations.Nullable;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/VisorCacheMetricsTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTask.java
similarity index 77%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/VisorCacheMetricsTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTask.java
index 3493f30249e..42bc26a33cd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/VisorCacheMetricsTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTask.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.metrics;
+package org.apache.ignite.internal.management.cache;
import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
import org.apache.ignite.IgniteException;
-import org.apache.ignite.internal.management.cache.CacheMetricsCommandArg;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
@@ -30,28 +29,28 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
import org.jetbrains.annotations.Nullable;
-import static
org.apache.ignite.internal.visor.cache.metrics.CacheMetricsOperation.ENABLE;
+import static
org.apache.ignite.internal.management.cache.CacheMetricsOperation.ENABLE;
/**
* Task for a cache metrics command.
*/
@GridInternal
@GridVisorManagementTask
-public class VisorCacheMetricsTask extends
VisorOneNodeTask<CacheMetricsCommandArg, VisorCacheMetricsTaskResult> {
+public class CacheMetricsTask extends VisorOneNodeTask<CacheMetricsCommandArg,
CacheMetricsTaskResult> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorCacheMetricsJob job(CacheMetricsCommandArg arg) {
- return new VisorCacheMetricsJob(arg, false);
+ @Override protected CacheMetricsJob job(CacheMetricsCommandArg arg) {
+ return new CacheMetricsJob(arg, false);
}
/**
* Job returns {@link Map} with names of processed caches paired with
corresponding metrics collection statuses or
* exception, caught during execution of job.
- * Results are passed into instance of wrapper class {@link
VisorCacheMetricsTaskResult}.
+ * Results are passed into instance of wrapper class {@link
CacheMetricsTaskResult}.
*/
- private static class VisorCacheMetricsJob extends
VisorJob<CacheMetricsCommandArg, VisorCacheMetricsTaskResult> {
+ private static class CacheMetricsJob extends
VisorJob<CacheMetricsCommandArg, CacheMetricsTaskResult> {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -61,12 +60,12 @@ public class VisorCacheMetricsTask extends
VisorOneNodeTask<CacheMetricsCommandA
* @param arg Job argument.
* @param debug Flag indicating whether debug information should be
printed into node log.
*/
- protected VisorCacheMetricsJob(@Nullable CacheMetricsCommandArg arg,
boolean debug) {
+ protected CacheMetricsJob(@Nullable CacheMetricsCommandArg arg,
boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorCacheMetricsTaskResult run(@Nullable
CacheMetricsCommandArg arg)
+ @Override protected CacheMetricsTaskResult run(@Nullable
CacheMetricsCommandArg arg)
throws IgniteException {
if (arg != null) {
Collection<String> cacheNames = F.isEmpty(arg.caches()) ?
ignite.cacheNames() : Arrays.asList(arg.caches());
@@ -77,17 +76,17 @@ public class VisorCacheMetricsTask extends
VisorOneNodeTask<CacheMetricsCommandA
case DISABLE:
ignite.cluster().enableStatistics(cacheNames,
ENABLE == arg.operation());
- return new
VisorCacheMetricsTaskResult(cacheMetricsStatus(cacheNames));
+ return new
CacheMetricsTaskResult(cacheMetricsStatus(cacheNames));
case STATUS:
- return new
VisorCacheMetricsTaskResult(cacheMetricsStatus(cacheNames));
+ return new
CacheMetricsTaskResult(cacheMetricsStatus(cacheNames));
default:
throw new IllegalStateException("Unexpected value:
" + arg.operation());
}
}
catch (Exception e) {
- return new VisorCacheMetricsTaskResult(e);
+ return new CacheMetricsTaskResult(e);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/VisorCacheMetricsTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTaskResult.java
similarity index 86%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/VisorCacheMetricsTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTaskResult.java
index e232f7048f2..d8b0418b893 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/metrics/VisorCacheMetricsTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.metrics;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -26,9 +26,9 @@ import
org.apache.ignite.internal.dto.IgniteDataTransferObject;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
- * Result wrapper for {@link VisorCacheMetricsTask}.
+ * Result wrapper for {@link CacheMetricsTask}.
*/
-public class VisorCacheMetricsTaskResult extends IgniteDataTransferObject {
+public class CacheMetricsTaskResult extends IgniteDataTransferObject {
/** Serial version uid. */
private static final long serialVersionUID = 0L;
@@ -41,21 +41,21 @@ public class VisorCacheMetricsTaskResult extends
IgniteDataTransferObject {
/**
* Default constructor.
*/
- public VisorCacheMetricsTaskResult() {
+ public CacheMetricsTaskResult() {
// No-op.
}
/**
* @param result Task execution result.
*/
- public VisorCacheMetricsTaskResult(Map<String, Boolean> result) {
+ public CacheMetricsTaskResult(Map<String, Boolean> result) {
this.result = Collections.unmodifiableMap(result);
}
/**
* @param error Task execution error.
*/
- public VisorCacheMetricsTaskResult(Exception error) {
+ public CacheMetricsTaskResult(Exception error) {
this.error = error;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java
similarity index 92%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java
index a7b431c27c0..1f2fda1ca4e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheNearConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -35,7 +35,7 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.evictionPolic
/**
* Data transfer object for near cache configuration properties.
*/
-public class VisorCacheNearConfiguration extends VisorDataTransferObject {
+public class CacheNearConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -54,7 +54,7 @@ public class VisorCacheNearConfiguration extends
VisorDataTransferObject {
/**
* Default constructor.
*/
- public VisorCacheNearConfiguration() {
+ public CacheNearConfiguration() {
// No-op.
}
@@ -63,7 +63,7 @@ public class VisorCacheNearConfiguration extends
VisorDataTransferObject {
*
* @param ccfg Cache configuration.
*/
- public VisorCacheNearConfiguration(CacheConfiguration ccfg) {
+ public CacheNearConfiguration(CacheConfiguration ccfg) {
nearEnabled = GridCacheUtils.isNearEnabled(ccfg);
if (nearEnabled) {
@@ -123,6 +123,6 @@ public class VisorCacheNearConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheNearConfiguration.class, this);
+ return S.toString(CacheNearConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java
similarity index 92%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java
index 8a3acaad211..6d5fd7f4b48 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheRebalanceConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+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;
/**
* Data transfer object for cache rebalance configuration properties.
*/
-public class VisorCacheRebalanceConfiguration extends VisorDataTransferObject {
+public class CacheRebalanceConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -57,7 +57,7 @@ public class VisorCacheRebalanceConfiguration extends
VisorDataTransferObject {
/**
* Default constructor.
*/
- public VisorCacheRebalanceConfiguration() {
+ public CacheRebalanceConfiguration() {
// No-op.
}
@@ -65,7 +65,7 @@ public class VisorCacheRebalanceConfiguration extends
VisorDataTransferObject {
* Create data transfer object for rebalance configuration properties.
* @param ccfg Cache configuration.
*/
- public VisorCacheRebalanceConfiguration(CacheConfiguration ccfg) {
+ public CacheRebalanceConfiguration(CacheConfiguration ccfg) {
mode = ccfg.getRebalanceMode();
batchSize = ccfg.getRebalanceBatchSize();
partitionedDelay = ccfg.getRebalanceDelay();
@@ -148,6 +148,6 @@ public class VisorCacheRebalanceConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheRebalanceConfiguration.class, this);
+ return S.toString(CacheRebalanceConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
index ef30c9f95e0..7ccf9e790dd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanCommand.java
@@ -23,11 +23,9 @@ import java.util.stream.Collectors;
import org.apache.ignite.internal.management.SystemViewCommand;
import org.apache.ignite.internal.management.SystemViewTask;
import org.apache.ignite.internal.management.api.ComputeCommand;
-import org.apache.ignite.internal.visor.cache.VisorCacheScanTask;
-import org.apache.ignite.internal.visor.cache.VisorCacheScanTaskResult;
/** Scan cache entries. */
-public class CacheScanCommand implements ComputeCommand<CacheScanCommandArg,
VisorCacheScanTaskResult> {
+public class CacheScanCommand implements ComputeCommand<CacheScanCommandArg,
CacheScanTaskResult> {
/** {@inheritDoc} */
@Override public String description() {
return "Show cache content";
@@ -39,12 +37,12 @@ public class CacheScanCommand implements
ComputeCommand<CacheScanCommandArg, Vis
}
/** {@inheritDoc} */
- @Override public Class<VisorCacheScanTask> taskClass() {
- return VisorCacheScanTask.class;
+ @Override public Class<CacheScanTask> taskClass() {
+ return CacheScanTask.class;
}
/** {@inheritDoc} */
- @Override public void printResult(CacheScanCommandArg arg,
VisorCacheScanTaskResult res, Consumer<String> printer) {
+ @Override public void printResult(CacheScanCommandArg arg,
CacheScanTaskResult res, Consumer<String> printer) {
List<SystemViewTask.SimpleType> types = res.titles().stream()
.map(x ->
SystemViewTask.SimpleType.STRING).collect(Collectors.toList());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheScanTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTask.java
similarity index 88%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheScanTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTask.java
index 8da15d47736..06f36e5e97d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheScanTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Arrays;
@@ -25,7 +25,6 @@ import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.binary.BinaryType;
import org.apache.ignite.internal.binary.BinaryObjectEx;
-import org.apache.ignite.internal.management.cache.CacheScanCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -40,19 +39,19 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
*/
@GridInternal
@GridVisorManagementTask
-public class VisorCacheScanTask extends VisorOneNodeTask<CacheScanCommandArg,
VisorCacheScanTaskResult> {
+public class CacheScanTask extends VisorOneNodeTask<CacheScanCommandArg,
CacheScanTaskResult> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorCacheScanJob job(CacheScanCommandArg arg) {
- return new VisorCacheScanJob(arg, debug);
+ @Override protected CacheScanJob job(CacheScanCommandArg arg) {
+ return new CacheScanJob(arg, debug);
}
/**
* Job that stop specified caches.
*/
- private static class VisorCacheScanJob extends
VisorJob<CacheScanCommandArg, VisorCacheScanTaskResult> {
+ private static class CacheScanJob extends VisorJob<CacheScanCommandArg,
CacheScanTaskResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -62,12 +61,12 @@ public class VisorCacheScanTask extends
VisorOneNodeTask<CacheScanCommandArg, Vi
* @param arg Task argument.
* @param debug Debug flag.
*/
- private VisorCacheScanJob(CacheScanCommandArg arg, boolean debug) {
+ private CacheScanJob(CacheScanCommandArg arg, boolean debug) {
super(arg, debug);
}
/** {@inheritDoc} */
- @Override protected VisorCacheScanTaskResult run(CacheScanCommandArg
arg) {
+ @Override protected CacheScanTaskResult run(CacheScanCommandArg arg) {
if (F.isEmpty(arg.cacheName()))
throw new IllegalStateException("Cache name was not
specified.");
@@ -88,7 +87,7 @@ public class VisorCacheScanTask extends
VisorOneNodeTask<CacheScanCommandArg, Vi
break;
}
- return new VisorCacheScanTaskResult(titles, entries);
+ return new CacheScanTaskResult(titles, entries);
}
/**
@@ -187,7 +186,7 @@ public class VisorCacheScanTask extends
VisorOneNodeTask<CacheScanCommandArg, Vi
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheScanJob.class, this);
+ return S.toString(CacheScanJob.class, this);
}
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheScanTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTaskResult.java
similarity index 86%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheScanTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTaskResult.java
index 4d93674a76e..9a3a8b41354 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheScanTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScanTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -26,10 +26,10 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
- * Result of running {@link VisorCacheScanTask}.
+ * Result of running {@link CacheScanTask}.
*/
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
-public class VisorCacheScanTaskResult extends IgniteDataTransferObject {
+public class CacheScanTaskResult extends IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -42,13 +42,13 @@ public class VisorCacheScanTaskResult extends
IgniteDataTransferObject {
/**
*
*/
- public VisorCacheScanTaskResult() {
+ public CacheScanTaskResult() {
}
/**
* @param entries Cache entries.
*/
- public VisorCacheScanTaskResult(List<String> titles, List<List<?>>
entries) {
+ public CacheScanTaskResult(List<String> titles, List<List<?>> entries) {
this.titles = titles;
this.entries = entries;
}
@@ -81,6 +81,6 @@ public class VisorCacheScanTaskResult extends
IgniteDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheScanTaskResult.class, this);
+ return S.toString(CacheScanTaskResult.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommand.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommand.java
index 92ac87a00c3..9912087b39b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommand.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommand.java
@@ -26,8 +26,6 @@ import java.util.function.Consumer;
import org.apache.ignite.internal.client.GridClientNode;
import org.apache.ignite.internal.management.api.ComputeCommand;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTask;
-import
org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTaskRes;
import static org.apache.ignite.internal.management.api.CommandUtils.INDENT;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStopTask.java
similarity index 80%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStopTask.java
index bd2cc9d1f70..b606f05b4bd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStopTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStopTask.java
@@ -15,12 +15,11 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
-import org.apache.ignite.internal.management.cache.CacheDestroyCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.processors.task.GridVisorManagementTask;
import org.apache.ignite.internal.util.typedef.F;
@@ -33,19 +32,19 @@ import org.apache.ignite.internal.visor.VisorOneNodeTask;
*/
@GridInternal
@GridVisorManagementTask
-public class VisorCacheStopTask extends
VisorOneNodeTask<CacheDestroyCommandArg, Void> {
+public class CacheStopTask extends VisorOneNodeTask<CacheDestroyCommandArg,
Void> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Override protected VisorCacheStopJob job(CacheDestroyCommandArg arg) {
- return new VisorCacheStopJob(arg, debug);
+ @Override protected CacheStopJob job(CacheDestroyCommandArg arg) {
+ return new CacheStopJob(arg, debug);
}
/**
* Job that stop specified caches.
*/
- private static class VisorCacheStopJob extends
VisorJob<CacheDestroyCommandArg, Void> {
+ private static class CacheStopJob extends VisorJob<CacheDestroyCommandArg,
Void> {
/** */
private static final long serialVersionUID = 0L;
@@ -55,7 +54,7 @@ public class VisorCacheStopTask extends
VisorOneNodeTask<CacheDestroyCommandArg,
* @param arg Task argument.
* @param debug Debug flag.
*/
- private VisorCacheStopJob(CacheDestroyCommandArg arg, boolean debug) {
+ private CacheStopJob(CacheDestroyCommandArg arg, boolean debug) {
super(arg, debug);
}
@@ -75,7 +74,7 @@ public class VisorCacheStopTask extends
VisorOneNodeTask<CacheDestroyCommandArg,
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheStopJob.class, this);
+ return S.toString(CacheStopJob.class, this);
}
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java
similarity index 95%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java
index 1c0c6b887b5..ca7f8c841ff 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheStoreConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -35,7 +35,7 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass;
/**
* Data transfer object for cache store configuration properties.
*/
-public class VisorCacheStoreConfiguration extends VisorDataTransferObject {
+public class CacheStoreConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -78,7 +78,7 @@ public class VisorCacheStoreConfiguration extends
VisorDataTransferObject {
/**
* Default constructor.
*/
- public VisorCacheStoreConfiguration() {
+ public CacheStoreConfiguration() {
// No-op.
}
@@ -88,7 +88,7 @@ public class VisorCacheStoreConfiguration extends
VisorDataTransferObject {
* @param ignite Ignite instance.
* @param ccfg Cache configuration.
*/
- public VisorCacheStoreConfiguration(IgniteEx ignite, CacheConfiguration
ccfg) {
+ public CacheStoreConfiguration(IgniteEx ignite, CacheConfiguration ccfg) {
IgniteCacheProxy<Object, Object> c =
ignite.context().cache().jcache(ccfg.getName());
CacheStore cstore = c != null && c.context().started() ?
c.context().store().configuredStore() : null;
@@ -237,6 +237,6 @@ public class VisorCacheStoreConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorCacheStoreConfiguration.class, this);
+ return S.toString(CacheStoreConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.java
similarity index 93%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.java
index 4b3623b9597..a12b0617ea5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.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.cache;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Collection;
@@ -56,7 +56,7 @@ import org.apache.ignite.resources.LoggerResource;
*
* Also, could cleanup this garbage in cache partitions and indexes.
*/
-public class VisorFindAndDeleteGarbageInPersistenceClosure implements
IgniteCallable<VisorFindAndDeleteGarbageInPersistenceJobResult> {
+public class FindAndDeleteGarbageInPersistenceClosure implements
IgniteCallable<FindAndDeleteGarbageInPersistenceJobResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -90,13 +90,13 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure
implements IgniteCall
* @param grpNames Cache group names.
* @param deleteGarbage Clean up garbage from partitions.
*/
- public VisorFindAndDeleteGarbageInPersistenceClosure(String[] grpNames,
boolean deleteGarbage) {
+ public FindAndDeleteGarbageInPersistenceClosure(String[] grpNames, boolean
deleteGarbage) {
this.grpNames = grpNames;
this.deleteGarbage = deleteGarbage;
}
/** {@inheritDoc} */
- @Override public VisorFindAndDeleteGarbageInPersistenceJobResult call()
throws Exception {
+ @Override public FindAndDeleteGarbageInPersistenceJobResult call() throws
Exception {
calcExecutor =
Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
try {
@@ -110,7 +110,7 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure
implements IgniteCall
/**
*
*/
- private VisorFindAndDeleteGarbageInPersistenceJobResult call0() {
+ private FindAndDeleteGarbageInPersistenceJobResult call0() {
Set<Integer> grpIds = calcCacheGroupIds();
List<T2<CacheGroupContext, GridDhtLocalPartition>> partArgs =
calcListOfPartitions(grpIds);
@@ -147,7 +147,7 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure
implements IgniteCall
if (deleteGarbage)
cleanup(grpIdToPartIdToGarbageCount);
- log.warning("VisorFindAndDeleteGarbageInPersistenceClosure
finished: processed " + totalPartitions + " partitions.");
+ log.warning("FindAndDeleteGarbageInPersistenceClosure finished:
processed " + totalPartitions + " partitions.");
}
catch (InterruptedException | ExecutionException |
IgniteCheckedException e) {
for (int j = curPart; j < procPartFutures.size(); j++)
@@ -156,7 +156,7 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure
implements IgniteCall
throw unwrapFutureException(e);
}
- return new
VisorFindAndDeleteGarbageInPersistenceJobResult(grpIdToPartIdToGarbageCount);
+ return new
FindAndDeleteGarbageInPersistenceJobResult(grpIdToPartIdToGarbageCount);
}
/**
@@ -315,7 +315,7 @@ public class VisorFindAndDeleteGarbageInPersistenceClosure
implements IgniteCall
long lastTs = lastProgressPrintTs.get();
if (curTs - lastTs >= 60_000 &&
lastProgressPrintTs.compareAndSet(lastTs, curTs))
- log.warning("Current progress of
VisorFindAndDeleteGarbageInPersistenceClosure: checked "
+ log.warning("Current progress of
FindAndDeleteGarbageInPersistenceClosure: checked "
+ processedPartitions.get() + " partitions out of " +
totalPartitions);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceJobResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java
similarity index 85%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceJobResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java
index f05cdfa08e4..83e70b43740 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceJobResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Result of job work which is sent between nodes.
*/
-public class VisorFindAndDeleteGarbageInPersistenceJobResult extends
IgniteDataTransferObject {
+public class FindAndDeleteGarbageInPersistenceJobResult extends
IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -41,14 +41,14 @@ public class
VisorFindAndDeleteGarbageInPersistenceJobResult extends IgniteDataT
/**
* @param result Results with founded garbage (GroupId -> (CacheId, Count
of keys)).
*/
- public VisorFindAndDeleteGarbageInPersistenceJobResult(@NotNull
Map<Integer, Map<Integer, Long>> result) {
+ public FindAndDeleteGarbageInPersistenceJobResult(@NotNull Map<Integer,
Map<Integer, Long>> result) {
this.result = result;
}
/**
* For externalization only.
*/
- public VisorFindAndDeleteGarbageInPersistenceJobResult() {
+ public FindAndDeleteGarbageInPersistenceJobResult() {
}
/**
@@ -77,6 +77,6 @@ public class VisorFindAndDeleteGarbageInPersistenceJobResult
extends IgniteDataT
/** {@inheritDoc} */
@Override public String toString() {
- return
S.toString(VisorFindAndDeleteGarbageInPersistenceJobResult.class, this);
+ return S.toString(FindAndDeleteGarbageInPersistenceJobResult.class,
this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTask.java
similarity index 77%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTask.java
index a6d4fc942ab..3bbd5f62911 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,7 +29,6 @@ import java.util.UUID;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
-import org.apache.ignite.internal.management.cache.CacheFindGarbageCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.visor.VisorJob;
@@ -41,17 +40,17 @@ import org.jetbrains.annotations.Nullable;
* Compute task which are part of 'find and delete garbage' functionality.
*/
@GridInternal
-public class VisorFindAndDeleteGarbageInPersistenceTask extends
VisorMultiNodeTask<CacheFindGarbageCommandArg,
- VisorFindAndDeleteGarbageInPersistenceTaskResult,
VisorFindAndDeleteGarbageInPersistenceJobResult> {
+public class FindAndDeleteGarbageInPersistenceTask extends
VisorMultiNodeTask<CacheFindGarbageCommandArg,
+ FindAndDeleteGarbageInPersistenceTaskResult,
FindAndDeleteGarbageInPersistenceJobResult> {
/** */
private static final long serialVersionUID = 0L;
/** {@inheritDoc} */
- @Nullable @Override protected
VisorFindAndDeleteGarbageInPersistenceTaskResult reduce0(
+ @Nullable @Override protected FindAndDeleteGarbageInPersistenceTaskResult
reduce0(
List<ComputeJobResult> list
) throws IgniteException {
Map<UUID, Exception> exceptions = new HashMap<>();
- Map<UUID, VisorFindAndDeleteGarbageInPersistenceJobResult> jobResults
= new HashMap<>();
+ Map<UUID, FindAndDeleteGarbageInPersistenceJobResult> jobResults = new
HashMap<>();
for (ComputeJobResult res : list) {
if (res.getException() != null)
@@ -60,11 +59,11 @@ public class VisorFindAndDeleteGarbageInPersistenceTask
extends VisorMultiNodeTa
jobResults.put(res.getNode().id(), res.getData());
}
- return new
VisorFindAndDeleteGarbageInPersistenceTaskResult(jobResults, exceptions);
+ return new FindAndDeleteGarbageInPersistenceTaskResult(jobResults,
exceptions);
}
/** {@inheritDoc} */
- @Override protected VisorJob<CacheFindGarbageCommandArg,
VisorFindAndDeleteGarbageInPersistenceJobResult> job(
+ @Override protected VisorJob<CacheFindGarbageCommandArg,
FindAndDeleteGarbageInPersistenceJobResult> job(
CacheFindGarbageCommandArg arg
) {
return new FindAndDeleteGarbageInPersistenceJob(arg, debug);
@@ -97,7 +96,7 @@ public class VisorFindAndDeleteGarbageInPersistenceTask
extends VisorMultiNodeTa
*
*/
private static class FindAndDeleteGarbageInPersistenceJob
- extends VisorJob<CacheFindGarbageCommandArg,
VisorFindAndDeleteGarbageInPersistenceJobResult> {
+ extends VisorJob<CacheFindGarbageCommandArg,
FindAndDeleteGarbageInPersistenceJobResult> {
/** */
private static final long serialVersionUID = 0L;
@@ -110,11 +109,11 @@ public class VisorFindAndDeleteGarbageInPersistenceTask
extends VisorMultiNodeTa
}
/** {@inheritDoc} */
- @Override protected VisorFindAndDeleteGarbageInPersistenceJobResult
run(CacheFindGarbageCommandArg arg)
+ @Override protected FindAndDeleteGarbageInPersistenceJobResult
run(CacheFindGarbageCommandArg arg)
throws IgniteException {
try {
- VisorFindAndDeleteGarbageInPersistenceClosure closure =
- new
VisorFindAndDeleteGarbageInPersistenceClosure(arg.groups(), arg.delete());
+ FindAndDeleteGarbageInPersistenceClosure closure =
+ new FindAndDeleteGarbageInPersistenceClosure(arg.groups(),
arg.delete());
ignite.context().resource().injectGeneric(closure);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceTaskResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java
similarity index 78%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceTaskResult.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java
index e4e1411c33c..d162666258f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorFindAndDeleteGarbageInPersistenceTaskResult.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -28,16 +28,16 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
- * Result of running {@link VisorFindAndDeleteGarbageInPersistenceTask} which
would contain result
+ * Result of running {@link FindAndDeleteGarbageInPersistenceTask} which would
contain result
* from all participating nodes.
*/
-public class VisorFindAndDeleteGarbageInPersistenceTaskResult extends
IgniteDataTransferObject {
+public class FindAndDeleteGarbageInPersistenceTaskResult extends
IgniteDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
/** Results of indexes validation from node. */
@GridToStringInclude
- private Map<UUID, VisorFindAndDeleteGarbageInPersistenceJobResult> result;
+ private Map<UUID, FindAndDeleteGarbageInPersistenceJobResult> result;
/** Exceptions while indexes validation from node. */
@GridToStringInclude
@@ -46,7 +46,7 @@ public class VisorFindAndDeleteGarbageInPersistenceTaskResult
extends IgniteData
/**
*
*/
- public VisorFindAndDeleteGarbageInPersistenceTaskResult() {
+ public FindAndDeleteGarbageInPersistenceTaskResult() {
}
/**
@@ -54,8 +54,8 @@ public class VisorFindAndDeleteGarbageInPersistenceTaskResult
extends IgniteData
* @param jobResults Per node job result.
* @param exceptions Per node execution problems.
*/
- public VisorFindAndDeleteGarbageInPersistenceTaskResult(
- Map<UUID, VisorFindAndDeleteGarbageInPersistenceJobResult> jobResults,
+ public FindAndDeleteGarbageInPersistenceTaskResult(
+ Map<UUID, FindAndDeleteGarbageInPersistenceJobResult> jobResults,
Map<UUID, Exception> exceptions
) {
this.result = jobResults;
@@ -65,7 +65,7 @@ public class VisorFindAndDeleteGarbageInPersistenceTaskResult
extends IgniteData
/**
* @return Results of indexes validation from node.
*/
- public Map<UUID, VisorFindAndDeleteGarbageInPersistenceJobResult> result()
{
+ public Map<UUID, FindAndDeleteGarbageInPersistenceJobResult> result() {
return result;
}
@@ -90,6 +90,6 @@ public class VisorFindAndDeleteGarbageInPersistenceTaskResult
extends IgniteData
/** {@inheritDoc} */
@Override public String toString() {
- return
S.toString(VisorFindAndDeleteGarbageInPersistenceTaskResult.class, this);
+ return S.toString(FindAndDeleteGarbageInPersistenceTaskResult.class,
this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexForceRebuildTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexForceRebuildTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java
index 41351ef5912..f02afe358d8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexForceRebuildTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTask.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+package org.apache.ignite.internal.management.cache;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.ignite.IgniteException;
-import
org.apache.ignite.internal.management.cache.CacheIndexesForceRebuildCommandArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexForceRebuildTaskRes.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexForceRebuildTaskRes.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java
index 2621eda55dd..286b168dd96 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexForceRebuildTaskRes.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+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/cache/index/IndexListInfoContainer.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListInfoContainer.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java
index 70fda344a13..1dfc3875631 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListInfoContainer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+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/cache/index/IndexListTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListTask.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListTask.java
index df2cc7f2b30..fd9a68b3f64 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+package org.apache.ignite.internal.management.cache;
import java.util.Collection;
import java.util.HashSet;
@@ -24,7 +24,6 @@ import java.util.regex.Pattern;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.cache.query.index.Index;
import
org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexImpl;
-import org.apache.ignite.internal.management.cache.CacheIndexesListCommandArg;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusInfoContainer.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusInfoContainer.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java
index 91a89528d04..057ba7cdb1f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusInfoContainer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+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/cache/index/IndexRebuildStatusTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusTask.java
similarity index 96%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusTask.java
index 22d4b8628e0..d50f07710ad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexRebuildStatusTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+package org.apache.ignite.internal.management.cache;
import java.util.Arrays;
import java.util.Collection;
@@ -31,7 +31,6 @@ import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.configuration.CacheConfiguration;
-import
org.apache.ignite.internal.management.cache.CacheIndexesRebuildStatusCommandArg;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorMultiNodeTask;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java
similarity index 92%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java
index 67eaaa44a8b..5713fcf2e26 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.query;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -31,7 +31,7 @@ import static
org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClasse
/**
* Data transfer object for cache query configuration data.
*/
-public class VisorQueryConfiguration extends VisorDataTransferObject {
+public class QueryConfiguration extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -53,7 +53,7 @@ public class VisorQueryConfiguration extends
VisorDataTransferObject {
/**
* Default constructor.
*/
- public VisorQueryConfiguration() {
+ public QueryConfiguration() {
// No-op.
}
@@ -62,7 +62,7 @@ public class VisorQueryConfiguration extends
VisorDataTransferObject {
*
* @param ccfg Cache configuration.
*/
- public VisorQueryConfiguration(CacheConfiguration ccfg) {
+ public QueryConfiguration(CacheConfiguration ccfg) {
sqlFuncClss = compactClasses(ccfg.getSqlFunctionClasses());
longQryWarnTimeout = ccfg.getLongQueryWarningTimeout();
sqlEscapeAll = ccfg.isSqlEscapeAll();
@@ -125,6 +125,6 @@ public class VisorQueryConfiguration extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorQueryConfiguration.class, this);
+ return S.toString(QueryConfiguration.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryEntity.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java
similarity index 85%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryEntity.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java
index 22ac4695dc1..eabfd241a04 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryEntity.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.query;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -25,8 +25,6 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.ignite.cache.QueryEntity;
-import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -34,9 +32,9 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
- * Data transfer object for {@link QueryEntity}.
+ * Data transfer object for {@link org.apache.ignite.cache.QueryEntity}.
*/
-public class VisorQueryEntity extends VisorDataTransferObject {
+public class QueryEntity extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -65,19 +63,19 @@ public class VisorQueryEntity extends
VisorDataTransferObject {
private String valFieldName;
/** Fields to create group indexes for. */
- private List<VisorQueryIndex> grps;
+ private List<QueryIndex> grps;
/**
* @param qryEntities Collection of query entities.
* @return Data transfer object for query entities.
*/
- public static List<VisorQueryEntity> list(Collection<QueryEntity>
qryEntities) {
- List<VisorQueryEntity> entities = new ArrayList<>();
+ public static List<QueryEntity>
list(Collection<org.apache.ignite.cache.QueryEntity> qryEntities) {
+ List<QueryEntity> entities = new ArrayList<>();
// Add query entries.
if (!F.isEmpty(qryEntities))
- for (QueryEntity qryEntity : qryEntities)
- entities.add(new VisorQueryEntity(qryEntity));
+ for (org.apache.ignite.cache.QueryEntity qryEntity : qryEntities)
+ entities.add(new QueryEntity(qryEntity));
return entities;
}
@@ -85,7 +83,7 @@ public class VisorQueryEntity extends VisorDataTransferObject
{
/**
* Create data transfer object for given cache type metadata.
*/
- public VisorQueryEntity() {
+ public QueryEntity() {
// No-op.
}
@@ -94,7 +92,7 @@ public class VisorQueryEntity extends VisorDataTransferObject
{
*
* @param q Actual cache query entities.
*/
- private VisorQueryEntity(QueryEntity q) {
+ private QueryEntity(org.apache.ignite.cache.QueryEntity q) {
assert q != null;
keyType = q.getKeyType();
@@ -108,12 +106,12 @@ public class VisorQueryEntity extends
VisorDataTransferObject {
aliases = U.copyMap(q.getAliases());
- Collection<QueryIndex> qryIdxs = q.getIndexes();
+ Collection<org.apache.ignite.cache.QueryIndex> qryIdxs =
q.getIndexes();
grps = new ArrayList<>(qryIdxs.size());
- for (QueryIndex qryIdx : qryIdxs)
- grps.add(new VisorQueryIndex(qryIdx));
+ for (org.apache.ignite.cache.QueryIndex qryIdx : qryIdxs)
+ grps.add(new QueryIndex(qryIdx));
tblName = q.getTableName();
keyFieldName = q.getKeyFieldName();
@@ -179,7 +177,7 @@ public class VisorQueryEntity extends
VisorDataTransferObject {
/**
* @return Fields to create group indexes for.
*/
- public List<VisorQueryIndex> getGroups() {
+ public List<QueryIndex> getGroups() {
return grps;
}
@@ -211,6 +209,6 @@ public class VisorQueryEntity extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorQueryEntity.class, this);
+ return S.toString(QueryEntity.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryIndex.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryIndex.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java
index d9fa2a41f24..95c696c008b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryIndex.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java
@@ -15,22 +15,21 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.query;
+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.cache.QueryIndex;
import org.apache.ignite.cache.QueryIndexType;
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;
/**
- * Data transfer object for {@link QueryIndex}.
+ * Data transfer object for {@link org.apache.ignite.cache.QueryIndex}.
*/
-public class VisorQueryIndex extends VisorDataTransferObject {
+public class QueryIndex extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -41,12 +40,12 @@ public class VisorQueryIndex extends
VisorDataTransferObject {
private QueryIndexType type;
/** Fields to create group indexes for. */
- private List<VisorQueryIndexField> fields;
+ private List<QueryIndexField> fields;
/**
* Create data transfer object for given cache type metadata.
*/
- public VisorQueryIndex() {
+ public QueryIndex() {
// No-op.
}
@@ -55,12 +54,12 @@ public class VisorQueryIndex extends
VisorDataTransferObject {
*
* @param idx Actual cache query entity index.
*/
- public VisorQueryIndex(QueryIndex idx) {
+ public QueryIndex(org.apache.ignite.cache.QueryIndex idx) {
assert idx != null;
name = idx.getName();
type = idx.getIndexType();
- fields = VisorQueryIndexField.list(idx);
+ fields = QueryIndexField.list(idx);
}
/**
@@ -80,7 +79,7 @@ public class VisorQueryIndex extends VisorDataTransferObject {
/**
* @return Fields to create group indexes for.
*/
- public List<VisorQueryIndexField> getFields() {
+ public List<QueryIndexField> getFields() {
return fields;
}
@@ -100,6 +99,6 @@ public class VisorQueryIndex extends VisorDataTransferObject
{
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorQueryIndex.class, this);
+ return S.toString(QueryIndex.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryIndexField.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java
similarity index 84%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryIndexField.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java
index f1d120d9970..b5f182b8c9b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryIndexField.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.query;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
@@ -32,7 +32,7 @@ import
org.apache.ignite.internal.visor.VisorDataTransferObject;
/**
* Data transfer object for {@link QueryEntity}.
*/
-public class VisorQueryIndexField extends VisorDataTransferObject {
+public class QueryIndexField extends VisorDataTransferObject {
/** */
private static final long serialVersionUID = 0L;
@@ -45,7 +45,7 @@ public class VisorQueryIndexField extends
VisorDataTransferObject {
/**
* Create data transfer object for given cache type metadata.
*/
- public VisorQueryIndexField() {
+ public QueryIndexField() {
// No-op.
}
@@ -55,7 +55,7 @@ public class VisorQueryIndexField extends
VisorDataTransferObject {
* @param name Index field name.
* @param sort Index field sort order.
*/
- public VisorQueryIndexField(String name, boolean sort) {
+ public QueryIndexField(String name, boolean sort) {
this.name = name;
this.sort = sort;
}
@@ -64,11 +64,11 @@ public class VisorQueryIndexField extends
VisorDataTransferObject {
* @param idx Query entity index.
* @return Data transfer object for query entity index fields.
*/
- public static List<VisorQueryIndexField> list(QueryIndex idx) {
- List<VisorQueryIndexField> res = new ArrayList<>();
+ public static List<QueryIndexField> list(QueryIndex idx) {
+ List<QueryIndexField> res = new ArrayList<>();
for (Map.Entry<String, Boolean> field: idx.getFields().entrySet())
- res.add(new VisorQueryIndexField(field.getKey(),
!field.getValue()));
+ res.add(new QueryIndexField(field.getKey(), !field.getValue()));
return res;
}
@@ -101,6 +101,6 @@ public class VisorQueryIndexField extends
VisorDataTransferObject {
/** {@inheritDoc} */
@Override public String toString() {
- return S.toString(VisorQueryIndexField.class, this);
+ return S.toString(QueryIndexField.class, this);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildJobRes.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildJobRes.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java
index eb799c8491c..24eb97e96dc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildJobRes.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+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/cache/index/ScheduleIndexRebuildTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java
similarity index 98%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java
index 07c1611edbc..7db4707246c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+package org.apache.ignite.internal.management.cache;
import java.util.Arrays;
import java.util.Collections;
@@ -31,7 +31,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.compute.ComputeJobResult;
import org.apache.ignite.internal.cache.query.index.Index;
-import
org.apache.ignite.internal.management.cache.CacheScheduleIndexesRebuildCommandArg;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTaskRes.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java
similarity index 97%
rename from
modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTaskRes.java
rename to
modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java
index fb6100d3f2f..02fcb146292 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTaskRes.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.visor.cache.index;
+package org.apache.ignite.internal.management.cache;
import java.io.IOException;
import java.io.ObjectInput;
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties
b/modules/core/src/main/resources/META-INF/classnames.properties
index 42103ad2254..773d860a23b 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -2136,46 +2136,46 @@
org.apache.ignite.internal.management.baseline.BaselineTask$VisorBaselineJob
org.apache.ignite.internal.management.baseline.BaselineTaskResult
org.apache.ignite.internal.visor.baseline.VisorBaselineViewTask
org.apache.ignite.internal.visor.baseline.VisorBaselineViewTask$VisorBaselineViewJob
-org.apache.ignite.internal.visor.cache.VisorCacheAffinityConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorJob
-org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTask
-org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTaskArg
-org.apache.ignite.internal.visor.cache.VisorCacheCreateTask
-org.apache.ignite.internal.visor.cache.VisorCacheCreateTask$VisorCacheCreateJob
-org.apache.ignite.internal.visor.cache.VisorCacheEvictionConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheJdbcType
-org.apache.ignite.internal.visor.cache.VisorCacheJdbcTypeField
-org.apache.ignite.internal.visor.cache.VisorCacheNearConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheRebalanceConfiguration
-org.apache.ignite.internal.visor.cache.VisorCacheScanTask
-org.apache.ignite.internal.visor.cache.VisorCacheScanTask$VisorCacheScanJob
-org.apache.ignite.internal.visor.cache.VisorCacheScanTaskResult
-org.apache.ignite.internal.visor.cache.VisorCacheStopTask
-org.apache.ignite.internal.visor.cache.VisorCacheStopTask$VisorCacheStopJob
-org.apache.ignite.internal.visor.cache.VisorCacheStoreConfiguration
-org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceClosure
-org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceJobResult
-org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTask
-org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTask$FindAndDeleteGarbageInPersistenceJob
-org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTaskResult
-org.apache.ignite.internal.visor.cache.index.IndexForceRebuildTask
-org.apache.ignite.internal.visor.cache.index.IndexForceRebuildTask$IndexForceRebuildJob
-org.apache.ignite.internal.visor.cache.index.IndexForceRebuildTaskRes
-org.apache.ignite.internal.visor.cache.index.IndexListInfoContainer
-org.apache.ignite.internal.visor.cache.index.IndexListTask
-org.apache.ignite.internal.visor.cache.index.IndexListTask$IndexListJob
-org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusInfoContainer
-org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusTask
-org.apache.ignite.internal.visor.cache.index.IndexRebuildStatusTask$IndexRebuildStatusJob
-org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildJobRes
-org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTask
-org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTask$ScheduleIndexRebuildJob
-org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTaskRes
-org.apache.ignite.internal.visor.cache.metrics.CacheMetricsOperation
-org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTask
-org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTask$VisorCacheMetricsJob
-org.apache.ignite.internal.visor.cache.metrics.VisorCacheMetricsTaskResult
+org.apache.ignite.internal.management.cache.CacheAffinityConfiguration
+org.apache.ignite.internal.management.cache.CacheConfiguration
+org.apache.ignite.internal.management.cache.CacheConfigurationCollectorJob
+org.apache.ignite.internal.management.cache.CacheConfigurationCollectorTask
+org.apache.ignite.internal.management.cache.CacheConfigurationCollectorTaskArg
+org.apache.ignite.internal.management.cache.CacheCreateTask
+org.apache.ignite.internal.management.cache.CacheCreateTask$CacheCreateJob
+org.apache.ignite.internal.management.cache.CacheEvictionConfiguration
+org.apache.ignite.internal.management.cache.CacheJdbcType
+org.apache.ignite.internal.management.cache.CacheJdbcTypeField
+org.apache.ignite.internal.management.cache.CacheNearConfiguration
+org.apache.ignite.internal.management.cache.CacheRebalanceConfiguration
+org.apache.ignite.internal.management.cache.CacheScanTask
+org.apache.ignite.internal.management.cache.CacheScanTask$CacheScanJob
+org.apache.ignite.internal.management.cache.CacheScanTaskResult
+org.apache.ignite.internal.management.cache.CacheStopTask
+org.apache.ignite.internal.management.cache.CacheStopTask$CacheStopJob
+org.apache.ignite.internal.management.cache.CacheStoreConfiguration
+org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceClosure
+org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceJobResult
+org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTask
+org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTask$FindAndDeleteGarbageInPersistenceJob
+org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTaskResult
+org.apache.ignite.internal.management.cache.IndexForceRebuildTask
+org.apache.ignite.internal.management.cache.IndexForceRebuildTask$IndexForceRebuildJob
+org.apache.ignite.internal.management.cache.IndexForceRebuildTaskRes
+org.apache.ignite.internal.management.cache.IndexListInfoContainer
+org.apache.ignite.internal.management.cache.IndexListTask
+org.apache.ignite.internal.management.cache.IndexListTask$IndexListJob
+org.apache.ignite.internal.management.cache.IndexRebuildStatusInfoContainer
+org.apache.ignite.internal.management.cache.IndexRebuildStatusTask
+org.apache.ignite.internal.management.cache.IndexRebuildStatusTask$IndexRebuildStatusJob
+org.apache.ignite.internal.management.cache.ScheduleIndexRebuildJobRes
+org.apache.ignite.internal.management.cache.ScheduleIndexRebuildTask
+org.apache.ignite.internal.management.cache.ScheduleIndexRebuildTask$ScheduleIndexRebuildJob
+org.apache.ignite.internal.management.cache.ScheduleIndexRebuildTaskRes
+org.apache.ignite.internal.management.cache.CacheMetricsOperation
+org.apache.ignite.internal.management.cache.CacheMetricsTask
+org.apache.ignite.internal.management.cache.CacheMetricsTask$CacheMetricsJob
+org.apache.ignite.internal.management.cache.CacheMetricsTaskResult
org.apache.ignite.internal.management.cdc.CdcCacheDataResendTask
org.apache.ignite.internal.management.cdc.CdcCacheDataResendTask$VisorCdcCacheDataResendJob
org.apache.ignite.internal.management.cdc.CdcDeleteLostSegmentsTask
@@ -2255,10 +2255,10 @@
org.apache.ignite.internal.management.kill.ContinuousQueryCancelTask
org.apache.ignite.internal.management.kill.ContinuousQueryCancelTask$ContinuousQueryCancelJob
org.apache.ignite.internal.management.kill.QueryCancelOnInitiatorTask
org.apache.ignite.internal.management.kill.QueryCancelOnInitiatorTask$CancelQueryOnInitiatorJob
-org.apache.ignite.internal.visor.query.VisorQueryConfiguration
-org.apache.ignite.internal.visor.query.VisorQueryEntity
-org.apache.ignite.internal.visor.query.VisorQueryIndex
-org.apache.ignite.internal.visor.query.VisorQueryIndexField
+org.apache.ignite.internal.management.cache.QueryConfiguration
+org.apache.ignite.internal.management.cache.QueryEntity
+org.apache.ignite.internal.management.cache.QueryIndex
+org.apache.ignite.internal.management.cache.QueryIndexField
org.apache.ignite.internal.management.kill.ScanQueryCancelTask
org.apache.ignite.internal.management.kill.ScanQueryCancelTask$ScanQueryCancelJob
org.apache.ignite.internal.management.kill.CancelServiceTask
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteCacheGroupsWithRestartsTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteCacheGroupsWithRestartsTest.java
index d0ae43b3793..f6715709927 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteCacheGroupsWithRestartsTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgniteCacheGroupsWithRestartsTest.java
@@ -45,19 +45,20 @@ 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.CacheFindGarbageCommandArg;
+import
org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceJobResult;
+import
org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTask;
+import
org.apache.ignite.internal.management.cache.FindAndDeleteGarbageInPersistenceTaskResult;
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.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.VisorTaskArgument;
-import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceJobResult;
-import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTask;
-import
org.apache.ignite.internal.visor.cache.VisorFindAndDeleteGarbageInPersistenceTaskResult;
import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
+
import static org.apache.ignite.cluster.ClusterState.ACTIVE;
import static
org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager.IGNITE_PDS_SKIP_CHECKPOINT_ON_NODE_STOP;
import static
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
@@ -296,7 +297,7 @@ public class IgniteCacheGroupsWithRestartsTest extends
GridCommonAbstractTest {
* @param doFindAndRemove Do find and remove.
*/
public void testFindAndDeleteGarbage(
- BiFunction<IgniteEx, Boolean,
VisorFindAndDeleteGarbageInPersistenceTaskResult> doFindAndRemove
+ BiFunction<IgniteEx, Boolean,
FindAndDeleteGarbageInPersistenceTaskResult> doFindAndRemove
) throws Exception {
IgniteEx ignite = startGrids(3);
@@ -318,9 +319,9 @@ public class IgniteCacheGroupsWithRestartsTest extends
GridCommonAbstractTest {
awaitPartitionMapExchange();
- VisorFindAndDeleteGarbageInPersistenceTaskResult taskResult =
doFindAndRemove.apply(ex1, false);
+ FindAndDeleteGarbageInPersistenceTaskResult taskResult =
doFindAndRemove.apply(ex1, false);
- VisorFindAndDeleteGarbageInPersistenceJobResult result =
taskResult.result().get(ex1.localNode().id());
+ FindAndDeleteGarbageInPersistenceJobResult result =
taskResult.result().get(ex1.localNode().id());
Assert.assertTrue(result.hasGarbage());
@@ -343,7 +344,7 @@ public class IgniteCacheGroupsWithRestartsTest extends
GridCommonAbstractTest {
* @param deleteFoundGarbage If clearing mode should be used.
* @return Result of task run.
*/
- private VisorFindAndDeleteGarbageInPersistenceTaskResult executeTask(
+ private FindAndDeleteGarbageInPersistenceTaskResult executeTask(
IgniteEx ignite,
boolean deleteFoundGarbage
) {
@@ -356,8 +357,8 @@ public class IgniteCacheGroupsWithRestartsTest extends
GridCommonAbstractTest {
VisorTaskArgument arg = new VisorTaskArgument(id, arg0, true);
- VisorFindAndDeleteGarbageInPersistenceTaskResult result =
-
ignite.compute().execute(VisorFindAndDeleteGarbageInPersistenceTask.class, arg);
+ FindAndDeleteGarbageInPersistenceTaskResult result =
+
ignite.compute().execute(FindAndDeleteGarbageInPersistenceTask.class, arg);
return result;
}
