-
Notifications
You must be signed in to change notification settings - Fork 141
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
Fix CI #1760
Fix CI #1760
Conversation
Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #1760 +/- ##
=========================================
Coverage 97.29% 97.29%
Complexity 4408 4408
=========================================
Files 388 388
Lines 10944 10944
Branches 774 774
=========================================
Hits 10648 10648
Misses 289 289
Partials 7 7
Flags with carried forward coverage won't be shown. Click here to find out more. |
opensearch/build.gradle
Outdated
@@ -39,6 +39,7 @@ dependencies { | |||
implementation group: 'org.json', name: 'json', version:'20230227' | |||
compileOnly group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}" | |||
implementation group: 'org.opensearch', name:'opensearch-ml-client', version: "${opensearch_build}" | |||
implementation group: 'org.opensearch', name: 'common-utils', version: "${opensearch_build}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did this fix the NoClassDef error?
Or it automatically got fixed after the latest changes got pushed to sonatype snaphot repo. https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just restarted CI on main
it failed: https://github.com/opensearch-project/sql/actions/runs/5320847765/jobs/9655483529. So fix is still required.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-run the CI, only see the following errors. Does common-utils necessary?
Execution failed for task ':opensearch-sql-plugin:compileTestJava'.
AstExpressionBuilderTest > canBuildArithmeticExpressionPrecedence() PASSED
> Could not resolve all dependencies for configuration ':opensearch-sql-plugin:testCompileClasspath'.
> Conflict(s) found for the following module(s):
AstExpressionBuilderTest > canBuildComparisonExpression() PASSED
- org.mockito:mockito-core between versions 5.4.0 and 5.2.0
Run with:
--scan or
:opensearch-sql-plugin:dependencyInsight --configuration testCompileClasspath --dependency org.mockito:mockito-core
to get more insight on how to solve the conflict.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, perhaps snapshots was updated which makes this dependency unneeded. Reverted in 66b98fd.
Thank you for testing!
Nothing got moved to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding more dependencies makes me not happy, but I suppose it's for a good cause (breaking up the monolithic core library).
Signed-off-by: Yury-Fridlyand <[email protected]>
66b98fd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the change!
* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> (cherry picked from commit f6e2a97)
* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> (cherry picked from commit f6e2a97) Co-authored-by: Yury-Fridlyand <[email protected]>
* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]>
* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]>
* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]>
…s upon project failure in startOpenSearch (#1763) * fixed buildgradle merge conflicts Signed-off-by: Mitchell Gale <[email protected]> * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Mitchell Gale <[email protected]> Signed-off-by: Yury-Fridlyand <[email protected]> Co-authored-by: Yury-Fridlyand <[email protected]>
…xt (#1779) * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]> * Fix CSV/RAW outputting wrong format (#279) * Fixed bug where CSV/RAW outputs as JSON rather than plain text Signed-off-by: Matthew Wells <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]> Co-authored-by: Yury-Fridlyand <[email protected]>
…xt (#1779) * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]> * Fix CSV/RAW outputting wrong format (#279) * Fixed bug where CSV/RAW outputs as JSON rather than plain text Signed-off-by: Matthew Wells <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]> Co-authored-by: Yury-Fridlyand <[email protected]> (cherry picked from commit 1ec696d)
* Fix CSV/RAW output header being application/json rather than plain/text (#1779) * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <[email protected]> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]> * Fix CSV/RAW outputting wrong format (#279) * Fixed bug where CSV/RAW outputs as JSON rather than plain text Signed-off-by: Matthew Wells <[email protected]> --------- Signed-off-by: Yury-Fridlyand <[email protected]> Signed-off-by: Matthew Wells <[email protected]> Co-authored-by: Yury-Fridlyand <[email protected]> (cherry picked from commit 1ec696d) * updated tests Signed-off-by: Matthew Wells <[email protected]> * updated tests to return name Signed-off-by: Matthew Wells <[email protected]> * changed tests to return value Signed-off-by: Matthew Wells <[email protected]> * removed unneeded imports Signed-off-by: Matthew Wells <[email protected]> --------- Signed-off-by: Matthew Wells <[email protected]>
Description
In opensearch-project/OpenSearch#8035 some classes were moved from
core
tocommon-utils
without renaming or changing hierarchy. Inml-commons
in opensearch-project/ml-commons#993 a new dependency was added to keep things up to date, but the same dependency should be added in SQL plugin as well.This fix adds:
common-utils
dependency to:opensearch
mockito
version inplugin
(:opensearch-sql-plugin
) to avoid conflicts between 5.2.0 and 5.4.0 versions. 5.4.0 comes from upstream.Issues Resolved
#1753
Check List
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.