-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Adding support for derive source feature and implementing it for various type of field mappers #17759
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
shwetathareja
merged 13 commits into
opensearch-project:main
from
tanik98:tanik-derived-source-feature
May 8, 2025
Merged
Adding support for derive source feature and implementing it for various type of field mappers #17759
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
639b436
Adding support for derive source feature and implementing it for some…
tanik98 1089715
Addressing the comments
tanik98 2f13824
Addressing the comments and fixing the interface for unsupported fiel…
tanik98 7212468
Enforcing implementation of DerivedFieldGenerator at a Mapper level
tanik98 568527f
Removing support of sub keyword field from TextFieldMapper for derive…
tanik98 4d9d884
Merge branch 'opensearch-project:main' into tanik-derived-source-feature
tanik98 c932279
Modifying changelog
tanik98 07dfd6b
Merge branch 'main' into tanik-derived-source-feature
tanik98 349eb14
Moving generic validations under common methods in FieldMapper
tanik98 827d5b7
Fixing NumberFieldMapper in terms of Long and Unsigned Long
tanik98 a28c1ba
Handling date_nanos field type and addressing the comments
tanik98 0e81c7a
Merge branch 'main' into tanik-derived-source-feature
tanik98 51909c7
Removing nextOrd() call and directly traversing over valid range for …
tanik98 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
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
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
61 changes: 61 additions & 0 deletions
61
server/src/main/java/org/opensearch/index/mapper/DerivedFieldGenerator.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,61 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.index.mapper; | ||
|
|
||
| import org.apache.lucene.index.LeafReader; | ||
| import org.opensearch.core.xcontent.XContentBuilder; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * DerivedSourceGenerator is used to generate derived source field based on field mapping and how | ||
| * it is stored in lucene | ||
| */ | ||
| public class DerivedFieldGenerator { | ||
|
|
||
| private final MappedFieldType mappedFieldType; | ||
| private final FieldValueFetcher fieldValueFetcher; | ||
|
|
||
| public DerivedFieldGenerator( | ||
| MappedFieldType mappedFieldType, | ||
| FieldValueFetcher docValuesFetcher, | ||
| FieldValueFetcher storedFieldFetcher | ||
shwetathareja marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ) { | ||
| this.mappedFieldType = mappedFieldType; | ||
| if (Objects.requireNonNull(getDerivedFieldPreference()) == FieldValueType.DOC_VALUES) { | ||
| assert docValuesFetcher != null; | ||
| this.fieldValueFetcher = docValuesFetcher; | ||
| } else { | ||
| assert storedFieldFetcher != null; | ||
| this.fieldValueFetcher = storedFieldFetcher; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Get the preference of the derived field based on field mapping, should be overridden at a FieldMapper to | ||
| * alter the preference of derived field | ||
| */ | ||
| public FieldValueType getDerivedFieldPreference() { | ||
bugmakerrrrrr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (mappedFieldType.hasDocValues()) { | ||
| return FieldValueType.DOC_VALUES; | ||
| } | ||
| return FieldValueType.STORED; | ||
| } | ||
|
|
||
| /** | ||
| * Generate the derived field value based on the preference of derived field and field value type | ||
| * @param builder - builder to store the derived source filed | ||
| * @param reader - leafReader to read data from | ||
| * @param docId - docId for which we want to generate the source | ||
| */ | ||
| public void generate(XContentBuilder builder, LeafReader reader, int docId) throws IOException { | ||
| fieldValueFetcher.write(builder, fieldValueFetcher.fetch(reader, docId)); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.