Fix issue caused by merge in Analyzer.java#4214
Merged
Swiddis merged 1 commit intoopensearch-project:mainfrom Sep 3, 2025
Merged
Fix issue caused by merge in Analyzer.java#4214Swiddis merged 1 commit intoopensearch-project:mainfrom
Swiddis merged 1 commit intoopensearch-project:mainfrom
Conversation
Signed-off-by: Tomoyuki Morita <moritato@amazon.com>
ahkcs
approved these changes
Sep 3, 2025
Swiddis
approved these changes
Sep 3, 2025
dai-chen
approved these changes
Sep 3, 2025
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.19-dev 2.19-dev
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.19-dev
# Create a new branch
git switch --create backport/backport-4214-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e0ffeea9f8d0e40420513f56e722496d13e5cf68
# Push it to GitHub
git push --set-upstream origin backport/backport-4214-to-2.19-dev
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.19-devThen, create a pull request where the |
Collaborator
Author
|
backport after #4150 |
Merged
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.19-dev 2.19-dev
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.19-dev
# Create a new branch
git switch --create backport/backport-4214-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e0ffeea9f8d0e40420513f56e722496d13e5cf68
# Push it to GitHub
git push --set-upstream origin backport/backport-4214-to-2.19-dev
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.19-devThen, create a pull request where the |
7 tasks
Collaborator
Author
|
#4083 have not backported to 2.19-dev, and that is causing backport failure. |
8 tasks
RyanL1997
pushed a commit
to RyanL1997/sql
that referenced
this pull request
Sep 3, 2025
Signed-off-by: Tomoyuki Morita <moritato@amazon.com>
ykmr1224
added a commit
that referenced
this pull request
Sep 3, 2025
* [Feature] Implementation of `regex` Command In PPL (#4083) * implement regex cmd with calcite support by suing java library Signed-off-by: Jialiang Liang <jiallian@amazon.com> * code hygiene fix Signed-off-by: Jialiang Liang <jiallian@amazon.com> * comment clean up Signed-off-by: Jialiang Liang <jiallian@amazon.com> * implement explain it Signed-off-by: Jialiang Liang <jiallian@amazon.com> * disable regex when calcite is disable and add a test in analyzer Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix spotless check Signed-off-by: Jialiang Liang <jiallian@amazon.com> * [refactor] refactor some regex fn into a util class for re-usage Signed-off-by: Jialiang Liang <jiallian@amazon.com> * [refactor] revert filter query builder cuz we do not need it anymore Signed-off-by: Jialiang Liang <jiallian@amazon.com> * add rst docs for regex cmd Signed-off-by: Jialiang Liang <jiallian@amazon.com> * add IT for regex cmd Signed-off-by: Jialiang Liang <jiallian@amazon.com> * add IT for calcite no pushdown Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix regex exp behavior for non string val Signed-off-by: Jialiang Liang <jiallian@amazon.com> * style - remove some verbose comments Signed-off-by: Jialiang Liang <jiallian@amazon.com> * remove string convertion Signed-off-by: Jialiang Liang <jiallian@amazon.com> * use existing operator of REGEXP_CONTAINS Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix integ test of rgex with pushdown after operator commit Signed-off-by: Jialiang Liang <jiallian@amazon.com> * remove some verbose comments and fix some style Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix explain it in no pushdown Signed-off-by: Jialiang Liang <jiallian@amazon.com> * comment - remove unused fn for string converting Signed-off-by: Jialiang Liang <jiallian@amazon.com> * remove duplicated regex match operator alias Signed-off-by: Jialiang Liang <jiallian@amazon.com> * unit test - initail commit Signed-off-by: Jialiang Liang <jiallian@amazon.com> * anonymizer with test Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix spotlessApply Signed-off-by: Jialiang Liang <jiallian@amazon.com> * add cross cluster IT Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix spotless apply Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - fix operator constant Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - fix regex java doc Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - field and pattern handling fix Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - fix LRUCache Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - remove unnecessary delegation layer Signed-off-by: Jialiang Liang <jiallian@amazon.com> * rst doc fix Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - fix comments Signed-off-by: Jialiang Liang <jiallian@amazon.com> * DEFAULT FIELD related change Signed-off-by: Jialiang Liang <jiallian@amazon.com> * DEFAULT FIELD - fix anonymizer tests Signed-off-by: Jialiang Liang <jiallian@amazon.com> * tomo - add unit test for regex util class Signed-off-by: Jialiang Liang <jiallian@amazon.com> * chen - remove code for legacy engine Signed-off-by: Jialiang Liang <jiallian@amazon.com> * chen - remove stalled logic for spcified field Signed-off-by: Jialiang Liang <jiallian@amazon.com> * chen - merge into 1 grammar in parser Signed-off-by: Jialiang Liang <jiallian@amazon.com> * properly handle non-string field Signed-off-by: Jialiang Liang <jiallian@amazon.com> * remove verbose comments Signed-off-by: Jialiang Liang <jiallian@amazon.com> * remove verbose comments Signed-off-by: Jialiang Liang <jiallian@amazon.com> * address commetns Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix doc test for regex Signed-off-by: Jialiang Liang <jiallian@amazon.com> * fix doc Signed-off-by: Jialiang Liang <jiallian@amazon.com> --------- Signed-off-by: Jialiang Liang <jiallian@amazon.com> * Fix merge issue (#4214) Signed-off-by: Tomoyuki Morita <moritato@amazon.com> * Fix AnalyzerTest (#4215) Signed-off-by: Tomoyuki Morita <moritato@amazon.com> --------- Signed-off-by: Jialiang Liang <jiallian@amazon.com> Signed-off-by: Tomoyuki Morita <moritato@amazon.com> Co-authored-by: Tomoyuki MORITA <moritato@amazon.com>
Collaborator
Author
|
This change is backported by #4218 |
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
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.
Description
Related Issues
n/a
Check List
--signoffor-s.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.