ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-5314 VisorRunningQuery should use schema name instead of cache name.
Date Tue, 06 Jun 2017 15:11:21 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5314 [created] 9cd711fca


IGNITE-5314 VisorRunningQuery should use schema name instead of cache name.

ignite-5075 Fixed compilation after ignite-5075 merged into apache master. Pds is not supposed
to work.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9cd711fc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9cd711fc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9cd711fc

Branch: refs/heads/ignite-5314
Commit: 9cd711fca2a09d036417a05d6d89804a1d2c3a57
Parents: ec5c3a2
Author: Alexey Kuznetsov <akuznetsov@gridgain.com>
Authored: Tue Jun 6 21:51:06 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@gridgain.com>
Committed: Tue Jun 6 22:11:01 2017 +0700

----------------------------------------------------------------------
 .../internal/visor/query/VisorRunningQuery.java   | 18 +++++++++---------
 .../app/modules/agent/AgentManager.service.js     |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9cd711fc/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..ff71b47 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 for query. */
+    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 Cache where query was executed.
      * @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;
@@ -112,8 +112,8 @@ public class VisorRunningQuery extends VisorDataTransferObject {
     /**
      * @return Cache 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/9cd711fc/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);
         }
 


Mime
View raw message