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

Sync our main with upstream/2.x #147

Merged
merged 65 commits into from
Oct 31, 2022
Merged

Conversation

Yury-Fridlyand
Copy link

Description

Issues Resolved

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.

joshuali925 and others added 30 commits September 29, 2022 11:50
Signed-off-by: Joshua Li <[email protected]>

Signed-off-by: Joshua Li <[email protected]>
* Do not remove opensearch from the list of registered catalogs.

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

* New Changes to handle bug:#866

Signed-off-by: vamsi-amazon <[email protected]>

Signed-off-by: MaxKsyunz <[email protected]>
Signed-off-by: vamsi-amazon <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
* Update docs.

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

* Reorder functions in docs aplhabetically.

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

Signed-off-by: Yury-Fridlyand <[email protected]>
…support in SQL and PPL. (#827)

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

Signed-off-by: forestmvey <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Yury-Fridlyand <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Guian Gumpac and others added 22 commits October 20, 2022 14:14
* Testing updated version of jackson-databind

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

* Test updated jackson-databind in only sql-jdbc fixes CVE

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

* Revered jackson version change

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

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

Signed-off-by: Joshua Li <[email protected]>
* Add `typeof` function.

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

* Address PR feedback.

* Move function definition in ANTLR grammar into a separate group;
* Move SQL integration tests outside of legacy block;
* Extend integration tests.

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

* Fix indentation.

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

* Implement `typeof` as a bespoke `FunctionResolver` and `FunctionExpression`. It is able to recognize `OpenSearchDataType` as well.

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

* Rename `TypeOf` to be a part of `SystemFunctions`.

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

* Add docs.

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

Signed-off-by: Yury-Fridlyand <[email protected]>
Co-authored-by: MaxKsyunz <[email protected]>
* Bumped the JDBC driver version to 2.0.0.0

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

* Added a test to ensure versions match in the jar file and debug messages

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

Signed-off-by: Guian Gumpac <[email protected]>
Signed-off-by: Derek Ho <[email protected]>
Signed-off-by: vamsi-amazon <[email protected]>
feat: enable ci for windows and macos
change condition to always upload coverage for linux workbench
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 #922, #917, #912, #910 and attached them to disabled tests for traceability.
- Removed irrelevant tests.
Copy link

@MitchellGale MitchellGale left a comment

Choose a reason for hiding this comment

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

Woohoo!

@codecov
Copy link

codecov bot commented Oct 28, 2022

Codecov Report

Merging #147 (3fd53ca) into main (3ca6450) will decrease coverage by 0.06%.
The diff coverage is 87.91%.

❗ Current head 3fd53ca differs from pull request most recent head 634e2ff. Consider uploading reports for the commit 634e2ff to get more accurate results

@@             Coverage Diff              @@
##               main     #147      +/-   ##
============================================
- Coverage     94.97%   94.90%   -0.07%     
- Complexity     2989     3162     +173     
============================================
  Files           291      315      +24     
  Lines          8015     8560     +545     
  Branches        586      634      +48     
============================================
+ Hits           7612     8124     +512     
- Misses          349      382      +33     
  Partials         54       54              
Flag Coverage Δ
query-workbench 62.76% <ø> (ø)
sql-engine 97.58% <87.91%> (-0.27%) ⬇️

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

Impacted Files Coverage Δ
...ensearch/sql/expression/ExpressionNodeVisitor.java 100.00% <ø> (ø)
...h/sql/expression/function/OpenSearchFunctions.java 100.00% <ø> (ø)
...a/org/opensearch/sql/utils/MLCommonsConstants.java 0.00% <ø> (ø)
...ava/org/opensearch/sql/utils/SystemIndexUtils.java 100.00% <ø> (ø)
...ch/sql/opensearch/planner/physical/ADOperator.java 0.00% <0.00%> (ø)
...rch/planner/physical/MLCommonsOperatorActions.java 1.29% <0.00%> (-0.46%) ⬇️
...theus/data/constants/PrometheusFieldConstants.java 0.00% <0.00%> (ø)
...ain/java/org/opensearch/sql/analysis/Analyzer.java 100.00% <100.00%> (ø)
...rg/opensearch/sql/analysis/ExpressionAnalyzer.java 100.00% <100.00%> (ø)
...org/opensearch/sql/analysis/HighlightAnalyzer.java 100.00% <100.00%> (ø)
... and 49 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

vmmusings and others added 3 commits October 28, 2022 14:22
…s to be included through vcpkg. Fixed compilation errors with newer compilers on libraries required to build from source. (#987)

Signed-off-by: forestmvey <[email protected]>
Signed-off-by: Margarit Hakobyan <[email protected]>

Signed-off-by: Margarit Hakobyan <[email protected]>
@Yury-Fridlyand Yury-Fridlyand merged commit 2b918a6 into Bit-Quill:main Oct 31, 2022
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.