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

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932) #1994

Merged
merged 4 commits into from
Aug 21, 2023

Conversation

MitchellGale
Copy link
Contributor

Description

This PR applies Spotless on Java code for:
core/src/main/java/org/opensearch/sql/planner
core/src/main/java/org/opensearch/sql/storage
core/src/main/java/org/opensearch/sql/utils

Issues Resolved

#1101

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.

…ensearch-project#1932)

* Applying Google Java code format changes to core/src/main/java/org/opensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <[email protected]>

* Ignore on failure for checkstyle in core and added the three spotless fixes files.

Signed-off-by: Mitchell Gale <[email protected]>

* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <[email protected]>

* spotless apply, fixing include for spotless build.gradle and adding pre tag.

Signed-off-by: Mitchell Gale <[email protected]>

* addressed PR comments.

Signed-off-by: Mitchell Gale <[email protected]>

---------

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Merging #1994 (07c2638) into 2.x (1b5a936) will decrease coverage by 0.01%.
Report is 3 commits behind head on 2.x.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##                2.x    #1994      +/-   ##
============================================
- Coverage     97.42%   97.42%   -0.01%     
+ Complexity     4647     4646       -1     
============================================
  Files           408      408              
  Lines         11528    11525       -3     
  Branches        837      835       -2     
============================================
- Hits          11231    11228       -3     
  Misses          290      290              
  Partials          7        7              
Flag Coverage Δ
sql-engine 97.42% <100.00%> (-0.01%) ⬇️

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

Files Changed Coverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java 100.00% <ø> (ø)
...n/java/org/opensearch/sql/planner/PlanContext.java 100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java 100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java 100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java 100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java 100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java 100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java 100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java 100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java 100.00% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <[email protected]>
Signed-off-by: Mitchell Gale <[email protected]>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
build.gradle Outdated Show resolved Hide resolved
build.gradle Outdated Show resolved Hide resolved
Signed-off-by: Mitchell Gale <[email protected]>
@acarbonetto acarbonetto merged commit 9f081ab into opensearch-project:2.x Aug 21, 2023
@acarbonetto acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@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-1994-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9f081ab9cccdaeff0b61556519a1f3494b3db894
# Push it to GitHub
git push --set-upstream origin backport/backport-1994-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-1994-to-2.x.

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.

4 participants