From 36af7971bc9a1b136161dfcc45f149c0c96748c1 Mon Sep 17 00:00:00 2001 From: Mohit Kuri Date: Sat, 8 Jun 2019 05:03:46 +0530 Subject: [PATCH 1/2] history.js - improving performance (#15300) Signed-off-by: Mohit Kuri --- js/designer/history.js | 51 +++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/js/designer/history.js b/js/designer/history.js index 22979c8264..8832dc08da 100644 --- a/js/designer/history.js +++ b/js/designer/history.js @@ -89,7 +89,8 @@ DesignerHistory.display = function (init, finit) { } // this part generates HTML code for history tab.adds delete,edit,and/or and detail features with objects. str = ''; // string to store Html code for history tab - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { temp = historyArray[i].getTab(); // + '.' + historyArray[i].getObjNo(); for Self JOIN str += '

' + temp + '

'; str += '
\n'; @@ -115,7 +116,7 @@ DesignerHistory.display = function (init, finit) { } str += ''; i++; - if (i >= historyArray.length) { + if (i >= historyArrayLength) { break; } str += '
'; @@ -153,7 +154,8 @@ DesignerHistory.andOr = function (index) { **/ DesignerHistory.historyDelete = function (index) { - for (var k = 0; k < fromArray.length; k++) { + var fromArrayLength = fromArray.length; + for (var k = 0; k < fromArrayLength; k++) { if (fromArray[k] === historyArray[index].getTab()) { fromArray.splice(k, 1); break; @@ -449,12 +451,13 @@ DesignerHistory.unique = function (arrayName) { var newArray = []; uniquetop: for (var i = 0; i < arrayName.length; i++) { - for (var j = 0; j < newArray.length; j++) { + var newArrayLength = newArray.length; + for (var j = 0; j < newArrayLength; j++) { if (newArray[j] === arrayName[i]) { continue uniquetop; } } - newArray[newArray.length] = arrayName[i]; + newArray[newArrayLength] = arrayName[i]; } return newArray; }; @@ -468,7 +471,8 @@ DesignerHistory.unique = function (arrayName) { */ DesignerHistory.found = function (arrayName, value) { - for (var i = 0; i < arrayName.length; i++) { + var arrayNameLength = arrayName.length; + for (var i = 0; i < arrayNameLength; i++) { if (arrayName[i] === value) { return 1; } @@ -483,7 +487,8 @@ DesignerHistory.found = function (arrayName, value) { * @params arr array in which elements are added */ DesignerHistory.addArray = function (add, arr) { - for (var i = 0; i < add.length; i++) { + var addLength = add.length; + for (var i = 0; i < addLength; i++) { arr.push(add[i]); } return arr; @@ -497,8 +502,10 @@ DesignerHistory.addArray = function (add, arr) { * */ DesignerHistory.removeArray = function (rem, arr) { - for (var i = 0; i < rem.length; i++) { - for (var j = 0; j < arr.length; j++) { + var remLength = rem.length; + for (var i = 0; i < remLength; i++) { + var arrLength = arr.length; + for (var j = 0; j < arrLength; j++) { if (rem[i] === arr[j]) { arr.splice(j, 1); } @@ -515,7 +522,8 @@ DesignerHistory.removeArray = function (rem, arr) { DesignerHistory.queryGroupBy = function () { var i; var str = ''; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { if (historyArray[i].getType() === 'GroupBy') { str += '`' + historyArray[i].getColumnName() + '`, '; } @@ -532,7 +540,8 @@ DesignerHistory.queryGroupBy = function () { DesignerHistory.queryHaving = function () { var i; var and = '('; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { if (historyArray[i].getType() === 'Having') { if (historyArray[i].getObj().getOperator() !== 'None') { and += historyArray[i].getObj().getOperator() + '(`' + historyArray[i].getColumnName() + '`) ' + historyArray[i].getObj().getRelationOperator(); @@ -559,7 +568,8 @@ DesignerHistory.queryHaving = function () { DesignerHistory.queryOrderBy = function () { var i; var str = ''; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { if (historyArray[i].getType() === 'OrderBy') { str += '`' + historyArray[i].getColumnName() + '` ' + historyArray[i].getObj().getOrder() + ', '; @@ -579,7 +589,8 @@ DesignerHistory.queryWhere = function () { var i; var and = '('; var or = '('; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { if (historyArray[i].getType() === 'Where') { if (historyArray[i].getAndOr() === 0) { and += '( `' + historyArray[i].getColumnName() + '` ' + historyArray[i].getObj().getRelationOperator() + ' ' + historyArray[i].getObj().getQuery() + ')'; @@ -608,7 +619,8 @@ DesignerHistory.queryWhere = function () { DesignerHistory.checkAggregate = function (idThis) { var i; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { var temp = '`' + historyArray[i].getTab() + '`.`' + historyArray[i].getColumnName() + '`'; if (temp === idThis && historyArray[i].getType() === 'Aggregate') { return historyArray[i].getObj().getOperator() + '(' + idThis + ')'; @@ -619,7 +631,8 @@ DesignerHistory.checkAggregate = function (idThis) { DesignerHistory.checkRename = function (idThis) { var i; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { var temp = '`' + historyArray[i].getTab() + '`.`' + historyArray[i].getColumnName() + '`'; if (temp === idThis && historyArray[i].getType() === 'Rename') { return ' AS `' + historyArray[i].getObj().getRenameTo() + '`'; @@ -655,7 +668,8 @@ DesignerHistory.queryFrom = function () { // the constraints that have been used in the LEFT JOIN var constraintsAdded = []; - for (i = 0; i < historyArray.length; i++) { + var historyArrayLength = historyArray.length; + for (i = 0; i < historyArrayLength; i++) { fromArray.push(historyArray[i].getTab()); } fromArray = DesignerHistory.unique(fromArray); @@ -749,8 +763,9 @@ DesignerHistory.queryFrom = function () { DesignerHistory.buildQuery = function () { var qSelect = 'SELECT '; var temp; - if (selectField.length > 0) { - for (var i = 0; i < selectField.length; i++) { + var selectFieldLength = selectField.length; + if (selectFieldLength > 0) { + for (var i = 0; i < selectFieldLength; i++) { temp = DesignerHistory.checkAggregate(selectField[i]); if (temp !== '') { qSelect += temp; From fec7de8d50168557859e4ff9e5b36dc7447cd27d Mon Sep 17 00:00:00 2001 From: Bournvita1998 Date: Mon, 17 Jun 2019 07:02:49 +0530 Subject: [PATCH 2/2] Refactoring init.js of Designer Signed-off-by: Bournvita1998 --- js/designer/init.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/designer/init.js b/js/designer/init.js index 81ec1e4832..44a3cd35cb 100644 --- a/js/designer/init.js +++ b/js/designer/init.js @@ -54,15 +54,15 @@ AJAX.registerOnload('designer/init.js', function () { } $('#query_Aggregate_Button').on('click', function () { - document.getElementById('query_Aggregate').style.display = 'none'; + $('#query_Aggregate').style.display = 'none'; }); $('#query_having_button').on('click', function () { - document.getElementById('query_having').style.display = 'none'; + $('#query_having').style.display = 'none'; }); $('#query_rename_to_button').on('click', function () { - document.getElementById('query_rename_to').style.display = 'none'; + $('#query_rename_to').style.display = 'none'; }); $('#build_query_button').on('click', function () { @@ -70,6 +70,6 @@ AJAX.registerOnload('designer/init.js', function () { }); $('#query_where_button').on('click', function () { - document.getElementById('query_where').style.display = 'none'; + $('#query_where').style.display = 'none'; }); });