Skip to content

Speed up Script Engine initialization #21463

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

Merged
cwperks merged 4 commits into from
May 5, 2026
Merged

Speed up Script Engine initialization #21463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4805de2
compile whitespace pattern only once.
timlueg May 3, 2026
cc29517
convert .values() to sets to avoid linear scans
timlueg May 3, 2026
c651fa8
Cache Painless lookups for identical allowlists
timlueg May 3, 2026
340db17
use computeIfAbsent
timlueg May 4, 2026
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
21 changes: 13 additions & 8 deletions modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/AllowlistLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,13 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;

/** Loads and creates a {@link Allowlist} from one to many text files. */
public final class AllowlistLoader {

private static final Pattern WHITESPACE = Pattern.compile("\\s+");

/**
* Loads and creates a {@link Allowlist} from one to many text files using only the base annotation parsers.
* See {@link #loadFromResourceFiles(Class, Map, String...)} for information on how to structure an allowlist
Expand Down Expand Up @@ -312,9 +315,9 @@ public static Allowlist loadFromResourceFiles(Class<?> resource, Map<String, All
);
}

String[] canonicalTypeNameParameters = line.substring(parameterStartIndex + 1, parameterEndIndex)
.replaceAll("\\s+", "")
.split(",");
String[] canonicalTypeNameParameters = WHITESPACE.matcher(
line.substring(parameterStartIndex + 1, parameterEndIndex)
).replaceAll("").split(",");

// Handle the case for a method with no parameters.
if ("".equals(canonicalTypeNameParameters[0])) {
Expand Down Expand Up @@ -397,7 +400,9 @@ public static Allowlist loadFromResourceFiles(Class<?> resource, Map<String, All
);
}

String[] canonicalTypeNameParameters = line.substring(1, parameterEndIndex).replaceAll("\\s+", "").split(",");
String[] canonicalTypeNameParameters = WHITESPACE.matcher(line.substring(1, parameterEndIndex))
.replaceAll("")
.split(",");

// Handle the case for a constructor with no parameters.
if ("".equals(canonicalTypeNameParameters[0])) {
Expand Down Expand Up @@ -447,9 +452,9 @@ public static Allowlist loadFromResourceFiles(Class<?> resource, Map<String, All
);
}

String[] canonicalTypeNameParameters = line.substring(parameterStartIndex + 1, parameterEndIndex)
.replaceAll("\\s+", "")
.split(",");
String[] canonicalTypeNameParameters = WHITESPACE.matcher(
line.substring(parameterStartIndex + 1, parameterEndIndex)
).replaceAll("").split(",");

// Handle the case for a method with no parameters.
if ("".equals(canonicalTypeNameParameters[0])) {
Expand Down Expand Up @@ -521,7 +526,7 @@ private static List<Object> parseAllowlistAnnotations(Map<String, AllowlistAnnot

List<Object> annotations;

if ("".equals(line.replaceAll("\\s+", ""))) {
if (line.isBlank()) {
annotations = Collections.emptyList();
} else {
line = line.trim();
Expand Down
4 changes: 3 additions & 1 deletion modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,12 @@ public PainlessScriptEngine(Settings settings, Map<ScriptContext<?>, List<Allowl

Map<ScriptContext<?>, Compiler> contextsToCompilers = new HashMap<>();
Map<ScriptContext<?>, PainlessLookup> contextsToLookups = new HashMap<>();
Map<List<Allowlist>, PainlessLookup> allowlistsToLookups = new HashMap<>();

for (Map.Entry<ScriptContext<?>, List<Allowlist>> entry : contexts.entrySet()) {
ScriptContext<?> context = entry.getKey();
PainlessLookup lookup = PainlessLookupBuilder.buildFromAllowlists(entry.getValue());
List<Allowlist> allowlists = List.copyOf(entry.getValue());
PainlessLookup lookup = allowlistsToLookups.computeIfAbsent(allowlists, PainlessLookupBuilder::buildFromAllowlists);
contextsToCompilers.put(
context,
new Compiler(context.instanceClazz, context.factoryClazz, context.statefulFactoryClazz, lookup)
Expand Down
13 changes: 9 additions & 4 deletions ...les/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.regex.Pattern;

import static org.opensearch.painless.WriterConstants.DEF_TO_B_BYTE_IMPLICIT;
Expand Down Expand Up @@ -1925,20 +1927,23 @@ public PainlessLookup build() {
classesToPainlessClasses.put(painlessClassBuilderEntry.getKey(), painlessClassBuilderEntry.getValue().build());
}

if (javaClassNamesToClasses.values().containsAll(canonicalClassNamesToClasses.values()) == false) {
Set<Class<?>> javaClasses = new HashSet<>(javaClassNamesToClasses.values());
Set<Class<?>> canonicalClasses = new HashSet<>(canonicalClassNamesToClasses.values());
Set<Class<?>> painlessClasses = classesToPainlessClasses.keySet();

if (javaClasses.containsAll(canonicalClasses) == false) {
throw new IllegalArgumentException(
"the values of java class names to classes " + "must be a superset of the values of canonical class names to classes"
);
}

if (javaClassNamesToClasses.values().containsAll(classesToPainlessClasses.keySet()) == false) {
if (javaClasses.containsAll(painlessClasses) == false) {
throw new IllegalArgumentException(
"the values of java class names to classes " + "must be a superset of the keys of classes to painless classes"
);
}

if (canonicalClassNamesToClasses.values().containsAll(classesToPainlessClasses.keySet()) == false
|| classesToPainlessClasses.keySet().containsAll(canonicalClassNamesToClasses.values()) == false) {
if (canonicalClasses.equals(painlessClasses) == false) {
throw new IllegalArgumentException(
"the values of canonical class names to classes " + "must have the same classes as the keys of classes to painless classes"
);
Expand Down
Loading