[Backport 0.7] Adding _source and schema merging to index_mappings #1155
Conversation
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
![opensearch-trigger-bot[bot]](https://avatars.githubusercontent.com/u/80134844?s=60&v=4){kind=small}
* Fix antlr4 parser issues (#1094) * Fix antlr4 parser issues Signed-off-by: Lantao Jin <ltjin@amazon.com> * Case insensitive lexer Signed-off-by: Lantao Jin <ltjin@amazon.com> * revert useless change Signed-off-by: Lantao Jin <ltjin@amazon.com> * remove tokens file Signed-off-by: Lantao Jin <ltjin@amazon.com> --------- Signed-off-by: Lantao Jin <ltjin@amazon.com> Signed-off-by: Kai Huang <ahkcs@amazon.com> * adding _source to index_mappings Signed-off-by: Kai Huang <ahkcs@amazon.com> * syntax fix Signed-off-by: Kai Huang <ahkcs@amazon.com> * Apply scalafmt Signed-off-by: Kai Huang <ahkcs@amazon.com> * Added index_mapping as an option in index.md, applied scalafmtAll Signed-off-by: Kai Huang <ahkcs@amazon.com> * improve readability Signed-off-by: Kai Huang <ahkcs@amazon.com> * Removed index_mappings from FlintMetaData.scala, Modified index.md Signed-off-by: Kai Huang <ahkcs@amazon.com> * removed indexMappingsSourceEnabled from FlintMetadata.scala Signed-off-by: Kai Huang <ahkcs@amazon.com> * removed indexMappingsSourceEnabled from FlintMetadata.scala Signed-off-by: Kai Huang <ahkcs@amazon.com> * removed indexMappingsSourceEnabled from FlintMetadata.scala Signed-off-by: Kai Huang <ahkcs@amazon.com> * Removed indexMappingsSourceEnabled from FlintMetadata.scala and removed unnecessary code Signed-off-by: Kai Huang <ahkcs@amazon.com> * Added some test cases to test serialzie() and fixed some formatting issues Signed-off-by: Kai Huang <ahkcs@amazon.com> * Added some test cases for FlintOpenSearchIndexMetadataServiceSuite.scala Signed-off-by: Kai Huang <ahkcs@amazon.com> * Added schema merging to index_mappings, added some test cases Signed-off-by: Kai Huang <ahkcs@amazon.com> * updated test cases Signed-off-by: Kai Huang <ahkcs@amazon.com> * Minor format fix Signed-off-by: Kai Huang <ahkcs@amazon.com> * minor fixes Signed-off-by: Kai Huang <ahkcs@amazon.com> * added nested schema merging logic, moved mergeSchema to serialize, updated test cases, fixed some minor issues Signed-off-by: Kai Huang <ahkcs@amazon.com> * updated some comments Signed-off-by: Kai Huang <ahkcs@amazon.com> * fixed some formatting issues based on the comments Signed-off-by: Kai Huang <ahkcs@amazon.com> * fixed syntax issue Signed-off-by: Kai Huang <ahkcs@amazon.com> * syntax issue Signed-off-by: Kai Huang <ahkcs@amazon.com> * syntax issue Signed-off-by: Kai Huang <ahkcs@amazon.com> * fixed the FlintSparkSkippingIndexITSuite Signed-off-by: Kai Huang <ahkcs@amazon.com> * fixing schema merging limitation Signed-off-by: Kai Huang <ahkcs@amazon.com> * less scala/java conversion Signed-off-by: Kai Huang <ahkcs@amazon.com> * style fix Signed-off-by: Kai Huang <ahkcs@amazon.com> * fix unnecessary casting Signed-off-by: Kai Huang <ahkcs@amazon.com> --------- Signed-off-by: Lantao Jin <ltjin@amazon.com> Signed-off-by: Kai Huang <ahkcs@amazon.com> Co-authored-by: Lantao Jin <ltjin@amazon.com> (cherry picked from commit 76d35e2) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot
bot
requested review from
dai-chen,
mengweieric,
penghuo,
seankao-az,
anirudha,
kaituo,
YANG-DB,
noCharger,
LantaoJin and
ykmr1224
as code owners
noCharger
approved these changes
May 13, 2025
dai-chen
approved these changes
May 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport 76d35e2 from #1101.