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.

Sign up for GitHub

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

Jump to bottom

Refactoring in Unit Tests #2308

Merged
merged 1 commit into from
Oct 17, 2023
Merged

Refactoring in Unit Tests #2308

merged 1 commit into from
Oct 17, 2023

Conversation

vamsi-amazon
Copy link
Member

Description

  • Currently unit tests are not validating the startJobRequest object.
  • Added new changes from grammar in opensearch-spark.

Issues Resolved

[List any issues this PR will resolve]

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
Copy link

codecov bot commented Oct 17, 2023 •
edited
Loading

Codecov Report

Merging #2308 (970e363) into main (b76a15e) will not change coverage.
Report is 1 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #2308   +/-   ##
=========================================
  Coverage     96.61%   96.61%           
  Complexity     4777     4777           
=========================================
  Files           449      449           
  Lines         12907    12907           
  Branches        882      882           
=========================================
  Hits          12470    12470           
  Misses          429      429           
  Partials          8        8
Flag Coverage Δ
sql-engine 96.61% <ø> (ø)

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

Files Coverage Δ
...g/opensearch/sql/spark/client/StartJobRequest.java 100.00% <ø> (ø)

@vamsi-amazon
Minor Refactoring
970e363 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
@vamsi-amazon vamsi-amazon marked this pull request as ready for review October 17, 2023 15:27
penghuo
penghuo reviewed Oct 17, 2023
View reviewed changes
spark/src/main/antlr/SqlBaseParser.g4
@@ -1196,6 +1195,7 @@ qualifiedNameList

functionName
: IDENTIFIER_KW LEFT_PAREN expression RIGHT_PAREN
| identFunc=IDENTIFIER_KW // IDENTIFIER itself is also a valid function name.
Copy link
Collaborator

Choose a reason for hiding this comment

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

ignore this file in git

@vamsi-amazon vamsi-amazon self-assigned this Oct 17, 2023
@vamsi-amazon vamsi-amazon added backport 2.x backport 2.11 maintenance Improves code quality, but not the product labels Oct 17, 2023
derek-ho
derek-ho approved these changes Oct 17, 2023
View reviewed changes
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

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

LGTM - I also had some local modification of antlr file - can remove this?

@vamsi-amazon vamsi-amazon merged commit 69572c8 into opensearch-project:main Oct 17, 2023
24 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 17, 2023
@github-actions
Minor Refactoring (#2308)
93e3134 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit 69572c8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This was referenced Oct 17, 2023
Merged
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 17, 2023
@github-actions
Minor Refactoring (#2308)
bd0d104 
Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
(cherry picked from commit 69572c8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
penghuo pushed a commit that referenced this pull request Oct 17, 2023
@opensearch-trigger-bot @github-actions
Minor Refactoring (#2308) (#2317)
051cc4f 
(cherry picked from commit 69572c8)

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
vamsi-amazon pushed a commit that referenced this pull request Oct 17, 2023
@opensearch-trigger-bot @github-actions
Minor Refactoring (#2308) (#2316)
3dd17a3 
(cherry picked from commit 69572c8)

Signed-off-by: Vamsi Manohar <reddyvam@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
mengweieric added a commit to mengweieric/sql that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Minor Refactoring (opensearch-project#2308) (opensearch-proje…
5a792f8 
…ct#2317)"

This reverts commit 051cc4f.

Signed-off-by: Eric <menwe@amazon.com>
mengweieric added a commit to mengweieric/sql that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Minor Refactoring (opensearch-project#2308) (opensearch-proje…
589a3e8 
…ct#2317)"

This reverts commit 051cc4f.

Signed-off-by: Eric <menwe@amazon.com>
vamsi-amazon added a commit to mengweieric/sql that referenced this pull request Nov 13, 2023
@vamsi-amazon
Revert "Minor Refactoring (opensearch-project#2308) (opensearch-proje…
da7f82e 
…ct#2317)"

This reverts commit 051cc4f.
vamsi-amazon added a commit that referenced this pull request Nov 13, 2023
@mengweieric @vamsi-amazon
Revert commits back to after 2.11 release (#2427)
62d3940 
* Revert "Add more metrics and handle emr exception message (#2422) (#2426)"

This reverts commit b57f7cc.

* Revert "Block settings in sql query settings API and add more unit tests (#2407) (#2412)"

This reverts commit 3024737.

* Revert "Added session, statement, emrjob metrics to sql stats api (#2398) (#2400)"

This reverts commit 6e17ae6.

* Revert "Redefine Drop Index as logical delete (#2386) (#2397)"

This reverts commit e939bb6.

* Revert "add concurrent limit on datasource and sessions (#2390) (#2395)"

This reverts commit deb3ccf.

* Revert "Add Flint Index Purging Logic (#2372) (#2389)"

This reverts commit dd48b9b.

* Revert "Refactoring for tags usage in test files and also added explicit denly list setting. (#2383) (#2385)"

This reverts commit 37e010f.

* Revert "Enable session by default (#2373) (#2375)"

This reverts commit 7d95e4c.

* Revert "Create new session if client provided session is invalid (#2368) (#2371)"

This reverts commit 5ab7858.

* Revert "Add where clause support in create statement (#2366) (#2370)"

This reverts commit b620a56.

* Revert "create new session if current session not ready (#2363) (#2365)"

This reverts commit 5d07281.

* Revert "Handle Describe,Refresh and Show Queries Properly (#2357) (#2362)"

This reverts commit 16e2f30.

* Revert "Add Session limitation (#2354) (#2359)"

This reverts commit 0f334f8.

* Revert "Bug Fix, support cancel query in running state (#2351) (#2353)"

This reverts commit 9a40591.

* Revert "Fix bug, using basic instead of basicauth (#2342) (#2355)"

This reverts commit e4827a5.

* Revert "Add missing tags and MV support (#2336) (#2346)"

This reverts commit 8791bb0.

* Revert "[Backport 2.x] deprecated job-metadata-index (#2340) (#2343)"

This reverts commit bea432c.

* Revert "Integration with REPL Spark job (#2327) (#2338)"

This reverts commit 58a5ae5.

* Revert "Implement patch API for datasources (#2273) (#2329)"

This reverts commit 4c151fe.

* Revert "Add sessionId parameters for create async query API (#2312) (#2324)"

This reverts commit 3d1a376.

* Revert "Add Statement (#2294) (#2318) (#2319)"

This reverts commit b3c2e94.

* Revert "Upgrade json (#2307) (#2314)"

This reverts commit 6c65bb4.

* Revert "Minor Refactoring (#2308) (#2317)"

This reverts commit 051cc4f.

* Revert "add InteractiveSession and SessionManager (#2290) (#2293) (#2315)"

This reverts commit 6ac197b.

---------

Co-authored-by: Vamsi Manohar <reddyvam@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@penghuo penghuo penghuo approved these changes

@derek-ho derek-ho derek-ho approved these changes

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@ps48 ps48 Awaiting requested review from ps48 ps48 is a code owner

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq rupal-bq is a code owner

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@MaxKsyunz MaxKsyunz Awaiting requested review from MaxKsyunz MaxKsyunz is a code owner

@Yury-Fridlyand Yury-Fridlyand Awaiting requested review from Yury-Fridlyand Yury-Fridlyand is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@forestmvey forestmvey Awaiting requested review from forestmvey forestmvey is a code owner

@acarbonetto acarbonetto Awaiting requested review from acarbonetto acarbonetto is a code owner

@GumpacG GumpacG Awaiting requested review from GumpacG GumpacG is a code owner

Assignees

@vamsi-amazon vamsi-amazon

Labels
backport 2.x backport 2.11 maintenance Improves code quality, but not the product
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vamsi-amazon @penghuo @derek-ho