-
Notifications
You must be signed in to change notification settings - Fork 25k
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
Bump Elasticsearch codec to track Lucene101Codec #116318
Merged
javanna
merged 10 commits into
elastic:lucene_snapshot
from
javanna:bump_lucene_101_snapshot
Nov 8, 2024
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
5ca891d
Bump Elasticsearch codec to track Lucene101Codec
javanna e65dc4b
fix completion postings format
javanna 299a1b2
adapt completion field mapper tests
javanna a2a7ee2
iter
javanna fb62c6e
iter
javanna 0629591
Merge branch 'lucene_snapshot' into bump_lucene_101_snapshot
javanna 5420c35
Merge branch 'lucene_snapshot' into bump_lucene_101_snapshot
javanna c9adff2
iter
javanna e8883a3
Merge branch 'lucene_snapshot' into bump_lucene_101_snapshot
javanna ed6ff26
Merge branch 'lucene_snapshot' into bump_lucene_101_snapshot
javanna 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 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 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 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 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 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 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 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
131 changes: 131 additions & 0 deletions
131
server/src/main/java/org/elasticsearch/index/codec/Elasticsearch900Lucene101Codec.java
This file contains 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,131 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.index.codec; | ||
|
|
||
| import org.apache.lucene.codecs.DocValuesFormat; | ||
| import org.apache.lucene.codecs.KnnVectorsFormat; | ||
| import org.apache.lucene.codecs.PostingsFormat; | ||
| import org.apache.lucene.codecs.StoredFieldsFormat; | ||
| import org.apache.lucene.codecs.lucene101.Lucene101Codec; | ||
| import org.apache.lucene.codecs.lucene101.Lucene101PostingsFormat; | ||
| import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; | ||
| import org.apache.lucene.codecs.lucene99.Lucene99HnswVectorsFormat; | ||
| import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; | ||
| import org.apache.lucene.codecs.perfield.PerFieldKnnVectorsFormat; | ||
| import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; | ||
| import org.elasticsearch.index.codec.zstd.Zstd814StoredFieldsFormat; | ||
|
|
||
| /** | ||
| * Elasticsearch codec as of 9.0 relying on Lucene 10.1. This extends the Lucene 10.1 codec to compressed | ||
| * stored fields with ZSTD instead of LZ4/DEFLATE. See {@link Zstd814StoredFieldsFormat}. | ||
| */ | ||
| public class Elasticsearch900Lucene101Codec extends CodecService.DeduplicateFieldInfosCodec { | ||
|
|
||
| private final StoredFieldsFormat storedFieldsFormat; | ||
|
|
||
| private final PostingsFormat defaultPostingsFormat; | ||
| private final PostingsFormat postingsFormat = new PerFieldPostingsFormat() { | ||
| @Override | ||
| public PostingsFormat getPostingsFormatForField(String field) { | ||
| return Elasticsearch900Lucene101Codec.this.getPostingsFormatForField(field); | ||
| } | ||
| }; | ||
|
|
||
| private final DocValuesFormat defaultDVFormat; | ||
| private final DocValuesFormat docValuesFormat = new PerFieldDocValuesFormat() { | ||
| @Override | ||
| public DocValuesFormat getDocValuesFormatForField(String field) { | ||
| return Elasticsearch900Lucene101Codec.this.getDocValuesFormatForField(field); | ||
| } | ||
| }; | ||
|
|
||
| private final KnnVectorsFormat defaultKnnVectorsFormat; | ||
| private final KnnVectorsFormat knnVectorsFormat = new PerFieldKnnVectorsFormat() { | ||
| @Override | ||
| public KnnVectorsFormat getKnnVectorsFormatForField(String field) { | ||
| return Elasticsearch900Lucene101Codec.this.getKnnVectorsFormatForField(field); | ||
| } | ||
| }; | ||
|
|
||
| /** Public no-arg constructor, needed for SPI loading at read-time. */ | ||
| public Elasticsearch900Lucene101Codec() { | ||
| this(Zstd814StoredFieldsFormat.Mode.BEST_SPEED); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor. Takes a {@link Zstd814StoredFieldsFormat.Mode} that describes whether to optimize for retrieval speed at the expense of | ||
| * worse space-efficiency or vice-versa. | ||
| */ | ||
| public Elasticsearch900Lucene101Codec(Zstd814StoredFieldsFormat.Mode mode) { | ||
| super("Elasticsearch900Lucene101", new Lucene101Codec()); | ||
| this.storedFieldsFormat = mode.getFormat(); | ||
| this.defaultPostingsFormat = new Lucene101PostingsFormat(); | ||
| this.defaultDVFormat = new Lucene90DocValuesFormat(); | ||
| this.defaultKnnVectorsFormat = new Lucene99HnswVectorsFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public StoredFieldsFormat storedFieldsFormat() { | ||
| return storedFieldsFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public final PostingsFormat postingsFormat() { | ||
| return postingsFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public final DocValuesFormat docValuesFormat() { | ||
| return docValuesFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public final KnnVectorsFormat knnVectorsFormat() { | ||
| return knnVectorsFormat; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the postings format that should be used for writing new segments of <code>field</code>. | ||
| * | ||
| * <p>The default implementation always returns "Lucene912". | ||
| * | ||
| * <p><b>WARNING:</b> if you subclass, you are responsible for index backwards compatibility: | ||
| * future version of Lucene are only guaranteed to be able to read the default implementation, | ||
| */ | ||
| public PostingsFormat getPostingsFormatForField(String field) { | ||
| return defaultPostingsFormat; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the docvalues format that should be used for writing new segments of <code>field</code> | ||
| * . | ||
| * | ||
| * <p>The default implementation always returns "Lucene912". | ||
| * | ||
| * <p><b>WARNING:</b> if you subclass, you are responsible for index backwards compatibility: | ||
| * future version of Lucene are only guaranteed to be able to read the default implementation. | ||
| */ | ||
| public DocValuesFormat getDocValuesFormatForField(String field) { | ||
| return defaultDVFormat; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the vectors format that should be used for writing new segments of <code>field</code> | ||
| * | ||
| * <p>The default implementation always returns "Lucene912". | ||
| * | ||
| * <p><b>WARNING:</b> if you subclass, you are responsible for index backwards compatibility: | ||
| * future version of Lucene are only guaranteed to be able to read the default implementation. | ||
| */ | ||
| public KnnVectorsFormat getKnnVectorsFormatForField(String field) { | ||
| return defaultKnnVectorsFormat; | ||
| } | ||
|
|
||
| } | ||
This file contains 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 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 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
1 change: 1 addition & 0 deletions
1
server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec
This file contains 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 |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| org.elasticsearch.index.codec.Elasticsearch814Codec | ||
| org.elasticsearch.index.codec.Elasticsearch816Codec | ||
| org.elasticsearch.index.codec.Elasticsearch900Codec | ||
| org.elasticsearch.index.codec.Elasticsearch900Lucene101Codec |
This file contains 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if it would make maintetance easier if we retrieved it from the wrapper
Lucene101Codecinstead of instantiating it manually here. Then we'd only need to update the delegate codec when Lucene bumps the codec, and not the postings/doc-values/knn-vectors formats.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, I wonder why we have not done that before. That can be applied to doc values format and knn vectors format too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. I think it's just a bit annoying because you don't want to use
getPostingsFormat()butgetPostingsFormatForField("some_ignored_field_name").