Skip to content

Fixing string format change#1943

Merged
acarbonetto merged 1 commit intoopensearch-project:mainfrom
Bit-Quill:integ/StringFormat_fix
Aug 9, 2023
Merged

Fixing string format change#1943
acarbonetto merged 1 commit intoopensearch-project:mainfrom
Bit-Quill:integ/StringFormat_fix

Conversation

@MitchellGale
Copy link
Copy Markdown
Contributor

Description

Fix changes in regards to this PR opensearch-project/OpenSearch#9127 with breaking changes.

Changes imports to include new path inside core. Update calls to toString.

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

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.

* Fixing strings change from main OS repo.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Fixing issues.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Fixing changed syntax to toStirng.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Fixing changed syntax to toStirng.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* add tosttring fix to RestSQLQueryActionCursorFallbackTest

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* added unused function

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 8, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.42%. Comparing base (d144706) to head (4f7547c).
Report is 511 commits behind head on main.

❌ Your project status has failed because the head coverage (97.42%) is below the target coverage (99.00%). You can increase the head coverage or adjust the target coverage.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #1943   +/-   ##
=========================================
  Coverage     97.42%   97.42%           
  Complexity     4647     4647           
=========================================
  Files           408      408           
  Lines         11526    11526           
  Branches        839      839           
=========================================
  Hits          11229    11229           
  Misses          290      290           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.42% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown
Collaborator

@acarbonetto acarbonetto left a comment

Choose a reason for hiding this comment

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

LGTM

@acarbonetto acarbonetto merged commit 88f36bd into opensearch-project:main Aug 9, 2023
@acarbonetto acarbonetto deleted the integ/StringFormat_fix branch August 9, 2023 15:59
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1943-to-2.x.

@opensearch-trigger-bot opensearch-trigger-bot bot added the backport-manually Filed a PR to backport manually. label Aug 9, 2023
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
* Fixing strings change from main OS repo.

* Fixing issues.

* Fixing changed syntax to toStirng.

* Fixing changed syntax to toStirng.

* add tosttring fix to RestSQLQueryActionCursorFallbackTest

* added unused function

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@LantaoJin LantaoJin added backport-failed and removed backport-manually Filed a PR to backport manually. labels Jul 22, 2025
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.

6 participants