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

Wrap can_match reader with ElasticsearchDirectoryReader #35857

Merged
merged 1 commit into from Nov 24, 2018
Merged

Wrap can_match reader with ElasticsearchDirectoryReader #35857

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View file
Open in desktop
Expand Up @@ -55,6 +55,7 @@
import org.elasticsearch.common.lease.Releasable;
import org.elasticsearch.common.lease.Releasables;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
import org.elasticsearch.common.metrics.CounterMetric;
import org.elasticsearch.common.metrics.MeanMetric;
import org.elasticsearch.common.settings.Settings;
Expand Down Expand Up @@ -1164,6 +1165,8 @@ private Engine.Searcher acquireSearcher(String source, Engine.SearcherScope scop
readAllowed();
final Engine engine = getEngine();
final Engine.Searcher searcher = engine.acquireSearcher(source, scope);
assert ElasticsearchDirectoryReader.unwrap(searcher.getDirectoryReader())
!= null : "DirectoryReader must be an instance or ElasticsearchDirectoryReader";
boolean success = false;
try {
final Engine.Searcher wrappedSearcher = searcherWrapper == null ? searcher : searcherWrapper.wrap(searcher);
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugin/core/src/main/java/org/elasticsearch/index/engine/FrozenEngine.java
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@
import org.apache.lucene.util.Bits;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.lucene.Lucene;
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.index.shard.SearchOperationListener;
Expand Down Expand Up @@ -76,7 +77,8 @@ public FrozenEngine(EngineConfig config) {
boolean success = false;
Directory directory = store.directory();
try (DirectoryReader reader = DirectoryReader.open(directory)) {
canMatchReader = new RewriteCachingDirectoryReader(directory, reader.leaves());
canMatchReader = ElasticsearchDirectoryReader.wrap(new RewriteCachingDirectoryReader(directory, reader.leaves()),
config.getShardId());
success = true;
} catch (IOException e) {
throw new UncheckedIOException(e);
Expand Down
4 changes: 4 additions & 0 deletions x-pack/plugin/core/src/test/java/org/elasticsearch/index/engine/FrozenEngineTests.java
View file
Open in desktop
Expand Up @@ -296,11 +296,15 @@ public void testCanMatch() throws IOException {
try (FrozenEngine frozenEngine = new FrozenEngine(engine.engineConfig)) {
DirectoryReader reader;
try (Engine.Searcher searcher = frozenEngine.acquireSearcher("can_match")) {
assertNotNull(ElasticsearchDirectoryReader.getElasticsearchDirectoryReader(searcher.getDirectoryReader()));
assertEquals(config.getShardId(), ElasticsearchDirectoryReader.getElasticsearchDirectoryReader(searcher
.getDirectoryReader()).shardId());
reader = searcher.getDirectoryReader();
assertNotEquals(reader, Matchers.instanceOf(FrozenEngine.LazyDirectoryReader.class));
assertEquals(0, listener.afterRefresh.get());
DirectoryReader unwrap = FilterDirectoryReader.unwrap(searcher.getDirectoryReader());
assertThat(unwrap, Matchers.instanceOf(RewriteCachingDirectoryReader.class));
assertNotNull(ElasticsearchDirectoryReader.getElasticsearchDirectoryReader(searcher.getDirectoryReader()));
}

try (Engine.Searcher searcher = frozenEngine.acquireSearcher("can_match")) {
Expand Down