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.

Sign up for GitHub

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

Segregate advance and advanceUninterruptibly flow in postJoinCursor to allow for interrupts in advance #15222

Merged
merged 9 commits into from
Oct 30, 2023
Merged

Segregate advance and advanceUninterruptibly flow in postJoinCursor to allow for interrupts in advance #15222

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d22ab3
Segregate advance and advanceInterruptibly call flow in postJoinCurso…
gargvishesh Oct 20, 2023
c91dc76
Add comments
gargvishesh Oct 25, 2023
8be0109
Add valueMatcher setter for testing
gargvishesh Oct 26, 2023
0e2f01d
Add tests for advance with interruption for post join cursor.
gargvishesh Oct 26, 2023
33e5483
Add apache licence header to the test file.
gargvishesh Oct 27, 2023
5f1d7f4
Address review comments
gargvishesh Oct 28, 2023
6fea6df
Fail test for no exception case
gargvishesh Oct 30, 2023
3fd3f5c
Always return false for TestCursor isDone.
gargvishesh Oct 30, 2023
cd7078a
Fix unused import
gargvishesh Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions processing/src/main/java/org/apache/druid/segment/join/PostJoinCursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ public static PostJoinCursor wrap(
}

private void advanceToMatch()
{
if (valueMatcher != null) {
while (!isDone() && !valueMatcher.matches(false)) {
baseCursor.advance();
}
}
}

private void advanceToMatchUninterruptibly()
Copy link
Contributor

Choose a reason for hiding this comment

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

Please leave a comment here that this can be a long-running CPU call. Which is why advanceUninterruptibly is not directly used in advance() call unlike other cursors. Please link the github issue in the comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

{
if (valueMatcher != null) {
while (!isDone() && !valueMatcher.matches(false)) {
Expand Down Expand Up @@ -99,15 +108,15 @@ public Filter getPostJoinFilter()
@Override
public void advance()
{
advanceUninterruptibly();
BaseQuery.checkInterrupted();
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add a note on why the checkInterrupted() is not needed anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added a comment.

baseCursor.advance();
Copy link
Contributor

Choose a reason for hiding this comment

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

Will be good to put some comments as in why this change is being done in the code for a future developer to follow.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added comments.

advanceToMatch();
}

@Override
public void advanceUninterruptibly()
{
baseCursor.advanceUninterruptibly();
advanceToMatch();
advanceToMatchUninterruptibly();
}

@Override
Expand Down
Loading