Fix issue with unwanted Error when --log-each-select is set to false #680
+16
−8
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
|
@bajinsheng could you please review this PR, since you have recently worked on the logic for writing out query plans? |
mrigger
reviewed
Jan 3, 2023
| @@ -72,8 +72,10 @@ protected void executeEpilogue(Query<?> q, boolean success, ExecutionTimer timer | |||
| if (success && getOptions().printSucceedingStatements()) { | |||
| System.out.println(q.getLogString()); | |||
| } | |||
| if (logExecutionTime) { | |||
| getLogger().writeCurrent("// " + timer.end().asString()); | |||
| if (getOptions().logEachSelect()) { | |||
There was a problem hiding this comment.
I think the logic would be slightly easier to understand if you have the logic in one if statement (here and above): if (getOptions().logEachSelect() && logExecutionTime)
There was a problem hiding this comment.
Sure! Fixed in a newer commit.
bajinsheng
reviewed
Jan 5, 2023
| @@ -20,7 +20,7 @@ protected void executeEpilogue(Query<?> q, boolean success, ExecutionTimer timer | |||
| if (success && getOptions().printSucceedingStatements()) { | |||
| System.out.println(q.getQueryString()); | |||
| } | |||
| if (logExecutionTime) { | |||
| if (getOptions().logEachSelect() && logExecutionTime) { | |||
There was a problem hiding this comment.
Perhaps it is more logical clear to put this condition into the logExecutionTime() function.
| @@ -156,9 +156,6 @@ public boolean printSucceedingStatements() { | |||
| } | |||
|
|
|||
| public boolean logExecutionTime() { | |||
| if (!logEachSelect) { | |||
| throw new AssertionError(); | |||
There was a problem hiding this comment.
We just need to return false here. I think we do not need to update other code locations.
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.
Attempt to fix #679
Manually tested on MySQL