Skip to content

Revert "Upgrade jcodings dependency to 1.0.44 (#43334)" #48899

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
merged 1 commit into from
Nov 7, 2019
Merged

Revert "Upgrade jcodings dependency to 1.0.44 (#43334)" #48899

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion libs/grok/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
dependencies {
compile 'org.jruby.joni:joni:2.1.6'
// joni dependencies:
compile 'org.jruby.jcodings:jcodings:1.0.44'
compile 'org.jruby.jcodings:jcodings:1.0.12'

testCompile(project(":test:framework")) {
exclude group: 'org.elasticsearch', module: 'elasticsearch-grok'
Expand Down
1 change: 1 addition & 0 deletions libs/grok/licenses/jcodings-1.0.12.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6bc17079fcaa8823ea8cd0d4c66516335b558db8
1 change: 0 additions & 1 deletion libs/grok/licenses/jcodings-1.0.44.jar.sha1
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/GrokProcessorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ public void testMatch() throws Exception {
assertThat(doc.getFieldValue("one", String.class), equalTo("1"));
}

public void testIgnoreCase() throws Exception {
String fieldName = RandomDocumentPicks.randomFieldName(random());
IngestDocument doc = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>());
doc.setFieldValue(fieldName, "A");
GrokProcessor processor = new GrokProcessor(randomAlphaOfLength(10), Collections.emptyMap(),
Collections.singletonList("(?<a>(?i)A)"), fieldName, false, false, ThreadWatchdog.noop());
processor.execute(doc);
assertThat(doc.getFieldValue("a", String.class), equalTo("A"));
}

public void testNoMatch() {
String fieldName = RandomDocumentPicks.randomFieldName(random());
IngestDocument doc = RandomDocumentPicks.randomIngestDocument(random(), new HashMap<>());
Expand Down