Fix CI #1760

Yury-Fridlyand · 2023-06-21T00:35:17Z

Description

In opensearch-project/OpenSearch#8035 some classes were moved from core to common-utils without renaming or changing hierarchy. In ml-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
updates mockito version in plugin (:opensearch-sql-plugin) to avoid conflicts between 5.2.0 and 5.4.0 versions. 5.4.0 comes from upstream.

Execution failed for task ':opensearch-sql-plugin:compileTestJava'.
> Could not resolve all dependencies for configuration ':opensearch-sql-plugin:testCompileClasspath'.
   > Conflict(s) found for the following module(s):
       - 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.

Issues Resolved

#1753

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: Yury-Fridlyand <yury.fridlyand@improving.com>

codecov · 2023-06-21T00:58:20Z

Codecov Report

Merging #1760 (66b98fd) into main (bb020ac) will not change coverage.
The diff coverage is n/a.

@@            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

Flag	Coverage Δ
sql-engine	`97.29% <ø> (ø)`

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

vmmusings · 2023-06-21T01:07:31Z

opensearch/build.gradle

@@ -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}"


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/

I just restarted CI on main it failed: https://github.com/opensearch-project/sql/actions/runs/5320847765/jobs/9655483529. So fix is still required.

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.

Right, perhaps snapshots was updated which makes this dependency unneeded. Reverted in 66b98fd.
Thank you for testing!

vmmusings · 2023-06-21T01:30:12Z

common-utils

Nothing got moved to common-utils. By common-utilsare you referring to this https://github.com/opensearch-project/common-utils?
I am trying to understand the root cause of the CI issue and how did the current PR changes fixed.

acarbonetto

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 <yury.fridlyand@improving.com>

penghuo

Thanks for the change!

* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit f6e2a97)

* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit f6e2a97) Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com>

* Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

…s upon project failure in startOpenSearch (#1763) * fixed buildgradle merge conflicts Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

…xt (#1779) * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com> * Fix CSV/RAW outputting wrong format (#279) * Fixed bug where CSV/RAW outputs as JSON rather than plain text Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com> Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

…xt (#1779) * Fix CI (#1760) * Fix ML-commons missing dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com> * Fix CSV/RAW outputting wrong format (#279) * Fixed bug where CSV/RAW outputs as JSON rather than plain text Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com> Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> (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 <yury.fridlyand@improving.com> * Fix `mockito` dependency. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> * Revert changes in `:opensearch` since it is not needed anymore. Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com> * Fix CSV/RAW outputting wrong format (#279) * Fixed bug where CSV/RAW outputs as JSON rather than plain text Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Matthew Wells <matthew.wells@improving.com> Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> (cherry picked from commit 1ec696d) * updated tests Signed-off-by: Matthew Wells <matthew.wells@improving.com> * updated tests to return name Signed-off-by: Matthew Wells <matthew.wells@improving.com> * changed tests to return value Signed-off-by: Matthew Wells <matthew.wells@improving.com> * removed unneeded imports Signed-off-by: Matthew Wells <matthew.wells@improving.com> --------- Signed-off-by: Matthew Wells <matthew.wells@improving.com>

Yury-Fridlyand added 2 commits June 20, 2023 16:00

Fix ML-commons missing dependency.

3956f6a

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Fix mockito dependency.

79cd2fb

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Yury-Fridlyand requested review from pjfitzgibbons, ps48, kavithacm, derek-ho, joshuali925, dai-chen, YANG-DB, rupal-bq, mengweieric, vmmusings, Swiddis, penghuo, seankao-az, MaxKsyunz, anirudha, forestmvey, acarbonetto and GumpacG as code owners June 21, 2023 00:35

vmmusings reviewed Jun 21, 2023

View reviewed changes

acarbonetto previously approved these changes Jun 21, 2023

View reviewed changes

forestmvey previously approved these changes Jun 21, 2023

View reviewed changes

GumpacG previously approved these changes Jun 21, 2023

View reviewed changes

vmmusings previously approved these changes Jun 21, 2023

View reviewed changes

Revert changes in :opensearch since it is not needed anymore.

66b98fd

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Yury-Fridlyand dismissed stale reviews from vmmusings and GumpacG via 66b98fd June 22, 2023 00:52

Yury-Fridlyand dismissed stale reviews from forestmvey and acarbonetto via 66b98fd June 22, 2023 00:52

Yury-Fridlyand mentioned this pull request Jun 22, 2023

Fix CSV/RAW outputting wrong format Bit-Quill/opensearch-project-sql#279

Merged

6 tasks

Yury-Fridlyand added the backport 2.x label Jun 22, 2023

MitchellGale approved these changes Jun 22, 2023

View reviewed changes

penghuo approved these changes Jun 22, 2023

View reviewed changes

derek-ho approved these changes Jun 22, 2023

View reviewed changes

matthewryanwells approved these changes Jun 22, 2023

View reviewed changes

Yury-Fridlyand merged commit f6e2a97 into opensearch-project:main Jun 22, 2023

Yury-Fridlyand deleted the fix-ci branch June 22, 2023 16:35

opensearch-trigger-bot bot mentioned this pull request Jun 22, 2023

[Backport 2.x] Fix CI #1766

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix CI #1760

Fix CI #1760

Yury-Fridlyand commented Jun 21, 2023 •

edited

Loading

codecov bot commented Jun 21, 2023 •

edited

Loading

vmmusings Jun 21, 2023 •

edited

Loading

Yury-Fridlyand Jun 21, 2023

penghuo Jun 21, 2023

Yury-Fridlyand Jun 22, 2023

vmmusings commented Jun 21, 2023

acarbonetto left a comment

penghuo left a comment

Fix CI #1760

Fix CI #1760

Conversation

Yury-Fridlyand commented Jun 21, 2023 • edited Loading

Description

Issues Resolved

Check List

codecov bot commented Jun 21, 2023 • edited Loading

Codecov Report

vmmusings Jun 21, 2023 • edited Loading

Choose a reason for hiding this comment

Yury-Fridlyand Jun 21, 2023

Choose a reason for hiding this comment

penghuo Jun 21, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jun 22, 2023

Choose a reason for hiding this comment

vmmusings commented Jun 21, 2023

acarbonetto left a comment

Choose a reason for hiding this comment

penghuo left a comment

Choose a reason for hiding this comment

Yury-Fridlyand commented Jun 21, 2023 •

edited

Loading

codecov bot commented Jun 21, 2023 •

edited

Loading

vmmusings Jun 21, 2023 •

edited

Loading