# IGNITE-988. Reworked scan command.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46eab5b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46eab5b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46eab5b6 Branch: refs/heads/ignite-389 Commit: 46eab5b67f1f10260b27a1eb0474904982aa3725 Parents: bd3abbc Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jun 4 10:02:02 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jun 4 10:02:02 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/visor/query/VisorQueryJob.java | 2 +- .../apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eab5b6/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java index 4a9daad..8915240 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryJob.java @@ -65,7 +65,7 @@ public class VisorQueryJob extends VisorJob<VisorQueryArg, IgniteBiTuple<? exten try { UUID nid = ignite.localNode().id(); - boolean scan = arg.queryTxt().toUpperCase().startsWith("SCAN"); + boolean scan = arg.queryTxt() == null; String qryId = (scan ? SCAN_QRY_NAME : SQL_QRY_NAME) + "-" + UUID.randomUUID(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46eab5b6/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 4b66720..3aa2a19 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 @@ -139,7 +139,7 @@ class VisorCacheScanCommand { val firstPage = try executeRandom(groupForDataNode(node, cacheName), - classOf[VisorQueryTask], new VisorQueryArg(cacheName, "SCAN", false, pageSize)) match { + classOf[VisorQueryTask], new VisorQueryArg(cacheName, null, false, pageSize)) match { case x if x.get1() != null => error(x.get1())
