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-8568 Web Console: Added support for "Collocated" query mode on "Queries" screen.
Date Fri, 01 Jun 2018 13:01:16 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 9815647e1 -> b7fcbb05e


IGNITE-8568 Web Console: Added support for "Collocated" query mode on "Queries" screen.


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

Branch: refs/heads/master
Commit: b7fcbb05e537cb08a59e6f821d5eab3587c97fe2
Parents: 9815647
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Jun 1 19:45:03 2018 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Jun 1 19:45:03 2018 +0700

----------------------------------------------------------------------
 .../app/modules/agent/AgentManager.service.js        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b7fcbb05/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 fd44f9e..b872998 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -31,6 +31,7 @@ const State = {
     CONNECTED: 'CONNECTED'
 };
 
+const IGNITE_2_0 = '2.0.0';
 const LAZY_QUERY_SINCE = [['2.1.4-p1', '2.2.0'], '2.2.1'];
 const COLLOCATED_QUERY_SINCE = [['2.3.5', '2.4.0'], ['2.4.6', '2.5.0'], '2.5.2'];
 
@@ -145,8 +146,8 @@ export default class IgniteAgentManager {
         return this.$root.IgniteDemoMode;
     }
 
-    available(sinceVersion) {
-        return this.Version.since(this.clusterVersion, sinceVersion);
+    available(...sinceVersion) {
+        return this.Version.since(this.clusterVersion, ...sinceVersion);
     }
 
     connect() {
@@ -562,10 +563,10 @@ export default class IgniteAgentManager {
      * @returns {Promise}
      */
     querySql(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly,
local, pageSz, lazy, collocated) {
-        if (this.available('2.0.0')) {
+        if (this.available(IGNITE_2_0)) {
             let args = [cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly,
local, pageSz];
 
-            if (this.available(COLLOCATED_QUERY_SINCE))
+            if (this.available(...COLLOCATED_QUERY_SINCE))
                 args = [...args, lazy, collocated];
             else if (this.available(...LAZY_QUERY_SINCE))
                 args = [...args, lazy];
@@ -605,7 +606,7 @@ export default class IgniteAgentManager {
      * @returns {Promise}
      */
     queryNextPage(nid, queryId, pageSize) {
-        if (this.available('2.0.0'))
+        if (this.available(IGNITE_2_0))
             return this.visorTask('queryFetchX2', nid, queryId, pageSize);
 
         return this.visorTask('queryFetch', nid, queryId, pageSize);
@@ -651,7 +652,7 @@ export default class IgniteAgentManager {
      * @returns {Promise}
      */
     queryClose(nid, queryId) {
-        if (this.available('2.0.0')) {
+        if (this.available(IGNITE_2_0)) {
             return this.visorTask('queryCloseX2', nid, 'java.util.Map', 'java.util.UUID',
'java.util.Collection',
                 nid + '=' + queryId);
         }
@@ -671,7 +672,7 @@ export default class IgniteAgentManager {
      * @returns {Promise}
      */
     queryScan(nid, cacheName, filter, regEx, caseSensitive, near, local, pageSize) {
-        if (this.available('2.0.0')) {
+        if (this.available(IGNITE_2_0)) {
             return this.visorTask('queryScanX2', nid, cacheName, filter, regEx, caseSensitive,
near, local, pageSize)
                 .then(({error, result}) => {
                     if (_.isEmpty(error))


Mime
View raw message