Skip to content

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Oct 6, 2025

Description

  • Added an ignorePrometheus flag to integration and doctest Gradle tasks so Prometheus startup and Prometheus-dependent tests are skipped whenever the property is present (unless explicitly set to false).
  • Adjusted doctest harness to drop Prometheus-specific documentation cases when the flag is active.
  • Updated developer docs (integration tests, doctest guide, Prometheus datasource section, describe command) to cover the new flag and cross-reference Prometheus metadata guidance.

Testing

./gradlew doctest -DignorePrometheus
./gradlew integTest -DignorePrometheus

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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: Peng Huo <penghuo@gmail.com>
Signed-off-by: Peng Huo <penghuo@gmail.com>
Signed-off-by: Peng Huo <penghuo@gmail.com>
Signed-off-by: Peng Huo <penghuo@gmail.com>
@penghuo penghuo added PPL Piped processing language documentation Improvements or additions to documentation labels Oct 6, 2025
@penghuo penghuo marked this pull request as ready for review October 6, 2025 21:19
@penghuo penghuo merged commit 344af4a into opensearch-project:main Oct 6, 2025
40 of 42 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 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 2.19
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.19
# Create a new branch
git switch --create backport/backport-4442-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 344af4aa85b0afccfd5903a325aa4423a1afd0e2
# Push it to GitHub
git push --set-upstream origin backport/backport-4442-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.19

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

@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-4442-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 344af4aa85b0afccfd5903a325aa4423a1afd0e2
# Push it to GitHub
git push --set-upstream origin backport/backport-4442-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-4442-to-2.19-dev.

@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-4442-to-2.19-dev
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 344af4aa85b0afccfd5903a325aa4423a1afd0e2
# Push it to GitHub
git push --set-upstream origin backport/backport-4442-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-4442-to-2.19-dev.

penghuo added a commit to penghuo/os-sql that referenced this pull request Oct 8, 2025
…ct#4442)

* Add ignorePrometheus flag

Signed-off-by: Peng Huo <penghuo@gmail.com>

* support -DignorePrometheus in integTest and docTest

Signed-off-by: Peng Huo <penghuo@gmail.com>

* Update

Signed-off-by: Peng Huo <penghuo@gmail.com>

* Update

Signed-off-by: Peng Huo <penghuo@gmail.com>

---------

Signed-off-by: Peng Huo <penghuo@gmail.com>
(cherry picked from commit 344af4a)
Signed-off-by: Peng Huo <penghuo@gmail.com>
@penghuo
Copy link
Collaborator Author

penghuo commented Oct 8, 2025

Backport PR, #4455

penghuo added a commit that referenced this pull request Oct 8, 2025
* Add ignorePrometheus flag



* support -DignorePrometheus in integTest and docTest



* Update



* Update



---------


(cherry picked from commit 344af4a)

Signed-off-by: Peng Huo <penghuo@gmail.com>
@LantaoJin LantaoJin added the backport-manually Filed a PR to backport manually. label Oct 9, 2025
asifabashar added a commit to asifabashar/sql that referenced this pull request Oct 10, 2025
* main-apple: (218 commits)
  Add ignorePrometheus Flag for integTest and docTest (opensearch-project#4442)
  Create fab-radar.yml
  PPL `fillnull` command enhancement (opensearch-project#4421)
  reverting to _doc + _id (opensearch-project#4435)
  Support `multisearch` command in calcite (opensearch-project#4332)
  Add 3.3 release notes (opensearch-project#4422) (opensearch-project#4423)
  [SQL/PPL] Fix the `count(*)` and `dc(field)` to be capped at MAX_INTEGER opensearch-project#4416 (opensearch-project#4418)
  Change the default search sort tiebreaker to `_shard_doc` for PIT search (opensearch-project#4378)
  [Enhancement] Add error handling for known limitation of sql `JOIN` (opensearch-project#4344)
  Bugfix: SQL type mapping for legacy JDBC output (opensearch-project#3613)
  Version bump: 3.3 (opensearch-project#4417)
  Add max/min eval functions (opensearch-project#4333)
  Support time modifiers in search command  (opensearch-project#4224)
  Fix numbered token bug and make it optional output in patterns command (opensearch-project#4402)
  refactor span (opensearch-project#4334)
  Move release notes categories (opensearch-project#3818)
  [Doc] Enable doctest with Calcite (opensearch-project#4379)
  Mod function should return decimal instead of float when handle the operands are decimal literal (opensearch-project#4407)
  Scale of decimal literal should always be positive in Calcite (opensearch-project#4401)
  Enable Calcite by default and implicit fallback the unsupported commands (opensearch-project#4372)
  ...
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. documentation Improvements or additions to documentation PPL Piped processing language

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants