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

Make models free of XContent #2677

Merged
merged 2 commits into from
May 17, 2024

Conversation

ykmr1224
Copy link
Collaborator

Description

  • Extract XContent (OpenSearch index specific) logic out of model classes.

Issues Resolved

n/a

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.

Signed-off-by: Tomoyuki Morita <[email protected]>
seankao-az
seankao-az previously approved these changes May 16, 2024
Copy link
Collaborator

@seankao-az seankao-az left a comment

Choose a reason for hiding this comment

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

LGTM


package org.opensearch.sql.spark.execution.statestore;

public interface CopyBuilder<T> {
Copy link
Collaborator

Choose a reason for hiding this comment

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

add doc.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed

StatementState.RUNNING.getState(),
StatementState.WAITING.getState())));
}

@SuppressWarnings("unchecked")
private <T extends StateModel> XContentSerializer<T> getXContentSerializer(T st) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

XContentSerializer still depend on OpenSearch library?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm not quite sure the intention of the question, but XContentSerializer is more on OpenSearch side since the XContent is OpenSearch specific content serialization. It won't be used for non-opensearch environment.

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

@penghuo penghuo left a comment

Choose a reason for hiding this comment

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

Thx!

@ykmr1224 ykmr1224 merged commit 2c849f7 into opensearch-project:main May 17, 2024
20 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-2677-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 2c849f76876a8a0422debb0e0f905a9ee81c9990
# Push it to GitHub
git push --set-upstream origin backport/backport-2677-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-2677-to-2.x.

ykmr1224 added a commit that referenced this pull request May 20, 2024
* Make models free of XContent

Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit afec315)

* Add comments

Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit 2c849f7)
@ykmr1224 ykmr1224 deleted the dqs/refactor-state-models branch May 24, 2024 15:13
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