This is an automated email from the ASF dual-hosted git repository. akuznetsov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push: new fecfa26 IGNITE-11638 Web console: Fixed 'Explain query' logic. fecfa26 is described below commit fecfa265183729a9dcb816d3aeb1c754442d3b52 Author: Andrey Novikov <anovi...@apache.org> AuthorDate: Wed Mar 27 21:31:04 2019 +0700 IGNITE-11638 Web console: Fixed 'Explain query' logic. --- .../components/queries-notebook/controller.ts | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts index ba31155..372513a 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts @@ -1753,26 +1753,21 @@ export class NotebookCtrl { from(_chooseNode(paragraph.cacheName, false)).pipe( switchMap((nid) => { - const args = paragraph.queryArgs = { + const qryArg = paragraph.queryArgs = { + nid, cacheName: $scope.cacheNameForSql(paragraph), query: 'EXPLAIN ' + (paragraph.partialQuery || paragraph.query), - pageSize: paragraph.pageSize - }; - - ActivitiesData.post({ group: 'sql', action: '/queries/explain' }); - - const qryArg = { - nid, - cacheName: args.cacheName, - query: args.query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly: false, local: false, - pageSize: args.pageSize, - lazy: false, collocated + pageSize: paragraph.pageSize, + lazy: false, + collocated }; + ActivitiesData.post({ group: 'sql', action: '/queries/explain' }); + return _executeQuery( paragraph, qryArg,