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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925
, '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

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

Merged
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932
Aug 21, 2023
Merged

[Backport 2.x] [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)#1994
acarbonetto merged 4 commits into
opensearch-project:2.xfrom
Bit-Quill:backport2.x-1932

Conversation

@MitchellGale

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.

…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>
@codecov

codecovBot commented Aug 18, 2023

Copy link
Copy Markdown

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 
FlagCoverage Δ
sql-engine97.42% <100.00%> (-0.01%)⬇️

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

Files ChangedCoverage Δ
...va/org/opensearch/sql/monitor/ResourceMonitor.java100.00% <ø> (ø)
...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% <ø> (ø)
... and 72 more

... and 4 files with indirect coverage changes

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
acarbonetto
acarbonetto previously approved these changes Aug 21, 2023
Comment threadbuild.gradle Outdated
Comment threadbuild.gradle Outdated
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
@acarbonetto
acarbonetto merged commit 9f081ab into opensearch-project:2.xAug 21, 2023
@acarbonetto
acarbonetto deleted the backport2.x-1932 branch August 21, 2023 20:31
@opensearch-trigger-bot

Copy link
Copy Markdown
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 repositorycd$(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 treepushd ../.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 treepopd# 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@MitchellGale@Yury-Fridlyand@acarbonetto@joshuali925