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 a version filter to enable bwc in 2.12 #1944

Merged
merged 4 commits into from
Jan 31, 2024

Conversation

b4sjoo
Copy link
Collaborator

@b4sjoo b4sjoo commented Jan 29, 2024

Description

This will fix the breaking change introduced by 2.11

Issues Resolved

This will partly resolved #1838

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc 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.

@b4sjoo b4sjoo had a problem deploying to ml-commons-cicd-env January 29, 2024 07:37 — with GitHub Actions Failure
@b4sjoo b4sjoo had a problem deploying to ml-commons-cicd-env January 29, 2024 07:37 — with GitHub Actions Failure
@b4sjoo b4sjoo changed the title Description This will fix the breaking change introduced by 2.11 Issues Resolved This will partly resolved #1838 Add a version filter to enable bwc in 2.12 Jan 29, 2024
@b4sjoo b4sjoo had a problem deploying to ml-commons-cicd-env January 29, 2024 07:42 — with GitHub Actions Failure
@b4sjoo b4sjoo had a problem deploying to ml-commons-cicd-env January 29, 2024 07:43 — with GitHub Actions Failure
@@ -530,7 +530,7 @@ private void indexRemoteModel(
.build();

IndexRequest indexModelMetaRequest = new IndexRequest(ML_MODEL_INDEX);
if (registerModelInput.getIsHidden()) {
if (registerModelInput.getIsHidden() != null && registerModelInput.getIsHidden()) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Check if any other places using registerModelInput.getIsHidden() and add null checking?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Found another one, added.

@ylwu-amzn
Copy link
Collaborator

* What went wrong:
Execution failed for task ':opensearch-ml-plugin:spotlessJavaCheck'.
> The following files had format violations:
      src/main/java/org/opensearch/ml/model/MLModelManager.java
          @@ -530,7 +530,7 @@
           ????????????????????.build();
           
           ????????????????IndexRequest?indexModelMetaRequest?=?new?IndexRequest(ML_MODEL_INDEX);
          -????????????????if?(registerModelInput.getIsHidden()?!=?null?&&?registerModelInput.getIsHidden())??{
          +????????????????if?(registerModelInput.getIsHidden()?!=?null?&&?registerModelInput.getIsHidden())?{
           ????????????????????indexModelMetaRequest.id(modelName);

@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 29, 2024 21:23 — with GitHub Actions Inactive
@b4sjoo b4sjoo had a problem deploying to ml-commons-cicd-env January 29, 2024 21:23 — with GitHub Actions Failure
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 29, 2024 21:23 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 29, 2024 21:23 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 29, 2024 21:23 — with GitHub Actions Inactive
Signed-off-by: Sicheng Song <[email protected]>
@b4sjoo b4sjoo had a problem deploying to ml-commons-cicd-env January 31, 2024 00:46 — with GitHub Actions Failure
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 00:46 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 00:46 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 00:46 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 00:46 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 01:14 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 01:14 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 01:14 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo temporarily deployed to ml-commons-cicd-env January 31, 2024 18:06 — with GitHub Actions Inactive
@b4sjoo b4sjoo merged commit 826b64e into opensearch-project:2.x Jan 31, 2024
14 of 15 checks passed
b4sjoo added a commit to b4sjoo/ml-commons that referenced this pull request Feb 3, 2024
b4sjoo added a commit that referenced this pull request Feb 3, 2024
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Mar 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants