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

Applied formatting improvements to Antlr files based on spotless changes #2017

Merged
merged 2 commits into from
Aug 22, 2023

Conversation

matthewryanwells
Copy link
Contributor

Description

Changed formatting of Antlr parser files based on Spotless changes. I have not applied the changes made to the lexer files as it completely rewrites the files to make them much less readable

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.

…ges (#342)

Signed-off-by: Matthew Wells <matthew.wells@improving.com>
Signed-off-by: Matthew Wells <matthew.wells@improving.com>
@codecov
Copy link

codecov bot commented Aug 22, 2023

Codecov Report

Merging #2017 (fa84b9b) into main (09d222b) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #2017   +/-   ##
=========================================
  Coverage     97.30%   97.30%           
  Complexity     4623     4623           
=========================================
  Files           407      407           
  Lines         11935    11935           
  Branches        828      828           
=========================================
  Hits          11613    11613           
  Misses          315      315           
  Partials          7        7           
Flag Coverage Δ
sql-engine 97.30% <ø> (ø)

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

@GumpacG GumpacG merged commit ed2b683 into opensearch-project:main Aug 22, 2023
@MitchellGale MitchellGale deleted the integ-antlr-spotless branch August 22, 2023 23:04
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.x
# Create a new branch
git switch --create backport/backport-2017-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ed2b683064ee2adb2d449d0cbba565cd54137e3a
# Push it to GitHub
git push --set-upstream origin backport/backport-2017-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2017-to-2.x.

MitchellGale pushed a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 23, 2023
…ges (opensearch-project#2017)

* Applied formatting improvements to Antlr files based on spotless changes (#342)

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

* added spacing to # names back into parser files

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

---------

Signed-off-by: Matthew Wells <matthew.wells@improving.com>
Yury-Fridlyand pushed a commit that referenced this pull request Aug 23, 2023
…n spotless changes (#2017) (#2023)

* Applied formatting improvements to Antlr files based on spotless changes (#2017)

* Applied formatting improvements to Antlr files based on spotless changes (#342)

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

* added spacing to # names back into parser files

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

---------

Signed-off-by: Matthew Wells <matthew.wells@improving.com>

* Update sql/src/main/antlr/OpenSearchSQLParser.g4

Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>

* fixed extra semi colon

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Matthew Wells <matthew.wells@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Co-authored-by: Matthew Wells <matthew.wells@improving.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants