Skip to content

perf: replace isTemporary(property) check with removing all the temporary properties first #5956

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

Draft
vlsi wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −10
Draft

perf: replace isTemporary(property) check with removing all the temporary properties first #5956

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
30 changes: 20 additions & 10 deletions src/core/src/main/java/org/apache/jmeter/testelement/AbstractTestElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
Expand Down Expand Up @@ -654,18 +653,29 @@ public void recoverRunningVersion() {
// See https://github.com/apache/jmeter/issues/5875
return;
}
Iterator<Map.Entry<String, JMeterProperty>> iter = propMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry<String, JMeterProperty> entry = iter.next();
JMeterProperty prop = entry.getValue();
if (isTemporary(prop)) {
iter.remove();
clearTemporary(prop);
} else {
writeLock();
try {
Set<JMeterProperty> tempProperties = temporaryProperties;
// Remove temporary properties first
if (tempProperties != null) {
for (JMeterProperty prop : tempProperties) {
removeProperty(prop.getName());
}
}
// Recover non-temporary properties
for (JMeterProperty prop : propMap.values()) {
prop.recoverRunningVersion(this);
}
// Clearing the temporary properties must happen after we recover all the other properties
// The reason is that some of the properties might be MultiProperty which uses
// testElement.temporaryProperties storage instead of tracking the temps on its own
// TODO: move temp tracking to MultiProperty
if (tempProperties != null) {
tempProperties.clear();
}
} finally {
writeUnlock();
}
emptyTemporary();
}

/**
Expand Down