Skip to content

Fix search anoymizer only#4783

Merged
yuancu merged 12 commits intoopensearch-project:mainfrom
xinyual:fixSearchAnoymizerOnly
Nov 21, 2025
Merged

Fix search anoymizer only#4783
yuancu merged 12 commits intoopensearch-project:mainfrom
xinyual:fixSearchAnoymizerOnly

Conversation

@xinyual
Copy link
Copy Markdown
Contributor

@xinyual xinyual commented Nov 12, 2025

Description

The pr fix the PPLQueryDataAnonymizer's bug about search command.

Related Issues

Resolves #4290

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: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
yuancu
yuancu previously approved these changes Nov 18, 2025
Signed-off-by: xinyual <xinyual@amazon.com>
yuancu
yuancu previously approved these changes Nov 18, 2025
Comment on lines +909 to +910
"source=table (identifier >= *** OR identifier <= ***)",
anonymize("search source=t earliest='2012-12-10 15:00:00' or latest=now"));
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's odd that the = anonymized to >= and <=. It changes the semantic IMO.

Copy link
Copy Markdown
Member

@LantaoJin LantaoJin Nov 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to such as time_identifier?
For meta fields such as _id, _doc etc, how about anonymize to meta_identifier?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already add time_identifier with meta_identifier. Please check it.

Signed-off-by: xinyual <xinyual@amazon.com>
Signed-off-by: xinyual <xinyual@amazon.com>
@yuancu yuancu merged commit a8069d1 into opensearch-project:main Nov 21, 2025
35 checks passed
@opensearch-trigger-bot
Copy link
Copy Markdown
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-4783-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a8069d18a360396594d4c47e672babc56a21a2fa
# Push it to GitHub
git push --set-upstream origin backport/backport-4783-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-4783-to-2.19-dev.

@LantaoJin LantaoJin added the backport-manually Filed a PR to backport manually. label Nov 21, 2025
asifabashar pushed a commit to asifabashar/sql that referenced this pull request Dec 10, 2025
* fix anoymizer for search command

Signed-off-by: xinyual <xinyual@amazon.com>

* pushdown match when only one equal in search command

Signed-off-by: xinyual <xinyual@amazon.com>

* fix regex case

Signed-off-by: xinyual <xinyual@amazon.com>

* fix UT

Signed-off-by: xinyual <xinyual@amazon.com>

* fix UT

Signed-off-by: xinyual <xinyual@amazon.com>

* revert match change

Signed-off-by: xinyual <xinyual@amazon.com>

* fix UT by ignore the expression

Signed-off-by: xinyual <xinyual@amazon.com>

* remove useless change and resolve comment

Signed-off-by: xinyual <xinyual@amazon.com>

* remove useless change and resolve comment

Signed-off-by: xinyual <xinyual@amazon.com>

* add test cases for metadata and timestamp identifier

Signed-off-by: xinyual <xinyual@amazon.com>

* change name

Signed-off-by: xinyual <xinyual@amazon.com>

---------

Signed-off-by: xinyual <xinyual@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] PPLAnonymizer logging is not logging the exact user given search command.

3 participants