-
Notifications
You must be signed in to change notification settings - Fork 25.8k
Faster sequential access for stored fields #62509
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.
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
jimczi
merged 4 commits into
elastic:master
from
jimczi:enhancements/search_codec_reader
Sep 17, 2020
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
...src/main/java/org/elasticsearch/common/lucene/index/SequentialStoredFieldsLeafReader.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.common.lucene.index; | ||
|
|
||
| import org.apache.lucene.codecs.StoredFieldsReader; | ||
| import org.apache.lucene.index.CodecReader; | ||
| import org.apache.lucene.index.FilterLeafReader; | ||
| import org.apache.lucene.index.LeafReader; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * A {@link FilterLeafReader} that exposes a {@link StoredFieldsReader} | ||
| * optimized for sequential access. This class should be used by custom | ||
| * {@link FilterLeafReader} that are used at search time in order to | ||
| * leverage sequential access when retrieving stored fields in queries, | ||
| * aggregations or during the fetch phase. | ||
| */ | ||
| public abstract class SequentialStoredFieldsLeafReader extends FilterLeafReader { | ||
| /** | ||
| * <p>Construct a StoredFieldsFilterLeafReader based on the specified base reader. | ||
| * <p>Note that base reader is closed if this FilterLeafReader is closed.</p> | ||
| * | ||
| * @param in specified base reader. | ||
| */ | ||
| public SequentialStoredFieldsLeafReader(LeafReader in) { | ||
| super(in); | ||
| } | ||
|
|
||
| /** | ||
| * Implementations should return a {@link StoredFieldsReader} that wraps the provided <code>reader</code> | ||
| * that is optimized for sequential access (adjacent doc ids). | ||
| */ | ||
| protected abstract StoredFieldsReader doGetSequentialStoredFieldsReader(StoredFieldsReader reader); | ||
|
|
||
| /** | ||
| * Returns a {@link StoredFieldsReader} optimized for sequential access (adjacent doc ids). | ||
| */ | ||
| public StoredFieldsReader getSequentialStoredFieldsReader() throws IOException { | ||
| if (in instanceof CodecReader) { | ||
| CodecReader reader = (CodecReader) in; | ||
| return doGetSequentialStoredFieldsReader(reader.getFieldsReader().getMergeInstance()); | ||
| } else if (in instanceof SequentialStoredFieldsLeafReader) { | ||
| SequentialStoredFieldsLeafReader reader = (SequentialStoredFieldsLeafReader) in; | ||
| return doGetSequentialStoredFieldsReader(reader.getSequentialStoredFieldsReader()); | ||
| } else { | ||
| throw new IOException("requires a CodecReader or a SequentialStoredFieldsLeafReader, got " + in.getClass()); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
server/src/test/java/org/elasticsearch/search/fetch/FetchPhaseTests.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.fetch; | ||
|
|
||
| import org.elasticsearch.test.ESTestCase; | ||
|
|
||
| public class FetchPhaseTests extends ESTestCase { | ||
| public void testSequentialDocs() { | ||
| FetchPhase.DocIdToIndex[] docs = new FetchPhase.DocIdToIndex[10]; | ||
| int start = randomIntBetween(0, Short.MAX_VALUE); | ||
| for (int i = 0; i < 10; i++) { | ||
| docs[i] = new FetchPhase.DocIdToIndex(start, i); | ||
| ++ start; | ||
| } | ||
| assertTrue(FetchPhase.hasSequentialDocs(docs)); | ||
|
|
||
| int from = randomIntBetween(0, 9); | ||
| start = docs[from].docId; | ||
| for (int i = from; i < 10; i++) { | ||
| start += randomIntBetween(2, 10); | ||
| docs[i] = new FetchPhase.DocIdToIndex(start, i); | ||
| } | ||
| assertFalse(FetchPhase.hasSequentialDocs(docs)); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.