Skip to content

Fix issue caused by merge in Analyzer.java#4214

Merged
Swiddis merged 1 commit intoopensearch-project:mainfrom
ykmr1224:fix-merge-issue
Sep 3, 2025
Merged

Fix issue caused by merge in Analyzer.java#4214
Swiddis merged 1 commit intoopensearch-project:mainfrom
ykmr1224:fix-merge-issue

Conversation

@ykmr1224
Copy link
Collaborator

@ykmr1224 ykmr1224 commented Sep 3, 2025

Description

Related Issues

n/a

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • New PPL command checklist all confirmed.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff or -s.
  • Public documentation issue/PR created.

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.

Signed-off-by: Tomoyuki Morita <moritato@amazon.com>
@Swiddis Swiddis enabled auto-merge (squash) September 3, 2025 17:38
@Swiddis Swiddis merged commit e0ffeea into opensearch-project:main Sep 3, 2025
20 of 27 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19-dev failed:

The process '/usr/bin/git' failed with exit code 128

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-dev

Then, create a pull request where the base branch is 2.19-dev and the compare/head branch is backport/backport-4214-to-2.19-dev.

@ykmr1224
Copy link
Collaborator Author

ykmr1224 commented Sep 3, 2025

backport after #4150

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19-dev failed:

The process '/usr/bin/git' failed with exit code 128

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-dev

Then, create a pull request where the base branch is 2.19-dev and the compare/head branch is backport/backport-4214-to-2.19-dev.

@ykmr1224
Copy link
Collaborator Author

ykmr1224 commented Sep 3, 2025

#4083 have not backported to 2.19-dev, and that is causing backport failure.

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>
@ykmr1224
Copy link
Collaborator Author

ykmr1224 commented Sep 3, 2025

This change is backported by #4218

@ykmr1224 ykmr1224 added the backport-manually Filed a PR to backport manually. label Sep 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.19-dev backport-failed backport-manually Filed a PR to backport manually. maintenance Improves code quality, but not the product

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants