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

Refer Antlr file using specific branch #2893

Merged
merged 5 commits into from
Oct 4, 2024
Merged

Refer Antlr file using specific branch #2893

merged 5 commits into from
Oct 4, 2024

Conversation

ykmr1224
Copy link
Collaborator

@ykmr1224 ykmr1224 commented Aug 2, 2024 •
edited
Loading

Description

  • Refer Antlr file using specific tag/branch (Spark -> v3.5.1, Flint -> 0.5)
  • Disable auto download

Related Issues

#2890 (comment)
#3022

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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.

@ykmr1224 ykmr1224 added backport 2.x maintenance Improves code quality, but not the product labels Aug 2, 2024
@ykmr1224 ykmr1224 marked this pull request as ready for review August 2, 2024 00:24
YANG-DB
YANG-DB reviewed Aug 2, 2024
View reviewed changes
async-query-core/src/main/antlr/SqlBaseLexer.g4 Outdated
@@ -18,7 +18,7 @@ lexer grammar SqlBaseLexer;

@members {
/**
* When true, parser should throw ParseException for unclosed bracketed comment.
* When true, parser should throw ParseExcetion for unclosed bracketed comment.
Copy link
Member

Choose a reason for hiding this comment

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

Should it be Exception ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is coming from Apache Spark repository, and we shouldn't fix here.

dai-chen
dai-chen previously approved these changes Aug 6, 2024
View reviewed changes
Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

Thanks for the changes!

I'm thinking how we can ensure that we remember to update this version whenever a new release branch is created in opensearch-spark repo. cc: @penghuo

@ykmr1224
Copy link
Collaborator Author

ykmr1224 commented Aug 6, 2024

I'm thinking how we can ensure that we remember to update this version whenever a new release branch is created in opensearch-spark repo. cc: @penghuo

Should we have a check list for creating new release branch in opensearch-spark repo?

@ykmr1224
Merge branch 'main' into antlr-reference
3ad7224 
# Conflicts:
#	async-query-core/src/main/antlr/SqlBaseLexer.g4
#	async-query-core/src/main/antlr/SqlBaseParser.g4
#	async-query-core/src/main/java/org/opensearch/sql/spark/utils/SQLQueryUtils.java
@ykmr1224
Fix version to current one
510f139 
Signed-off-by: Tomoyuki Morita <[email protected]>
dai-chen
dai-chen reviewed Sep 9, 2024
View reviewed changes
Copy link
Collaborator

@dai-chen dai-chen left a comment

Choose a reason for hiding this comment

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

I'm thinking whether tracking one Flint Spark branch will be a problem or not.
I think the ideal case SQL main tracks Spark main and SQL 2.x tracks Spark 0.5? However, we cannot do this because we always backport PR?

@ykmr1224
Copy link
Collaborator Author

ykmr1224 commented Sep 9, 2024

I'm thinking whether tracking one Flint Spark branch will be a problem or not. I think the ideal case SQL main tracks Spark main and SQL 2.x tracks Spark 0.5? However, we cannot do this because we always backport PR?

I think the problem is that we tend to automatically include the grammar change in the PRs even if the change is not related to the grammar. We'd want to separate Grammar PRs and don't backport them.

Options came up to my mind are:

  1. Do not automatically update Grammar files.
  2. Separate the grammar files for repository and ones for build, and only update the ones for build during build. And add build target to update grammar file for repository.
  3. Manually avoid including the Grammar files to PRs.

@ykmr1224
Disable auto download
51e402f 
Signed-off-by: Tomoyuki Morita <[email protected]>
@ykmr1224
Disable auto download
828b4d2 
Signed-off-by: Tomoyuki Morita <[email protected]>
@ykmr1224 ykmr1224 merged commit d7710d0 into opensearch-project:main Oct 4, 2024
12 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 4, 2024
@github-actions
Refer Antlr file using specific branch (#2893)
e346dc2 
* Refer Antlr file using specific branch

Signed-off-by: Tomoyuki Morita <[email protected]>

* Fix version to current one

Signed-off-by: Tomoyuki Morita <[email protected]>

* Disable auto download

Signed-off-by: Tomoyuki Morita <[email protected]>

* Disable auto download

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit d7710d0)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 4, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YANG-DB YANG-DB YANG-DB left review comments

@seankao-az seankao-az seankao-az approved these changes

@manasvinibs manasvinibs manasvinibs approved these changes

@dai-chen dai-chen dai-chen approved these changes

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

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

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

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

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

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

@vamsi-amazon vamsi-amazon Awaiting requested review from vamsi-amazon vamsi-amazon is a code owner

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

@penghuo penghuo Awaiting requested review from penghuo penghuo 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

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

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

Successfully merging this pull request may close these issues.
5 participants
@ykmr1224 @dai-chen @YANG-DB @manasvinibs @seankao-az