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

Merge 2.x to Maximus feature branch #1039

Merged

Conversation

dai-chen
Copy link
Collaborator

@dai-chen dai-chen commented Nov 4, 2022

Description

On a regular basis, we want to make Maximum project feature branch in sync with upstream 2.x branch.

Issues Resolved

N/A

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.

Yury-Fridlyand and others added 23 commits October 11, 2022 23:04
…orkflow

Fix manual CI workflow and add `name` option.
Removed json-smart in the jdbc driver as it introduces a CVE (CVE-2021-31684).

Signed-off-by: Guian Gumpac <[email protected]>
* Add functions `PERIOD_ADD` and `PERIOD_DIFF`.

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

* Update signature - use `INT` instead of `LONG`.

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

Signed-off-by: Yury-Fridlyand <[email protected]>
- Enabled ignored and disabled tests.
- Created opensearch-project#922, opensearch-project#917, opensearch-project#912, opensearch-project#910 and attached them to disabled tests for traceability.
- Removed irrelevant tests.
…s to be included through vcpkg. Fixed compilation errors with newer compilers on libraries required to build from source. (opensearch-project#987)

Signed-off-by: forestmvey <[email protected]>
* Add generic ml command in ppl.

Signed-off-by: Jing Zhang <[email protected]>

* Recover ml client dependency.

Signed-off-by: Jing Zhang <[email protected]>

* Address the comments I.

Signed-off-by: Jing Zhang <[email protected]>

Signed-off-by: Jing Zhang <[email protected]>
Signed-off-by: Vamsi Manohar <[email protected]>

Signed-off-by: Vamsi Manohar <[email protected]>
…e-error-reporting

Rework on error reporting to make it more verbose and human-friendly.
* Add document for ml command.

Signed-off-by: Jing Zhang <[email protected]>

* Update the index.

Signed-off-by: Jing Zhang <[email protected]>

* Add deprecation for AD and KMEANS documents.

Signed-off-by: Jing Zhang <[email protected]>

Signed-off-by: Jing Zhang <[email protected]>
* Prometheus select metric and stats queries.

Signed-off-by: reddyvam-amazon <[email protected]>
…project#1000)

* Fix incorrect results returned by `min`, `max` and `avg` aggregations on null/missing values.

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

* Fix indentation.

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

* Activate and fix integration tests.

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

* Add more tests.

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

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

Signed-off-by: Chen Dai <[email protected]>
(cherry picked from commit 9944f2e)

Co-authored-by: Chen Dai <[email protected]>
@dai-chen dai-chen self-assigned this Nov 4, 2022
@dai-chen
Copy link
Collaborator Author

dai-chen commented Nov 4, 2022

DCO check is failing:

b8436392b4bdac546d098d6b62a5ca862e11cbb[7](https://github.com/opensearch-project/sql/actions/runs/3396610186/jobs/5647862398#step:3:8)    Expected "vamsi-amazon <[email protected]>", but got "Vamsi Manohar <[email protected]>".
  3fd53cac2f388149a8d2c7b8ab5fcfea453a5b80    The sign-off is missing.
  e3fe0[8](https://github.com/opensearch-project/sql/actions/runs/3396610186/jobs/5647862398#step:3:9)6e2d8a0430[9](https://github.com/opensearch-project/sql/actions/runs/3396610186/jobs/5647862398#step:3:10)c9ac8103da90df59b279672    Can not find "vamsi-amazon <[email protected]>", in ["Vamsi Manohar <[email protected]>", "Vamsi Manohar <[email protected]>"].
  99cebe349710c6e2f3fecef8ddd1d9be488029c0    Expected "Forest Vey <[email protected]>", but got "forestmvey <[email protected]>".
  40d8d9f27304fd87ca55e20199762558423367d5    Can not find "vamsi-amazon <[email protected]>", in ["Vamsi Manohar <[email protected]>", "Vamsi Manohar <[email protected]>"].
  be45[12](https://github.com/opensearch-project/sql/actions/runs/3396610186/jobs/5647862398#step:3:13)e0a5b5466b12defa88afd6d5ec6476ea6f    Expected "vamsi-amazon <[email protected]>", but got "reddyvam-amazon <[email protected]>".

@codecov-commenter
Copy link

codecov-commenter commented Nov 4, 2022

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.74%. Comparing base (73787b7) to head (fbd6c7a).
Report is 42 commits behind head on feature/maximus-m1.

Additional details and impacted files
@@                   Coverage Diff                    @@
##             feature/maximus-m1    #1039      +/-   ##
========================================================
- Coverage                 97.58%   95.74%   -1.85%     
- Complexity                 3207     3396     +189     
========================================================
  Files                       318      349      +31     
  Lines                      7962     9203    +1241     
  Branches                    515      680     +165     
========================================================
+ Hits                       7770     8811    +1041     
- Misses                      190      334     +144     
- Partials                      2       58      +56     
Flag Coverage Δ
query-workbench 62.76% <ø> (?)
sql-engine 98.27% <100.00%> (+0.69%) ⬆️

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.

@dai-chen dai-chen marked this pull request as ready for review November 4, 2022 20:27
@dai-chen dai-chen requested a review from a team as a code owner November 4, 2022 20:27
Copy link
Collaborator

@penghuo penghuo left a comment

Choose a reason for hiding this comment

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

Thanks.

@penghuo penghuo merged commit eea2689 into opensearch-project:feature/maximus-m1 Nov 7, 2022
@dai-chen dai-chen deleted the merge-2.x-after-release branch December 16, 2022 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

9 participants