Skip to content

perf: Use Set for stopNodes lookup O(1) instead of array iteration O(n) #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf: Use Set for stopNodes lookup O(1) instead of array iteration O(n) #769

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions src/xmlparser/OrderedObjParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ export default class OrderedObjParser{
this.saveTextToParentTag = saveTextToParentTag;
this.addChild = addChild;
this.ignoreAttributesFn = getIgnoreAttributesFn(this.options.ignoreAttributes)

if(this.options.stopNodes && this.options.stopNodes.length > 0){
this.stopNodesExact = new Set();
this.stopNodesWildcard = new Set();
for(let i = 0; i < this.options.stopNodes.length; i++){
const stopNodeExp = this.options.stopNodes[i];
if(typeof stopNodeExp !== 'string') continue;
if(stopNodeExp.startsWith("*.")){
this.stopNodesWildcard.add(stopNodeExp.substring(2));
}else{
this.stopNodesExact.add(stopNodeExp);
}
}
}
}

}
Expand Down Expand Up @@ -313,7 +327,7 @@ const parseXml = function(xmlData) {
jPath += jPath ? "." + tagName : tagName;
}
const startIndex = i;
if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) {
if (this.isItStopNode(this.stopNodesExact, this.stopNodesWildcard, jPath, tagName)) {
let tagContent = "";
//self-closing tag
if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
Expand Down Expand Up @@ -451,17 +465,14 @@ function saveTextToParentTag(textData, currentNode, jPath, isLeafNode) {

//TODO: use jPath to simplify the logic
/**
*
* @param {string[]} stopNodes
* @param {Set} stopNodesExact
* @param {Set} stopNodesWildcard
* @param {string} jPath
* @param {string} currentTagName
* @param {string} currentTagName
*/
function isItStopNode(stopNodes, jPath, currentTagName){
const allNodesExp = "*." + currentTagName;
for (const stopNodePath in stopNodes) {
const stopNodeExp = stopNodes[stopNodePath];
if( allNodesExp === stopNodeExp || jPath === stopNodeExp ) return true;
}
function isItStopNode(stopNodesExact, stopNodesWildcard, jPath, currentTagName){
if(stopNodesWildcard && stopNodesWildcard.has(currentTagName)) return true;
if(stopNodesExact && stopNodesExact.has(jPath)) return true;
return false;
}

Expand Down