fix: statement.cancel() waits for statement to finish #531
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crystall-bitquill
force-pushed
the
issue-527
branch
from
ea7d86d
to
7f71b79
Compare
sergiyvamz
reviewed
Jan 18, 2024
| Object result = | ||
| ConnectionProxy.this.pluginManager.execute( | ||
| this.invokeOnClass, | ||
| methodName, | ||
| method.getName(), |
There was a problem hiding this comment.
Why methodName isn't good in this case?
sergiyvamz
reviewed
Jan 18, 2024
| () -> method.invoke(this.invokeOn, args), | ||
| args); | ||
| return proxyIfReturnTypeIsJdbcInterface(method.getReturnType(), result); | ||
| } finally { | ||
| try { | ||
| this.LOCK.unlock(); |
There was a problem hiding this comment.
Do we need to check is lock has been acquired above?
crystall-bitquill
force-pushed
the
issue-527
branch
from
7f71b79
to
446dce7
Compare
sergiyvamz
approved these changes
Jan 18, 2024
karenc-bq
reviewed
Jan 19, 2024
| @@ -313,6 +315,14 @@ private boolean isDirectExecute(String methodName) { | |||
| class JdbcInterfaceProxy implements InvocationHandler { | |||
| private final Object invokeOn; | |||
| private final Class<?> invokeOnClass; | |||
| private final ReentrantLock LOCK = new ReentrantLock(); | |||
There was a problem hiding this comment.
Variable name shouldn't be all uppercase here.
karenc-bq
reviewed
Jan 19, 2024
| @@ -313,6 +315,14 @@ private boolean isDirectExecute(String methodName) { | |||
| class JdbcInterfaceProxy implements InvocationHandler { | |||
| private final Object invokeOn; | |||
| private final Class<?> invokeOnClass; | |||
| private final ReentrantLock LOCK = new ReentrantLock(); | |||
|
|
|||
| private final Set<String> NON_SYNCHRONIZED_METHODS = | |||
crystall-bitquill
force-pushed
the
issue-527
branch
from
446dce7
to
11e7b4d
Compare
karenc-bq
reviewed
Jan 25, 2024
| boolean locked = false; | ||
| if (nonSynchronizedMethods.contains(methodName)) { | ||
| this.lock.lock(); | ||
| locked = true; |
There was a problem hiding this comment.
What is the purpose of this flag
There was a problem hiding this comment.
You can use the built in checks, either isHeldByCurrentThread or isLocked
karenc-bq
reviewed
Jan 25, 2024
| @@ -313,6 +315,14 @@ private boolean isDirectExecute(String methodName) { | |||
| class JdbcInterfaceProxy implements InvocationHandler { | |||
| private final Object invokeOn; | |||
| private final Class<?> invokeOnClass; | |||
| private final ReentrantLock lock = new ReentrantLock(); | |||
There was a problem hiding this comment.
You are using a lock to replace the synchronized keyword, which is a mutex. I think you need to make this static so the lock becomes a mutex
There was a problem hiding this comment.
The lock can't be static!
crystall-bitquill
force-pushed
the
issue-527
branch
2 times, most recently
from
171ed4f
to
795352a
Compare
crystall-bitquill
force-pushed
the
issue-527
branch
from
795352a
to
c1039ea
Compare
sergiyvamz
approved these changes
Feb 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Fix statement.cancel() waiting for statement to finish
Description
When a long running query is executed and
statement.cancel()is used to stop it, the driver will not immediately cancel the statement and will wait for it to finish instead. This PR replaces the synchronized block with a ReentrantLock.Addresses #527
Additional Reviewers