diff --git a/src/modules/main/logFileProcessor/logFileProcessor.js b/src/modules/main/logFileProcessor/logFileProcessor.js index bb89ced..54c81bf 100644 --- a/src/modules/main/logFileProcessor/logFileProcessor.js +++ b/src/modules/main/logFileProcessor/logFileProcessor.js @@ -77,6 +77,8 @@ export default class LogFileProcessor extends LightningElement { stdExpCount = 0; codeUnitsCount = 0; methodUnitsCount = 0; + soqlCount = 0; + dmlCount = 0; eventsPicklistValues = new Set(); execAnonyCount = 0; fileData; @@ -85,7 +87,9 @@ export default class LogFileProcessor extends LightningElement { nofLines: 0, nofCodeUnits: 0, nofMethodUnits: 0, - errors: [] + errors: [], + soqlCount: 0, + dmlCount: 0 }; fileDataPartial = []; // @wire(MessageContext) @@ -115,6 +119,8 @@ export default class LogFileProcessor extends LightningElement { reader.readAsText(rawFile); } processLogData() { + let isSoql = false; + let isDml = false; this.fileData.forEach((line, idx) => { if (this.STD_EXP_MATCHER.test(line)) { this.stdExpCount++; @@ -128,13 +134,6 @@ export default class LogFileProcessor extends LightningElement { const RegexMap = eventsRegexMain.get(lineEvent); for (let [key, value] of RegexMap) { if (key.test(line)) { - // console.log( - // value, - // '=>', - // key.test(line), - // '=>', - // line - // ); this.createCodeUnit(line, value, idx + 1); break; } @@ -183,8 +182,16 @@ export default class LogFileProcessor extends LightningElement { errStr ); } + } else if (lineEvent === 'SOQL_EXECUTE_BEGIN') { + this.soqlCount++; + isSoql = true; + } else if (lineEvent === 'DML_BEGIN') { + this.dmlCount++; + isDml = true; } - this.addLinetoCUorMU(line, lineEvent, idx); + this.addLinetoCUorMU(line, lineEvent, idx, isSoql, isDml); + isDml = false; + isSoql = false; } this.addToFileDataPartial(line, lineEvent, idx + 1); @@ -219,6 +226,8 @@ export default class LogFileProcessor extends LightningElement { // console.log('Type: ', type); let cu = {}; cu.unitDuration = index; + cu.soqlCount = 0; + cu.dmlCount = 0; if (type === 'Class-Action') { enteredCondition = true; const splitArr = line.split('|'); @@ -338,6 +347,8 @@ export default class LogFileProcessor extends LightningElement { */ let methodUnit = {}; methodUnit.unitDuration = index; + methodUnit.soqlCount = 0; + methodUnit.dmlCount = 0; if (type === 'Method-Generic') { this.isCurUnitCU = false; this.methodUnitsCount++; @@ -357,7 +368,7 @@ export default class LogFileProcessor extends LightningElement { .substring(methodUnit.methodTitle.lastIndexOf('.') + 1) + s2; //Once methodUnit fields are filled push it to methodUnitsStack - this.addMUtoResult(methodUnit); + this.addMUorLinetoResult(methodUnit); this.methodUnitsStack.push(methodUnit); } else if (type === 'Method-System') { this.isCurUnitCU = false; @@ -365,7 +376,7 @@ export default class LogFileProcessor extends LightningElement { methodUnit.methodTitle = 'System Method'; methodUnit.type = 'System Method'; methodUnit.methodName = line.substring(line.lastIndexOf('|') + 1); - this.addMUtoResult(methodUnit); + this.addMUorLinetoResult(methodUnit); this.methodUnitsStack.push(methodUnit); } methodUnit.startTime = this.extractTimeStamp(line); @@ -393,7 +404,7 @@ export default class LogFileProcessor extends LightningElement { return this.codeUnitsStack[this.codeUnitsStack.length - 1]; } - addMUtoResult(methodUnit) { + addMUorLinetoResult(methodUnit, isSoql, isDml) { //check if methodUnitsStack is empty if (this.methodUnitsStack.length !== 0) { let MUTop = this.currentMU(); @@ -403,6 +414,16 @@ export default class LogFileProcessor extends LightningElement { MUTop.childUnitsandLines = []; MUTop.childUnitsandLines.push(methodUnit); } + if (isSoql) { + let count = MUTop.soqlCount + 1; + MUTop.soqlCount = count; + // console.log(MUTop); + } + if (isDml) { + let count = MUTop.soqlCount + 1; + MUTop.dmlCount = count; + // console.log(MUTop); + } } else if (this.codeUnitsStack.length !== 0) { let CUTop = this.currentCU(); if (CUTop.childUnitsandLines) { @@ -411,6 +432,16 @@ export default class LogFileProcessor extends LightningElement { CUTop.childUnitsandLines = []; CUTop.childUnitsandLines.push(methodUnit); } + if (isSoql) { + let count = CUTop.soqlCount + 1; + CUTop.soqlCount = count; + // console.log(CUTop); + } + if (isDml) { + let count = CUTop.dmlCount + 1; + CUTop.dmlCount = count; + // console.log(CUTop); + } } } @@ -434,9 +465,9 @@ export default class LogFileProcessor extends LightningElement { } } - addLinetoCUorMU(line, event, idx) { + addLinetoCUorMU(line, event, idx, isSoql, isDml) { let lineDetails = { line: line, event: event, lineNumber: idx }; - this.addMUtoResult(lineDetails); + this.addMUorLinetoResult(lineDetails, isSoql, isDml); } addToFileDataPartial(line, event, lineNumber) { @@ -453,6 +484,9 @@ export default class LogFileProcessor extends LightningElement { this.fileMetadata.nofMethodUnits = this.methodUnitsCount; this.fileMetadata.nofLines = this.fileData.length; this.fileMetadata.errors = this.errors; + this.fileMetadata.soqlCount = this.soqlCount; + this.fileMetadata.dmlCount = this.dmlCount; + // console.log("Event Picklist Values: ", this.eventsPicklistValues); const payload = { fileMetadata: this.fileMetadata, diff --git a/src/modules/main/logViewer/logViewer.html b/src/modules/main/logViewer/logViewer.html index 30e02bf..f059cba 100644 --- a/src/modules/main/logViewer/logViewer.html +++ b/src/modules/main/logViewer/logViewer.html @@ -655,7 +655,8 @@

  • Total Lines @@ -669,7 +670,8 @@

  • Total CodeUnits @@ -683,7 +685,8 @@

  • Total MethodUnits @@ -694,6 +697,35 @@

    {fileMetadata.nofMethodUnits}

    • +
  • +
    + SQOL + Queries +
    +
    + {fileMetadata.soqlCount} +
    +
    • +
  • +
    + DML + Operations +
    +
    + {fileMetadata.dmlCount} +
    +

    • diff --git a/src/modules/main/logViewer/logViewer.js b/src/modules/main/logViewer/logViewer.js index 6e523fa..3ac2b2c 100644 --- a/src/modules/main/logViewer/logViewer.js +++ b/src/modules/main/logViewer/logViewer.js @@ -110,7 +110,9 @@ export default class logViewer extends LightningElement { fileName: '', nofLines: 0, nofCodeUnits: 0, - nofMethodUnits: 0 + nofMethodUnits: 0, + soqlCount: 0, + dmlCount: 0 }; noOfPages = 0; pageNumber = 0; diff --git a/src/modules/parser/callTree/callTree.js b/src/modules/parser/callTree/callTree.js index 6f45859..9592dbc 100644 --- a/src/modules/parser/callTree/callTree.js +++ b/src/modules/parser/callTree/callTree.js @@ -147,6 +147,8 @@ function parseDebugLogUnits(obj, units = [], level = 1, parentId) { type: obj.cuType, name: obj.cuName, timeInMS: timeInMS, + dmlCount: obj.dmlCount, + soqlCount: obj.soqlCount, level: level, unitDuration: obj.unitDuration, unitLength: duration, @@ -181,6 +183,8 @@ function parseDebugLogUnits(obj, units = [], level = 1, parentId) { timeInMS: timeInMS, type: obj.type, level: level, + dmlCount: obj.dmlCount, + soqlCount: obj.soqlCount, unitDuration: obj.unitDuration, unitLength: duration, hasChild: Object.values(obj).some(hasChildUnits) diff --git a/src/modules/ui/utilityPanel/utilityPanel.html b/src/modules/ui/utilityPanel/utilityPanel.html index 9cb9d6f..c7ba256 100644 --- a/src/modules/ui/utilityPanel/utilityPanel.html +++ b/src/modules/ui/utilityPanel/utilityPanel.html @@ -140,6 +140,70 @@

    Call Stack

    + +
    +
    + SOQL Count +
    +
    +
    + + + + +
    + + +
    +
    + DML Count +
    +
    +
    + + + + +
    + Call Stack

    • > + +
    + {node.soqlCount} +
    + + +
    + {node.dmlCount} +
    +