honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually close IndexAnalyzers contents (#43914)

Browse Source 
IndexAnalyzers has a close() method that should iterate through all its wrapped
analyzers and close each one in turn. However, instead of delegating to the
analyzers' close() methods, it instead wraps them in a Closeable interface,
which just returns a list of the analyzers. In addition, whitespace normalizers are
ignored entirely.
This commit is contained in:
Alan Woodward 2019-07-03 15:45:35 +01:00
parent 3250cc53f0
commit 49d69bf987
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/org/elasticsearch/index/analysis/IndexAnalyzers.java
View File

@ -24,6 +24,7 @@ import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static java.util.Collections.unmodifiableMap; import static java.util.Collections.unmodifiableMap;
@ -106,8 +107,9 @@ public final class IndexAnalyzers implements Closeable {
@Override @Override
public void close() throws IOException { public void close() throws IOException {
IOUtils.close(() -> Stream.concat(analyzers.values().stream(), normalizers.values().stream()) IOUtils.close(Stream.of(analyzers.values().stream(), normalizers.values().stream(), whitespaceNormalizers.values().stream())
.filter(a -> a.scope() == AnalyzerScope.INDEX) .flatMap(s -> s)
.iterator()); .filter(a -> a.scope() == AnalyzerScope.INDEX)
.collect(Collectors.toList()));
} }
} }

37
server/src/test/java/org/elasticsearch/index/analysis/IndexAnalyzersTests.java
View File

@ -19,6 +19,8 @@
package org.elasticsearch.index.analysis; package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
@ -26,6 +28,7 @@ import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
public class IndexAnalyzersTests extends ESTestCase { public class IndexAnalyzersTests extends ESTestCase {
@ -77,4 +80,38 @@ public class IndexAnalyzersTests extends ESTestCase {
} }
} }
public void testClose() throws IOException {
AtomicInteger closes = new AtomicInteger(0);
NamedAnalyzer a = new NamedAnalyzer("default", AnalyzerScope.INDEX, new WhitespaceAnalyzer()){
@Override
public void close() {
super.close();
closes.incrementAndGet();
}
};
NamedAnalyzer n = new NamedAnalyzer("keyword_normalizer", AnalyzerScope.INDEX, new KeywordAnalyzer()){
@Override
public void close() {
super.close();
closes.incrementAndGet();
}
};
NamedAnalyzer w = new NamedAnalyzer("whitespace_normalizer", AnalyzerScope.INDEX, new WhitespaceAnalyzer()){
@Override
public void close() {
super.close();
closes.incrementAndGet();
}
};
IndexAnalyzers ia = new IndexAnalyzers(Collections.singletonMap("default", a),
Collections.singletonMap("n", n), Collections.singletonMap("w", w));
ia.close();
assertEquals(3, closes.get());
}
} }