IGNITE-5314 VisorRunningQuery should use schema name instead of cache name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/183aa80a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/183aa80a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/183aa80a Branch: refs/heads/ignite-5414 Commit: 183aa80a58e37f312e4d7d85bf52a103730ad049 Parents: c3b8998 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Jun 7 09:48:37 2017 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Jun 7 09:48:37 2017 +0700 ---------------------------------------------------------------------- .../internal/visor/query/VisorRunningQuery.java | 20 ++++++++++---------- .../app/modules/agent/AgentManager.service.js | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/183aa80a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java index 1864718..47f4436 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorRunningQuery.java @@ -41,8 +41,8 @@ public class VisorRunningQuery extends VisorDataTransferObject { /** Query type. */ private GridCacheQueryType qryType; - /** Cache name for query. */ - private String cache; + /** Schema name. */ + private String schemaName; /** */ private long startTime; @@ -69,19 +69,19 @@ public class VisorRunningQuery extends VisorDataTransferObject { * @param id Query ID. * @param qry Query text. * @param qryType Query type. - * @param cache Cache where query was executed. + * @param schemaName Query schema name. * @param startTime Query start time. * @param duration Query current duration. * @param cancellable {@code true} if query can be canceled. * @param loc {@code true} if query is local. */ - public VisorRunningQuery(long id, String qry, GridCacheQueryType qryType, String cache, + public VisorRunningQuery(long id, String qry, GridCacheQueryType qryType, String schemaName, long startTime, long duration, boolean cancellable, boolean loc) { this.id = id; this.qry = qry; this.qryType = qryType; - this.cache = cache; + this.schemaName = schemaName; this.startTime = startTime; this.duration = duration; this.cancellable = cancellable; @@ -110,10 +110,10 @@ public class VisorRunningQuery extends VisorDataTransferObject { } /** - * @return Cache name. + * @return Schema name. */ - public String getCache() { - return cache; + public String getSchemaName() { + return schemaName; } /** @@ -149,7 +149,7 @@ public class VisorRunningQuery extends VisorDataTransferObject { out.writeLong(id); U.writeString(out, qry); U.writeEnum(out, qryType); - U.writeString(out, cache); + U.writeString(out, schemaName); out.writeLong(startTime); out.writeLong(duration); out.writeBoolean(cancellable); @@ -161,7 +161,7 @@ public class VisorRunningQuery extends VisorDataTransferObject { id = in.readLong(); qry = U.readString(in); qryType = GridCacheQueryType.fromOrdinal(in.readByte()); - cache = U.readString(in); + schemaName = U.readString(in); startTime = in.readLong(); duration = in.readLong(); cancellable = in.readBoolean(); http://git-wip-us.apache.org/repos/asf/ignite/blob/183aa80a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js index 58e071b..ee59d91 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -44,6 +44,7 @@ export default class IgniteAgentManager { $root.$on('$stateChangeSuccess', () => this.stopWatch()); this.ignite2x = false; + this.ignite2_1 = false; if (!$root.IgniteDemoMode) { $root.$watch(() => _.get(this, 'cluster.clusterVersion'), (ver) => { @@ -51,6 +52,7 @@ export default class IgniteAgentManager { return; this.ignite2x = ver.startsWith('2.'); + this.ignite2_1 = ver.startsWith('2.1'); }, true); }
