[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[Spotless] Applying Google Code Format for core/src/main files #3 - #1932

Merged
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3
Aug 9, 2023
Merged

[Spotless] Applying Google Code Format for core/src/main files #3#1932
Yury-Fridlyand merged 8 commits into
opensearch-project:mainfrom
Bit-Quill:integ/sl_GoogleJavaFormat3

Conversation

@MitchellGale

@MitchellGaleMitchellGale commented Aug 3, 2023

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

MitchellGaleand others added 5 commits August 2, 2023 10:07
…ensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
… fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…ava OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
…re tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
[Spotless] Applying Google Code Format for core/src/main files #3
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@codecov

codecovBot commented Aug 3, 2023

Copy link
Copy Markdown

Codecov Report

Merging #1932 (db31dcd) into main (b610ce9) will decrease coverage by 0.01%.
The diff coverage is 100.00%.

@@ Coverage Diff @@## main #1932 +/- ##
============================================
- Coverage 97.51% 97.51% -0.01% 
Complexity 4658 4658 ============================================
Files 408 408 Lines 11934 11930 -4 Branches 834 832 -2 ============================================
- Hits 11637 11633 -4 
Misses 290 290 Partials 7 7 
FlagCoverage Δ
sql-engine97.51% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...n/java/org/opensearch/sql/planner/PlanContext.java100.00% <ø> (ø)
...a/org/opensearch/sql/planner/SerializablePlan.java100.00% <ø> (ø)
.../org/opensearch/sql/planner/logical/LogicalAD.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalAggregation.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalCloseCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalDedupe.java100.00% <ø> (ø)
...rg/opensearch/sql/planner/logical/LogicalEval.java100.00% <ø> (ø)
...search/sql/planner/logical/LogicalFetchCursor.java100.00% <ø> (ø)
.../opensearch/sql/planner/logical/LogicalFilter.java100.00% <ø> (ø)
...ensearch/sql/planner/logical/LogicalHighlight.java100.00% <ø> (ø)
... and 70 more

GumpacG
GumpacG previously approved these changes Aug 4, 2023
private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

@GumpacGGumpacGAug 4, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How come the multiple annotations are put on one line here while multiple annotations for the function above are left on multiple lines?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

You'll have to look at the rules, but I think the idea is that classes aren't indented so the annotations are put above, while functions and class variables are already indented, so it doesn't hurt to indent them more...?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

acarbonetto
acarbonetto previously approved these changes Aug 4, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 5, 2023

@Yury-FridlyandYury-Fridlyand left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please also fix the PR description

private final Set<String> nameRemoveList;
@Getter private final PhysicalPlan input;
@Getter private final Set<ReferenceExpression> removeList;
@ToString.Exclude @EqualsAndHashCode.Exclude private final Set<String> nameRemoveList;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree, this becomes unreadable. Looking forward to have exceptions configured for that rule if possible.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
GumpacG
GumpacG previously approved these changes Aug 8, 2023
Yury-Fridlyand
Yury-Fridlyand previously approved these changes Aug 8, 2023
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
@MitchellGale
MitchellGale dismissed stale reviews from Yury-Fridlyand and GumpacG via db31dcdAugust 9, 2023 20:08
@Yury-Fridlyand
Yury-Fridlyand merged commit 9914580 into opensearch-project:mainAug 9, 2023
@Yury-Fridlyand
Yury-Fridlyand deleted the integ/sl_GoogleJavaFormat3 branch August 9, 2023 21:02
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 14, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
MitchellGale added a commit to Bit-Quill/opensearch-project-sql that referenced this pull request Aug 18, 2023
…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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
…in files #3 (#1932) (#1994)
* [Spotless] Applying Google Code Format for core/src/main files #3 (#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 <Mitchell.Gale@improving.com>
* Ignore on failure for checkstyle in core and added the three spotless fixes files.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* spotless apply, fixing include for spotless build.gradle and adding pre tag.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments.
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
* spotless apply
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* add checkstyle ignore
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
* addressed PR comments
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
---------
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for freeto 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.

4 participants

@MitchellGale@GumpacG@Yury-Fridlyand@acarbonetto