Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporary fixes for build errors #2476

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Conversation

vmmusings
Copy link
Member

@vmmusings vmmusings commented Jan 25, 2024

Description

Issues Resolved

[List any issues this PR will resolve]

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.

Copy link

codecov bot commented Jan 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6f30aea) 95.41% compared to head (f476f92) 95.41%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #2476   +/-   ##
=========================================
  Coverage     95.41%   95.41%           
  Complexity     5000     5000           
=========================================
  Files           479      479           
  Lines         13950    13950           
  Branches        937      937           
=========================================
  Hits          13310    13310           
  Misses          618      618           
  Partials         22       22           
Flag Coverage Δ
sql-engine 95.41% <ø> (ø)

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.

@noCharger
Copy link
Collaborator

Thanks Vamsi, just wanna link this fix to the issue for tracking #2468

YANG-DB
YANG-DB previously approved these changes Jan 25, 2024
Copy link
Collaborator

@noCharger noCharger left a comment

Choose a reason for hiding this comment

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

Overall looks good. Thanks Vamsi

@@ -26,6 +26,7 @@ skippingIndexStatement
| refreshSkippingIndexStatement
| describeSkippingIndexStatement
| dropSkippingIndexStatement
| vacuumSkippingIndexStatement
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do we need to update .g4?

Copy link
Member Author

Choose a reason for hiding this comment

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

These g4 files come from opensearch-spark. We always keep them up to date.

@vmmusings vmmusings merged commit 6fcf31b into opensearch-project:main Jan 25, 2024
20 of 22 checks passed
@opensearch-trigger-bot
Copy link
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-2476-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6fcf31b7dc4a9a1a80a1e95c30fc7e72408e7812
# Push it to GitHub
git push --set-upstream origin backport/backport-2476-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-2476-to-2.x.

vmmusings added a commit that referenced this pull request Jan 25, 2024
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit 6fcf31b)
vmmusings added a commit that referenced this pull request Jan 25, 2024
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit 6fcf31b)
vmmusings added a commit that referenced this pull request Jan 25, 2024
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit 6fcf31b)
vmmusings added a commit that referenced this pull request Jan 25, 2024
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit 6fcf31b)
vmmusings added a commit that referenced this pull request Jan 25, 2024
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit 6fcf31b)
vmmusings added a commit that referenced this pull request Jan 29, 2024
Signed-off-by: Vamsi Manohar <[email protected]>
(cherry picked from commit 6fcf31b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants