Skip to content

Upgrade joni from 2.1.6 to 2.1.29 #47374

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
martijnvg merged 2 commits into from
Oct 4, 2019
Merged

Upgrade joni from 2.1.6 to 2.1.29 #47374

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb27e78
Upgraded joni from 2.1.6 to 2.1.29
martijnvg Oct 1, 2019
0905d54
Merge remote-tracking branch 'es/master' into upgrade_joni
martijnvg Oct 3, 2019
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
9 changes: 1 addition & 8 deletions libs/grok/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

dependencies {
compile 'org.jruby.joni:joni:2.1.6'
compile 'org.jruby.joni:joni:2.1.29'
// joni dependencies:
compile 'org.jruby.jcodings:jcodings:1.0.44'

Expand All @@ -45,10 +45,3 @@ if (isEclipse) {
}
}
}

thirdPartyAudit.ignoreMissingClasses (
// joni has AsmCompilerSupport, but that isn't being used:
'org.objectweb.asm.ClassWriter',
'org.objectweb.asm.MethodVisitor',
'org.objectweb.asm.Opcodes'
)
1 change: 1 addition & 0 deletions libs/grok/licenses/joni-2.1.29.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3cb751702e1194ff24259155db4d37e9383d4320
1 change: 0 additions & 1 deletion libs/grok/licenses/joni-2.1.6.jar.sha1
View file
Open in desktop

This file was deleted.

12 changes: 9 additions & 3 deletions libs/grok/src/main/java/org/elasticsearch/grok/Grok.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ public String toRegex(String grokPattern) {
int result;
try {
threadWatchdog.register();
result = matcher.search(0, grokPatternBytes.length, Option.NONE);
result = matcher.searchInterruptible(0, grokPatternBytes.length, Option.NONE);
} catch (InterruptedException e) {
result = Matcher.INTERRUPTED;
} finally {
threadWatchdog.unregister();
}
Expand Down Expand Up @@ -224,7 +226,9 @@ public boolean match(String text) {
int result;
try {
threadWatchdog.register();
result = matcher.search(0, text.length(), Option.DEFAULT);
result = matcher.searchInterruptible(0, text.length(), Option.DEFAULT);
} catch (InterruptedException e) {
result = Matcher.INTERRUPTED;
} finally {
threadWatchdog.unregister();
}
Expand All @@ -244,7 +248,9 @@ public Map<String, Object> captures(String text) {
int result;
try {
threadWatchdog.register();
result = matcher.search(0, textAsBytes.length, Option.DEFAULT);
result = matcher.searchInterruptible(0, textAsBytes.length, Option.DEFAULT);
} catch (InterruptedException e) {
result = Matcher.INTERRUPTED;
} finally {
threadWatchdog.unregister();
}
Expand Down