-
Notifications
You must be signed in to change notification settings - Fork 25.2k
Add doc values support for ES 5 and ES 6 #82207
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
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0a98201
Add doc values support for ES 5 and ES 6
ywelsch 27f7357
add unit tests
ywelsch 7240842
Merge remote-tracking branch 'elastic/master' into old-doc-values
ywelsch 0774c16
Merge remote-tracking branch 'elastic/master' into old-doc-values
ywelsch 0dc2077
update javadocs
ywelsch 3b8facf
Merge remote-tracking branch 'elastic/master' into old-doc-values
ywelsch 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,4 @@ dependencies { | |
| compileOnly project(path: xpackModule('core')) | ||
| } | ||
|
|
||
| test.enabled = false | ||
|
|
||
| addQaCheckDependencies() | ||
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
.../src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacyBinaryDocValues.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 @@ | ||
| /* | ||
| * @notice | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF 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. | ||
| * | ||
| * Modifications copyright (C) 2021 Elasticsearch B.V. | ||
| */ | ||
| package org.elasticsearch.xpack.lucene.bwc.codecs.index; | ||
|
|
||
| import org.apache.lucene.index.BinaryDocValues; | ||
| import org.apache.lucene.util.BytesRef; | ||
|
|
||
| /** | ||
| * A per-document byte[] | ||
| * | ||
| * @deprecated Use {@link BinaryDocValues} instead. | ||
| */ | ||
| @Deprecated | ||
| public abstract class LegacyBinaryDocValues { | ||
|
|
||
| /** Sole constructor. (For invocation by subclass | ||
| * constructors, typically implicit.) */ | ||
| protected LegacyBinaryDocValues() {} | ||
|
|
||
| /** Lookup the value for document. The returned {@link BytesRef} may be | ||
| * re-used across calls to {@link #get(int)} so make sure to | ||
| * {@link BytesRef#deepCopyOf(BytesRef) copy it} if you want to keep it | ||
| * around. */ | ||
| public abstract BytesRef get(int docID); | ||
| } |
93 changes: 93 additions & 0 deletions
93
...in/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacyBinaryDocValuesWrapper.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,93 @@ | ||
| /* | ||
| * @notice | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF 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. | ||
| * | ||
| * Modifications copyright (C) 2021 Elasticsearch B.V. | ||
| */ | ||
| package org.elasticsearch.xpack.lucene.bwc.codecs.index; | ||
|
|
||
| import org.apache.lucene.index.BinaryDocValues; | ||
| import org.apache.lucene.util.Bits; | ||
| import org.apache.lucene.util.BytesRef; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Wraps a {@link LegacyBinaryDocValues} into a {@link BinaryDocValues}. | ||
| * | ||
| * @deprecated Implement {@link BinaryDocValues} directly. | ||
| */ | ||
| @Deprecated | ||
| public final class LegacyBinaryDocValuesWrapper extends BinaryDocValues { | ||
| private final Bits docsWithField; | ||
| private final LegacyBinaryDocValues values; | ||
| private final int maxDoc; | ||
| private int docID = -1; | ||
|
|
||
| public LegacyBinaryDocValuesWrapper(Bits docsWithField, LegacyBinaryDocValues values) { | ||
| this.docsWithField = docsWithField; | ||
| this.values = values; | ||
| this.maxDoc = docsWithField.length(); | ||
| } | ||
|
|
||
| @Override | ||
| public int docID() { | ||
| return docID; | ||
| } | ||
|
|
||
| @Override | ||
| public int nextDoc() { | ||
| docID++; | ||
| while (docID < maxDoc) { | ||
| if (docsWithField.get(docID)) { | ||
| return docID; | ||
| } | ||
| docID++; | ||
| } | ||
| docID = NO_MORE_DOCS; | ||
| return NO_MORE_DOCS; | ||
| } | ||
|
|
||
| @Override | ||
| public int advance(int target) { | ||
| if (target < docID) { | ||
| throw new IllegalArgumentException("cannot advance backwards: docID=" + docID + " target=" + target); | ||
| } | ||
| if (target == NO_MORE_DOCS) { | ||
| this.docID = NO_MORE_DOCS; | ||
| } else { | ||
| this.docID = target - 1; | ||
| nextDoc(); | ||
| } | ||
| return docID; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean advanceExact(int target) throws IOException { | ||
| docID = target; | ||
| return docsWithField.get(target); | ||
| } | ||
|
|
||
| @Override | ||
| public long cost() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public BytesRef binaryValue() { | ||
| return values.get(docID); | ||
| } | ||
| } |
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.