IGNITE-8568 Web Console: Fixed version ranges check 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/33b264d2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33b264d2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33b264d2 Branch: refs/heads/ignite-7251 Commit: 33b264d221b52100a60155e99bc1d61f152d59dd Parents: 7242e58 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Sun Sep 16 13:32:10 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Sun Sep 16 13:32:10 2018 +0700 ---------------------------------------------------------------------- .../page-queries/components/queries-notebook/controller.js | 2 +- .../web-console/frontend/app/modules/agent/AgentManager.service.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/33b264d2/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js index 6d37da9..4184e9f 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js @@ -41,7 +41,7 @@ const ROW_IDX = {value: -2, type: 'java.lang.Integer', label: 'ROW_IDX'}; const NON_COLLOCATED_JOINS_SINCE = '1.7.0'; -const COLLOCATED_QUERY_SINCE = [['2.3.5', '2.4.0'], ['2.4.6', '2.5.0'], '2.5.1-p13']; +const COLLOCATED_QUERY_SINCE = [['2.3.5', '2.4.0'], ['2.4.6', '2.5.0'], ['2.5.1-p13', '2.6.0'], '2.7.0']; const ENFORCE_JOIN_SINCE = [['1.7.9', '1.8.0'], ['1.8.4', '1.9.0'], '1.9.1']; http://git-wip-us.apache.org/repos/asf/ignite/blob/33b264d2/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 85f94de..a8a5d23 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -42,7 +42,7 @@ const State = { 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']; +const COLLOCATED_QUERY_SINCE = [['2.3.5', '2.4.0'], ['2.4.6', '2.5.0'], ['2.5.2', '2.6.0'], '2.7.0']; // Error codes from o.a.i.internal.processors.restGridRestResponse.java
