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

Fix plugin compilation #1580

Merged
merged 3 commits into from
Apr 26, 2023
Merged

Conversation

GumpacG
Copy link
Collaborator

@GumpacG GumpacG commented Apr 25, 2023

Description

Fixed the build due to upstream refactors (opensearch-project/OpenSearch#7301).
Gradle version update to accommodate for opensearch-project/OpenSearch#7286 and referred to
FasterXML/jackson-core#955 (comment) and #1584

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.

@codecov-commenter
Copy link

codecov-commenter commented Apr 25, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.16%. Comparing base (4522422) to head (c7003d5).
Report is 347 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #1580   +/-   ##
=========================================
  Coverage     97.16%   97.16%           
  Complexity     4116     4116           
=========================================
  Files           371      371           
  Lines         10365    10365           
  Branches        704      704           
=========================================
  Hits          10071    10071           
  Misses          287      287           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.16% <100.00%> (ø)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

MaxKsyunz
MaxKsyunz previously approved these changes Apr 26, 2023
Copy link
Collaborator

@MaxKsyunz MaxKsyunz left a comment

Choose a reason for hiding this comment

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

@GumpacG Looks good. CI is failing on BWC tests which is unrelated.

It'd be good to merge the changes from #1584 since they "properly" upgrade Gradle.

Signed-off-by: Guian Gumpac <[email protected]>
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.

Please, add links and description to the PR why you updated gradle and why changed some source files.
Links I have:
opensearch-project/OpenSearch#7286
FasterXML/jackson-core#955 (comment)
opensearch-project/OpenSearch#7301

@Yury-Fridlyand
Copy link
Collaborator

CI pass except BWC. Ignoring it for now.

@Yury-Fridlyand Yury-Fridlyand merged commit b90065f into opensearch-project:main Apr 26, 2023
acarbonetto pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Apr 28, 2023
* Changed gradle version and removed values iterator

Signed-off-by: Guian Gumpac <[email protected]>

* Update a test to match new indexResponse.aliases() type.

Signed-off-by: MaxKsyunz <[email protected]>

* Ran ./gradlew wrapper

Signed-off-by: Guian Gumpac <[email protected]>

---------

Signed-off-by: Guian Gumpac <[email protected]>
Signed-off-by: MaxKsyunz <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
@Yury-Fridlyand Yury-Fridlyand deleted the dev-fix-build branch May 1, 2023 18:30
Yury-Fridlyand added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request May 1, 2023
penghuo pushed a commit that referenced this pull request May 16, 2023
MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jun 12, 2023
* Changed gradle version and removed values iterator

Signed-off-by: Guian Gumpac <[email protected]>

* Update a test to match new indexResponse.aliases() type.

Signed-off-by: MaxKsyunz <[email protected]>

* Ran ./gradlew wrapper

Signed-off-by: Guian Gumpac <[email protected]>

---------

Signed-off-by: Guian Gumpac <[email protected]>
Signed-off-by: MaxKsyunz <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
Yury-Fridlyand added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Jun 27, 2023
* Changed gradle version and removed values iterator

Signed-off-by: Guian Gumpac <[email protected]>

* Update a test to match new indexResponse.aliases() type.

Signed-off-by: MaxKsyunz <[email protected]>

* Ran ./gradlew wrapper

Signed-off-by: Guian Gumpac <[email protected]>

---------

Signed-off-by: Guian Gumpac <[email protected]>
Signed-off-by: MaxKsyunz <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Yury-Fridlyand added a commit that referenced this pull request Jun 27, 2023
* Update SQL plugin for core refactor (#1571)

Signed-off-by: MaxKsyunz <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>

* Fix plugin compilation (#1580)

* Changed gradle version and removed values iterator

Signed-off-by: Guian Gumpac <[email protected]>

* Update a test to match new indexResponse.aliases() type.

Signed-off-by: MaxKsyunz <[email protected]>

* Ran ./gradlew wrapper

Signed-off-by: Guian Gumpac <[email protected]>

---------

Signed-off-by: Guian Gumpac <[email protected]>
Signed-off-by: MaxKsyunz <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>

* Update sqlite-jdbc to 3.41.2.2 to address CVE-2023-32697 (#1667)

* Update sqlite-jdbc to 3.41.2.2 to address CVE-2023-32697

Signed-off-by: MaxKsyunz <[email protected]>

* Don't check column names on H2 results for correctness tests as described in #1667 (comment).

Signed-off-by: Yury-Fridlyand <[email protected]>

* Address PR review comment.

Signed-off-by: Yury-Fridlyand <[email protected]>

---------

Signed-off-by: MaxKsyunz <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Co-authored-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>

---------

Signed-off-by: MaxKsyunz <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Guian Gumpac <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
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.

6 participants