You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/18 09:00:48 UTC
[36/50] [abbrv] ignite git commit: IGNITE-4988 Fixed tests and tasks
arguments.
IGNITE-4988 Fixed tests and tasks arguments.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cee74473
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cee74473
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cee74473
Branch: refs/heads/ignite-4985
Commit: cee744737390066266b92cb817469d42e8207351
Parents: 90bd8b5
Author: Alexey Kuznetsov <ak...@gridgain.com>
Authored: Tue Apr 18 07:21:34 2017 +0700
Committer: Alexey Kuznetsov <ak...@gridgain.com>
Committed: Tue Apr 18 07:21:34 2017 +0700
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 72 ++++----------------
.../visor/compute/VisorGatewayTask.java | 2 +-
.../commands/cache/VisorCacheScanCommand.scala | 3 +-
.../commands/cache/VisorCacheCommandSpec.scala | 4 ++
4 files changed, 21 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cee74473/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index e2dddd1..cd3011c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -39,23 +39,19 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper;
import org.apache.ignite.igfs.IgfsIpcEndpointConfiguration;
import org.apache.ignite.internal.processors.cache.IgniteCacheProxy;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlIndexMetadata;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlMetadata;
import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
import org.apache.ignite.internal.processors.rest.protocols.http.jetty.GridJettyObjectMapper;
-import org.apache.ignite.internal.util.lang.GridTuple3;
import org.apache.ignite.internal.util.typedef.C1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.P1;
@@ -65,8 +61,10 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.internal.visor.cache.VisorCacheClearTask;
import org.apache.ignite.internal.visor.cache.VisorCacheConfigurationCollectorTask;
import org.apache.ignite.internal.visor.cache.VisorCacheLoadTask;
+import org.apache.ignite.internal.visor.cache.VisorCacheLoadTaskArg;
import org.apache.ignite.internal.visor.cache.VisorCacheMetadataTask;
import org.apache.ignite.internal.visor.cache.VisorCacheMetricsCollectorTask;
+import org.apache.ignite.internal.visor.cache.VisorCacheMetricsCollectorTaskArg;
import org.apache.ignite.internal.visor.cache.VisorCacheNodesTask;
import org.apache.ignite.internal.visor.cache.VisorCacheRebalanceTask;
import org.apache.ignite.internal.visor.cache.VisorCacheResetMetricsTask;
@@ -76,16 +74,19 @@ import org.apache.ignite.internal.visor.cache.VisorCacheStopTask;
import org.apache.ignite.internal.visor.compute.VisorComputeCancelSessionsTask;
import org.apache.ignite.internal.visor.compute.VisorComputeResetMetricsTask;
import org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTask;
+import org.apache.ignite.internal.visor.compute.VisorComputeToggleMonitoringTaskArg;
import org.apache.ignite.internal.visor.compute.VisorGatewayTask;
import org.apache.ignite.internal.visor.debug.VisorThreadDumpTask;
import org.apache.ignite.internal.visor.file.VisorFileBlockArg;
import org.apache.ignite.internal.visor.file.VisorFileBlockTask;
import org.apache.ignite.internal.visor.file.VisorLatestTextFilesTask;
+import org.apache.ignite.internal.visor.file.VisorLatestTextFilesTaskArg;
import org.apache.ignite.internal.visor.igfs.VisorIgfsFormatTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsProfilerClearTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsProfilerTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsResetMetricsTask;
import org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTask;
+import org.apache.ignite.internal.visor.igfs.VisorIgfsSamplingStateTaskArg;
import org.apache.ignite.internal.visor.log.VisorLogSearchArg;
import org.apache.ignite.internal.visor.log.VisorLogSearchTask;
import org.apache.ignite.internal.visor.misc.VisorAckTask;
@@ -102,9 +103,9 @@ import org.apache.ignite.internal.visor.node.VisorNodeSuppressedErrorsTask;
import org.apache.ignite.internal.visor.query.VisorQueryArg;
import org.apache.ignite.internal.visor.query.VisorQueryCleanupTask;
import org.apache.ignite.internal.visor.query.VisorQueryNextPageTask;
+import org.apache.ignite.internal.visor.query.VisorQueryNextPageTaskArg;
import org.apache.ignite.internal.visor.query.VisorQueryTask;
import org.apache.ignite.lang.IgniteBiPredicate;
-import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.testframework.GridTestUtils;
@@ -1013,7 +1014,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
for (JsonNode item : arr) {
JsonNode cacheNameNode = item.get("cacheName");
- final String cacheName = cacheNameNode != null ? cacheNameNode.asText() : null;
+ final String cacheName = (cacheNameNode == null || "null".equals(cacheNameNode.asText())) ? null : cacheNameNode.asText();
GridCacheSqlMetadata meta = F.find(metas, null, new P1<GridCacheSqlMetadata>() {
@Override public boolean apply(GridCacheSqlMetadata meta) {
@@ -1283,7 +1284,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
ret = content(new VisorGatewayArgument(VisorCacheLoadTask.class)
.forNode(locNode)
- .tuple3(Set.class, Long.class, Object[].class, "person", 0, "null"));
+ .argument(VisorCacheLoadTaskArg.class, "person", 0, "null"));
info("VisorCacheLoadTask result: " + ret);
@@ -1315,7 +1316,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
ret = content(new VisorGatewayArgument(VisorIgfsSamplingStateTask.class)
.forNode(locNode)
- .pair(String.class, Boolean.class, "igfs", false));
+ .argument(VisorIgfsSamplingStateTaskArg.class, "igfs", false));
info("VisorIgfsSamplingStateTask result: " + ret);
@@ -1362,7 +1363,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
ret = content(new VisorGatewayArgument(VisorLatestTextFilesTask.class)
.forNode(locNode)
- .pair(String.class, String.class, "", ""));
+ .argument(VisorLatestTextFilesTaskArg.class, "", ""));
info("VisorLatestTextFilesTask result: " + ret);
@@ -1413,11 +1414,11 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
JsonNode res = jsonTaskResult(ret);
- final String qryId = res.get("value").get("queryId").asText();
+ final String qryId = res.get("result").get("queryId").asText();
ret = content(new VisorGatewayArgument(VisorQueryNextPageTask.class)
.forNode(locNode)
- .pair(String.class, Integer.class, qryId, 1));
+ .argument(VisorQueryNextPageTaskArg.class, qryId, 1));
info("VisorQueryNextPageTask result: " + ret);
@@ -1447,13 +1448,13 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonTaskResult(ret);
ret = content(new VisorGatewayArgument(VisorCacheMetricsCollectorTask.class)
- .pair(Boolean.class, Set.class, false, "person"));
+ .argument(VisorCacheMetricsCollectorTaskArg.class, false, "person"));
info("VisorCacheMetricsCollectorTask result: " + ret);
ret = content(new VisorGatewayArgument(VisorCacheMetricsCollectorTask.class)
.forNodes(grid(1).cluster().nodes())
- .pair(Boolean.class, Set.class, false, "person"));
+ .argument(VisorCacheMetricsCollectorTaskArg.class, false, "person"));
info("VisorCacheMetricsCollectorTask (with nodes) result: " + ret);
@@ -1496,7 +1497,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonTaskResult(ret);
ret = content(new VisorGatewayArgument(VisorComputeToggleMonitoringTask.class)
- .pair(String.class, Boolean.class, UUID.randomUUID(), false));
+ .argument(VisorComputeToggleMonitoringTaskArg.class, UUID.randomUUID(), false));
info("VisorComputeToggleMonitoringTask result: " + ret);
@@ -2150,49 +2151,6 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
}
/**
- * Add tuple argument.
- *
- * @param keyCls Key class.
- * @param valCls Values class.
- * @param key Key.
- * @param val Value.
- * @return This helper for chaining method calls.
- */
- public VisorGatewayArgument pair(Class keyCls, Class valCls, Object key, Object val) {
- put("p" + idx++, IgniteBiTuple.class.getName());
- put("p" + idx++, keyCls.getName());
- put("p" + idx++, valCls.getName());
- put("p" + idx++, key != null ? key.toString() : "null");
- put("p" + idx++, val != null ? val.toString() : "null");
-
- return this;
- }
-
- /**
- * Add tuple argument.
- *
- * @param firstCls Class of first argument.
- * @param secondCls Class of second argument.
- * @param thirdCls Class of third argument.
- * @param first First argument.
- * @param second Second argument.
- * @param third Third argument.
- * @return This helper for chaining method calls.
- */
- public VisorGatewayArgument tuple3(Class firstCls, Class secondCls, Class thirdCls,
- Object first, Object second, Object third) {
- put("p" + idx++, GridTuple3.class.getName());
- put("p" + idx++, firstCls.getName());
- put("p" + idx++, secondCls.getName());
- put("p" + idx++, thirdCls.getName());
- put("p" + idx++, first != null ? first.toString() : "null");
- put("p" + idx++, second != null ? second.toString() : "null");
- put("p" + idx++, third != null ? third.toString() : "null");
-
- return this;
- }
-
- /**
* Add set argument.
*
* @param cls Class.
http://git-wip-us.apache.org/repos/asf/ignite/blob/cee74473/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
index 22cd460..05112ed 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorGatewayTask.java
@@ -259,7 +259,7 @@ public class VisorGatewayTask implements ComputeTask<Object[], Object> {
if (BigDecimal.class == cls)
return new BigDecimal(val);
- if (Collection.class == cls)
+ if (Collection.class == cls || List.class == cls)
return Arrays.asList(val.split(";"));
if (Set.class == cls)
http://git-wip-us.apache.org/repos/asf/ignite/blob/cee74473/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index a6bec15..f35ed52 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -18,7 +18,6 @@
package org.apache.ignite.visor.commands.cache
import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterNode}
-import org.apache.ignite.lang.IgniteBiTuple
import org.apache.ignite.visor.commands.common.VisorTextTable
import org.apache.ignite.visor.visor._
@@ -139,7 +138,7 @@ class VisorCacheScanCommand {
val firstPage =
try
executeRandom(groupForDataNode(node, cacheName),
- classOf[VisorQueryTask], new VisorQueryArg(cacheName, null, false, false, false, pageSize)) match {
+ classOf[VisorScanQueryTask], new VisorScanQueryArg(cacheName, null, false, false, false, false, pageSize)) match {
case x if x.getError != null =>
error(x.getError)
http://git-wip-us.apache.org/repos/asf/ignite/blob/cee74473/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
index 788cb7c..5aff431 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommandSpec.scala
@@ -126,6 +126,10 @@ class VisorCacheCommandSpec extends VisorRuntimeBaseSpec(1) {
it("should display correct information for all caches") {
visor cache "-a"
}
+
+ it("should scan cache") {
+ visor cache "-c=replicated -scan"
+ }
}
}