IGNITE-6120 Fixed missing "lazy query" flag.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55886b14 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55886b14 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55886b14 Branch: refs/heads/ignite-3478 Commit: 55886b14cc6e7171acf05991f7f265dbadcb8db2 Parents: 2c39351 Author: vsisko <[email protected]> Authored: Sun Oct 1 19:00:22 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Oct 2 13:56:51 2017 +0700 ---------------------------------------------------------------------- modules/web-console/frontend/app/filters/duration.filter.js | 2 +- .../frontend/app/modules/agent/AgentManager.service.js | 7 ++++--- .../web-console/frontend/app/modules/sql/sql.controller.js | 2 +- modules/web-console/frontend/package.json | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/55886b14/modules/web-console/frontend/app/filters/duration.filter.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/filters/duration.filter.js b/modules/web-console/frontend/app/filters/duration.filter.js index 46d50d8..703b6a4 100644 --- a/modules/web-console/frontend/app/filters/duration.filter.js +++ b/modules/web-console/frontend/app/filters/duration.filter.js @@ -36,6 +36,6 @@ export default [() => { const s = Math.floor((t - d * cd - h * ch - m * cm) / cs); const ms = Math.round(t % 1000); - return a(d, 'd') + a(h, 'h') + a(m, 'm') + a(s, 's') + (t < cm ? ms + 'ms' : ''); + return a(d, 'd') + a(h, 'h') + a(m, 'm') + a(s, 's') + (t === 0 || (t < cm && ms !== 0) ? ms + 'ms' : ''); }; }]; http://git-wip-us.apache.org/repos/asf/ignite/blob/55886b14/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..e4bde6f 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -310,7 +310,7 @@ export default class IgniteAgentManager { this.socket.removeListener('disconnect', onDisconnect); if (err) - latch.reject(err); + return latch.reject(err); latch.resolve(res); }); @@ -552,9 +552,10 @@ export default class IgniteAgentManager { * @param {Boolean} enforceJoinOrder Flag whether enforce join order is enabled. * @param {Boolean} replicatedOnly Flag whether query contains only replicated tables. * @param {Boolean} local Flag whether to execute query locally. + * @param {Boolean} lazy query flag. * @returns {Promise} */ - querySqlGetAll(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local) { + querySqlGetAll(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, lazy) { // Page size for query. const pageSz = 1024; @@ -572,7 +573,7 @@ export default class IgniteAgentManager { }); }; - return this.querySql(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz) + return this.querySql(nid, cacheName, query, nonCollocatedJoins, enforceJoinOrder, replicatedOnly, local, pageSz, lazy) .then(fetchResult); } http://git-wip-us.apache.org/repos/asf/ignite/blob/55886b14/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..420c4b9 100644 --- a/modules/web-console/frontend/app/modules/sql/sql.controller.js +++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js @@ -1630,7 +1630,7 @@ export default ['$rootScope', '$scope', '$http', '$q', '$timeout', '$interval', return Promise.resolve(args.localNid || _chooseNode(args.cacheName, false)) .then((nid) => args.type === 'SCAN' ? agentMgr.queryScanGetAll(nid, args.cacheName, args.query, !!args.regEx, !!args.caseSensitive, !!args.near, !!args.localNid) - : agentMgr.querySqlGetAll(nid, args.cacheName, args.query, !!args.nonCollocatedJoins, !!args.enforceJoinOrder, false, !!args.localNid)) + : agentMgr.querySqlGetAll(nid, args.cacheName, args.query, !!args.nonCollocatedJoins, !!args.enforceJoinOrder, false, !!args.localNid, !!args.lazy)) .then((res) => _export(paragraph.name + '-all.csv', paragraph.gridOptions.columnDefs, res.columns, res.rows)) .catch(Messages.showError) .then(() => paragraph.ace && paragraph.ace.focus()); http://git-wip-us.apache.org/repos/asf/ignite/blob/55886b14/modules/web-console/frontend/package.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index f96c322..d828e17 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -76,7 +76,7 @@ "html-webpack-plugin": "2.29.0", "jquery": "3.2.1", "json-loader": "0.5.7", - "jszip": "3.1.3", + "jszip": "3.1.4", "lodash": "4.17.4", "node-sass": "4.5.3", "nvd3": "1.8.4",
