Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace 2x LogUtils by QueryContext #747

Merged
merged 8 commits into from
Aug 12, 2022

Conversation

Yury-Fridlyand
Copy link
Collaborator

Description

Remove duplicated classes. QueryContext class replaces two LogUtils classes. It will be also used in two upcoming features.

Issues Resolved

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.

Signed-off-by: Yury Fridlyand <[email protected]>
Signed-off-by: Yury Fridlyand <[email protected]>
Signed-off-by: Yury Fridlyand <[email protected]>
Signed-off-by: Yury Fridlyand <[email protected]>
Signed-off-by: Yury Fridlyand <[email protected]>
Replace 2x `LogUtils` by `QueryContext`
@Yury-Fridlyand Yury-Fridlyand requested a review from a team as a code owner August 11, 2022 23:58
@codecov-commenter
Copy link

codecov-commenter commented Aug 12, 2022

Codecov Report

Merging #747 (dc2a9e9) into main (1df89e3) will decrease coverage by 2.97%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main     #747      +/-   ##
============================================
- Coverage     97.76%   94.79%   -2.98%     
  Complexity     2880     2880              
============================================
  Files           276      286      +10     
  Lines          7077     7736     +659     
  Branches        447      565     +118     
============================================
+ Hits           6919     7333     +414     
- Misses          157      349     +192     
- Partials          1       54      +53     
Flag Coverage Δ
query-workbench 62.76% <ø> (?)
sql-engine 97.76% <100.00%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
...c/main/java/org/opensearch/sql/ppl/PPLService.java 100.00% <100.00%> (ø)
workbench/public/components/Header/Header.tsx 100.00% <0.00%> (ø)
workbench/public/components/SQLPage/SQLPage.tsx 100.00% <0.00%> (ø)
workbench/public/components/app.tsx 0.00% <0.00%> (ø)
...ublic/components/QueryResults/QueryResultsBody.tsx 68.32% <0.00%> (ø)
...h/public/components/QueryLanguageSwitch/Switch.tsx 85.71% <0.00%> (ø)
workbench/public/components/Main/main.tsx 53.00% <0.00%> (ø)
workbench/public/utils/PanelWrapper.tsx 100.00% <0.00%> (ø)
...ch/public/components/QueryResults/QueryResults.tsx 61.60% <0.00%> (ø)
workbench/public/application.tsx 0.00% <0.00%> (ø)
... and 1 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Collaborator

@penghuo penghuo left a comment

Choose a reason for hiding this comment

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

LGTM

@penghuo penghuo merged commit deececb into opensearch-project:main Aug 12, 2022
@Yury-Fridlyand Yury-Fridlyand deleted the integ-query-context branch August 12, 2022 17:31
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-747-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 deececbb03a9dcf9647bf8f2f651a4e3fe0a6c2e
# Push it to GitHub
git push --set-upstream origin backport/backport-747-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 12, 2022
Signed-off-by: Yury Fridlyand <[email protected]>
(cherry picked from commit deececb)
penghuo pushed a commit to penghuo/os-sql that referenced this pull request Aug 17, 2022
Signed-off-by: Yury Fridlyand <[email protected]>
(cherry picked from commit deececb)
penghuo pushed a commit that referenced this pull request Aug 17, 2022
Signed-off-by: Yury Fridlyand <[email protected]>
(cherry picked from commit deececb)

Co-authored-by: Yury-Fridlyand <[email protected]>
@Yury-Fridlyand Yury-Fridlyand mentioned this pull request Nov 1, 2022
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants