IGNITE-6120 Fixed version check for ignite-2.2.0. (cherry picked from commit f4ead8b)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ccc8c9b4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ccc8c9b4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ccc8c9b4 Branch: refs/heads/ignite-2.1.5-p1 Commit: ccc8c9b40d09e1d3314a519f1e9417e79c150d9d Parents: fc34091 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Fri Sep 15 23:19:16 2017 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Fri Sep 22 09:58:11 2017 +0700 ---------------------------------------------------------------------- .../frontend/app/modules/agent/AgentManager.service.js | 4 +++- .../web-console/frontend/app/modules/sql/sql.controller.js | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ccc8c9b4/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 9a736b6..c24a92f 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -26,6 +26,8 @@ const State = { CONNECTED: 'CONNECTED' }; +const LAZY_QUERY_SINCE = [['2.1.4-p1', '2.2.0'], '2.2.1']; + class ConnectionState { constructor(cluster) { this.agents = []; @@ -499,7 +501,7 @@ export default class IgniteAgentManager { */ querySql(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz, lazy) { if (this.available('2.0.0')) { - const task = this.available('2.1.4-p1') ? + const task = this.available(...LAZY_QUERY_SINCE) ? this.visorTask('querySqlX2', nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz, lazy) : this.visorTask('querySqlX2', nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz); http://git-wip-us.apache.org/repos/asf/ignite/blob/ccc8c9b4/modules/web-console/frontend/app/modules/sql/sql.controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/sql/sql.controller.js b/modules/web-console/frontend/app/modules/sql/sql.controller.js index c43dc5c..7d8df7a 100644 --- a/modules/web-console/frontend/app/modules/sql/sql.controller.js +++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js @@ -28,9 +28,9 @@ const ROW_IDX = {value: -2, type: 'java.lang.Integer', label: 'ROW_IDX'}; const NON_COLLOCATED_JOINS_SINCE = '1.7.0'; -const ENFORCE_JOIN_VERS = [['1.7.9', '1.8.0'], ['1.8.4', '1.9.0'], ['1.9.1']]; +const ENFORCE_JOIN_SINCE = [['1.7.9', '1.8.0'], ['1.8.4', '1.9.0'], '1.9.1']; -const LAZY_QUERY_VERS = ['2.1.4-p1']; +const LAZY_QUERY_SINCE = [['2.1.4-p1', '2.2.0'], '2.2.1']; const _fullColName = (col) => { const res = []; @@ -1367,7 +1367,7 @@ export default ['$rootScope', '$scope', '$http', '$q', '$timeout', '$interval', const cache = _.find($scope.caches, {name: paragraph.cacheName}); if (cache) - return !!_.find(cache.nodes, (node) => Version.since(node.version, ...ENFORCE_JOIN_VERS)); + return !!_.find(cache.nodes, (node) => Version.since(node.version, ...ENFORCE_JOIN_SINCE)); return false; }; @@ -1376,7 +1376,7 @@ export default ['$rootScope', '$scope', '$http', '$q', '$timeout', '$interval', const cache = _.find($scope.caches, {name: paragraph.cacheName}); if (cache) - return !!_.find(cache.nodes, (node) => Version.since(node.version, ...LAZY_QUERY_VERS)); + return !!_.find(cache.nodes, (node) => Version.since(node.version, ...LAZY_QUERY_SINCE)); return false; };