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

Add comments to async query handlers #2657

Merged
merged 3 commits into from
May 10, 2024

Conversation

ykmr1224
Copy link
Collaborator

@ykmr1224 ykmr1224 commented May 6, 2024

Description

Added comments to async query handlers to make the responsibility of each handler clearer.

Issues Resolved

N/A

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@ykmr1224 ykmr1224 changed the title Add comments to query handlers Add comments to async query handlers May 6, 2024
@ykmr1224 ykmr1224 marked this pull request as ready for review May 6, 2024 20:14
@ykmr1224 ykmr1224 force-pushed the queryhandler-comment branch from 032cf98 to a0042c3 Compare May 6, 2024 20:46
Signed-off-by: Tomoyuki Morita <[email protected]>
@ykmr1224 ykmr1224 force-pushed the queryhandler-comment branch from a0042c3 to f8d8728 Compare May 6, 2024 20:56
Signed-off-by: Tomoyuki Morita <[email protected]>
seankao-az
seankao-az previously approved these changes May 8, 2024
Swiddis
Swiddis previously approved these changes May 8, 2024
Copy link
Collaborator

@Swiddis Swiddis left a comment

Choose a reason for hiding this comment

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

Thanks! While you're at it, it might also be nice to link to related classes, to make it slightly easier to navigate if someone e.g. lands on IndexDMLResultStorageService without having seen IndexDMLResultStorage.

@ykmr1224
Copy link
Collaborator Author

ykmr1224 commented May 8, 2024

Thanks! While you're at it, it might also be nice to link to related classes, to make it slightly easier to navigate if someone e.g. lands on IndexDMLResultStorageService without having seen IndexDMLResultStorage.

That's a good point. I'm wondering if we need those links in the comments considering IDE or Github provide code navigation feature. I think the link would be beneficial when we want to mention some related class which is not obviously referred in the code.

@@ -28,6 +28,10 @@
import org.opensearch.sql.spark.leasemanager.model.LeaseRequest;
import org.opensearch.sql.spark.response.JobExecutionResponseReader;

/**
* The handler for batch query. With batch query, queries are executed as single batch. The queries
* are sent along with job execution request to spark.
Copy link
Collaborator

Choose a reason for hiding this comment

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

what is job execution request? can you add a ref link to the class?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed.

@@ -31,7 +31,12 @@
import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory;
import org.opensearch.sql.spark.response.JobExecutionResponseReader;

/** Handle Index DML query. includes * DROP * ALT? */
/**
* The handler for Index DML (Data Manipulation Language) query. Handles DROP/ALT/VACUUM operation
Copy link
Collaborator

Choose a reason for hiding this comment

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

ALT -> ALTER?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch. Fixed.

Signed-off-by: Tomoyuki Morita <[email protected]>
Copy link
Collaborator

@noCharger noCharger left a comment

Choose a reason for hiding this comment

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

Thanks for the change!

@ykmr1224 ykmr1224 self-assigned this May 10, 2024
@ykmr1224 ykmr1224 added backport 2.x maintenance Improves code quality, but not the product labels May 10, 2024
@ykmr1224 ykmr1224 merged commit 05a2f66 into opensearch-project:main May 10, 2024
19 of 28 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

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

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

ykmr1224 added a commit to ykmr1224/sql that referenced this pull request May 15, 2024
* Add comments to query handlers

Signed-off-by: Tomoyuki Morita <[email protected]>

* Reformat

Signed-off-by: Tomoyuki Morita <[email protected]>

* Fix comments

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>
ykmr1224 added a commit to ykmr1224/sql that referenced this pull request May 15, 2024
* Add comments to query handlers

Signed-off-by: Tomoyuki Morita <[email protected]>

* Reformat

Signed-off-by: Tomoyuki Morita <[email protected]>

* Fix comments

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit 05a2f66)
ykmr1224 added a commit that referenced this pull request May 16, 2024
* Add comments to query handlers

Signed-off-by: Tomoyuki Morita <[email protected]>

* Reformat

Signed-off-by: Tomoyuki Morita <[email protected]>

* Fix comments

Signed-off-by: Tomoyuki Morita <[email protected]>

---------

Signed-off-by: Tomoyuki Morita <[email protected]>
(cherry picked from commit 05a2f66)
@ykmr1224 ykmr1224 deleted the queryhandler-comment branch May 24, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport-failed maintenance Improves code quality, but not the product
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants