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

Add query, langType, status, error in AsyncQueryJobMetadata #2958

Merged
merged 6 commits into from
Sep 9, 2024

Conversation

ykmr1224
Copy link
Collaborator

Description

Related Issues

opensearch-project/opensearch-spark#602

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • 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.

Copy link
Member

@vamsi-amazon vamsi-amazon left a comment

Choose a reason for hiding this comment

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

LGTM

vamsi-amazon
vamsi-amazon previously approved these changes Sep 4, 2024
seankao-az
seankao-az previously approved these changes Sep 4, 2024
seankao-az
seankao-az previously approved these changes Sep 4, 2024
# Conflicts:
#	async-query-core/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryCoreIntegTest.java
Signed-off-by: Tomoyuki Morita <[email protected]>
vamsi-amazon
vamsi-amazon previously approved these changes Sep 6, 2024
seankao-az
seankao-az previously approved these changes Sep 6, 2024
@ykmr1224 ykmr1224 merged commit 1b1a1b5 into opensearch-project:main Sep 9, 2024
13 of 14 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-2958-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1b1a1b5e97def94504a75ffaedbd5d72ffc9614a
# Push it to GitHub
git push --set-upstream origin backport/backport-2958-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-2958-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 9, 2024
* Add query, langType, status, error in AsyncQueryJobMetadata

Signed-off-by: Tomoyuki Morita <[email protected]>

* Fix test

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>
Signed-off-by: Tomoyuki MORITA <[email protected]>
(cherry picked from commit 1b1a1b5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
ykmr1224 pushed a commit that referenced this pull request Sep 9, 2024
…3003)

* Add query, langType, status, error in AsyncQueryJobMetadata



* Fix test



---------



(cherry picked from commit 1b1a1b5)

Signed-off-by: Tomoyuki Morita <[email protected]>
Signed-off-by: Tomoyuki MORITA <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@ykmr1224 ykmr1224 deleted the dqs/add-query-status branch September 9, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport-failed maintenance Improves code quality, but not the product
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants