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

Address build failures #1366

Merged
merged 7 commits into from
Mar 3, 2023
Merged

Conversation

MaxKsyunz
Copy link
Collaborator

Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

Check List

  • 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: MaxKsyunz <[email protected]>
@MaxKsyunz MaxKsyunz requested a review from a team as a code owner February 22, 2023 08:49
@MaxKsyunz
Copy link
Collaborator Author

SQL Java CI still fails because ml-commons needs to be updated first. See opensearch-project/ml-commons#741

acarbonetto
acarbonetto previously approved these changes Feb 22, 2023
Copy link
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! Thanks Max

rupal-bq
rupal-bq previously approved these changes Feb 22, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Feb 22, 2023
Copy link
Collaborator

@Yury-Fridlyand Yury-Fridlyand left a comment

Choose a reason for hiding this comment

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

I propose to wait for ml-commons, then restart CI, then merge.

YANG-DB
YANG-DB previously approved these changes Feb 22, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Feb 22, 2023
acarbonetto
acarbonetto previously approved these changes Feb 22, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 24, 2023

Codecov Report

Merging #1366 (4b8f946) into main (b826835) will decrease coverage by 1.58%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main    #1366      +/-   ##
============================================
- Coverage     99.96%   98.38%   -1.58%     
- Complexity     2464     3693    +1229     
============================================
  Files           220      343     +123     
  Lines          5833     9107    +3274     
  Branches        359      585     +226     
============================================
+ Hits           5831     8960    +3129     
- Misses            2      142     +140     
- Partials          0        5       +5     
Flag Coverage Δ
sql-engine 98.38% <ø> (-1.58%) ⬇️

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

Impacted Files Coverage Δ
...ch/sql/opensearch/client/OpenSearchRestClient.java 100.00% <0.00%> (ø)
.../filter/lucene/relevance/MatchBoolPrefixQuery.java 100.00% <0.00%> (ø)
...earch/storage/script/filter/lucene/RangeQuery.java 100.00% <0.00%> (ø)
...ch/sql/opensearch/response/OpenSearchResponse.java 100.00% <0.00%> (ø)
...ggregation/ExpressionAggregationScriptFactory.java 100.00% <0.00%> (ø)
...ch/sql/opensearch/planner/physical/ADOperator.java 0.00% <0.00%> (ø)
.../org/opensearch/sql/ppl/utils/ArgumentFactory.java 100.00% <0.00%> (ø)
...pensearch/sql/ppl/parser/AstExpressionBuilder.java 100.00% <0.00%> (ø)
...rch/planner/physical/MLCommonsOperatorActions.java 67.36% <0.00%> (ø)
...arch/sql/opensearch/response/agg/FilterParser.java 100.00% <0.00%> (ø)
... and 113 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

MaxKsyunz added 2 commits March 2, 2023 01:26
It is still used in the opensearch project. So add it back in case some
opensearch-sepcific dependency ends up their.

Signed-off-by: MaxKsyunz <[email protected]>
@Yury-Fridlyand
Copy link
Collaborator

2023-03-02T23:07:52.3208450Z [ant:checkstyle] [ERROR] /Users/runner/work/sql/sql/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java:25:1: Wrong lexicographical order for 'org.opensearch.common.xcontent.XContentType' import. Should be before 'org.opensearch.core.xcontent.XContentParser'. [CustomImportOrder]
2023-03-02T23:07:52.3209720Z 
2023-03-02T23:07:52.3219040Z > Task :opensearch-sql-plugin:checkstyleMain FAILED

MaxKsyunz added 2 commits March 2, 2023 18:11
Signed-off-by: MaxKsyunz <[email protected]>
Signed-off-by: MaxKsyunz <[email protected]>
@MaxKsyunz MaxKsyunz merged commit cd95bc5 into opensearch-project:main Mar 3, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1366-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 cd95bc54140efbf8fc60932249f645dc581260e5
# Push it to GitHub
git push --set-upstream origin backport/backport-1366-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

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

@dai-chen dai-chen added the infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. label Mar 3, 2023
@Yury-Fridlyand
Copy link
Collaborator

I think no backport to 2.x is needed.

GumpacG pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 6, 2023
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <[email protected]>
@acarbonetto acarbonetto deleted the build-fix-xcore branch March 7, 2023 14:51
matthewryanwells pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 7, 2023
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <[email protected]>
acarbonetto pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 7, 2023
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <[email protected]>
matthewryanwells pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 10, 2023
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <[email protected]>
Signed-off-by: Matthew Wells <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 29, 2023
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <[email protected]>
(cherry picked from commit cd95bc5)
MaxKsyunz pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Mar 29, 2023
Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

---------

Signed-off-by: MaxKsyunz <[email protected]>
(cherry picked from commit cd95bc5)
Yury-Fridlyand pushed a commit that referenced this pull request Mar 29, 2023
* Address build failures (#1366)

Xcontent classes were moved in this PR opensearch-project/OpenSearch#5902 causing builds to fail.

Signed-off-by: MaxKsyunz <[email protected]>
penghuo added a commit to penghuo/os-sql that referenced this pull request Apr 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants