honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid HashMap construction on Grok non-match (#42444) 

This change moves the construction of the result
HashMap in Grok.captures() into the branch that
actually needs it.

This probably will not make a measurable difference
for ingest pipelines, but it is beneficial to the
ML find_file_structure endpoint, as it tries out
many Grok patterns that will fail to match.
This commit is contained in:
David Roberts 2019-05-23 21:04:03 +01:00
parent 2b22ceac04
commit 14f29de2a8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
View File

@ -240,7 +240,6 @@ public final class Grok {
*/ */
public Map<String, Object> captures(String text) { public Map<String, Object> captures(String text) {
byte[] textAsBytes = text.getBytes(StandardCharsets.UTF_8); byte[] textAsBytes = text.getBytes(StandardCharsets.UTF_8);
Map<String, Object> fields = new HashMap<>();
Matcher matcher = compiledExpression.matcher(textAsBytes); Matcher matcher = compiledExpression.matcher(textAsBytes);
int result; int result;
try { try {
@ -256,6 +255,7 @@ public final class Grok {
// TODO: I think we should throw an error here? // TODO: I think we should throw an error here?
return null; return null;
} else if (compiledExpression.numberOfNames() > 0) { } else if (compiledExpression.numberOfNames() > 0) {
Map<String, Object> fields = new HashMap<>();
Region region = matcher.getEagerRegion(); Region region = matcher.getEagerRegion();
for (Iterator<NameEntry> entry = compiledExpression.namedBackrefIterator(); entry.hasNext();) { for (Iterator<NameEntry> entry = compiledExpression.namedBackrefIterator(); entry.hasNext();) {
NameEntry e = entry.next(); NameEntry e = entry.next();
@ -270,8 +270,10 @@ public final class Grok {
} }
} }
} }
}
return fields; return fields;
} else {
return Collections.emptyMap();
}
} }
public static Map<String, String> getBuiltinPatterns() { public static Map<String, String> getBuiltinPatterns() {