Skip to content
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

Jump to bottom

Fix: raise error on malformed CSV. #5143

Merged
merged 1 commit into from
Nov 8, 2022
Merged

Fix: raise error on malformed CSV. #5143

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
3 changes: 3 additions & 0 deletions ...alysis-kuromoji/src/main/java/org/opensearch/index/analysis/KuromojiTokenizerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ public KuromojiTokenizerFactory(IndexSettings indexSettings, Environment env, St

private static String parse(String rule, Set<String> dup) {
String[] values = CSVUtil.parse(rule);
if (values.length == 0) {
throw new IllegalArgumentException("Malformed csv in user dictionary.");
}
if (dup.add(values[0]) == false) {
throw new IllegalArgumentException("Found duplicate term [" + values[0] + "] in user dictionary.");
}
Expand Down
9 changes: 9 additions & 0 deletions .../analysis-kuromoji/src/test/java/org/opensearch/index/analysis/KuromojiAnalysisTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,15 @@ public void testKuromojiAnalyzerInvalidUserDictOption() throws Exception {
);
}

public void testKuromojiAnalyzerEmptyDictRule() throws Exception {
Settings settings = Settings.builder()
.put("index.analysis.analyzer.my_analyzer.type", "kuromoji")
.putList("index.analysis.analyzer.my_analyzer.user_dictionary_rules", "\"")
.build();
RuntimeException exc = expectThrows(RuntimeException.class, () -> createTestAnalysis(settings));
assertThat(exc.getMessage(), equalTo("Line [1]: Malformed csv in user dictionary."));
}

public void testKuromojiAnalyzerDuplicateUserDictRule() throws Exception {
Settings settings = Settings.builder()
.put("index.analysis.analyzer.my_analyzer.type", "kuromoji")
Expand Down