fix: return correct count of ErrNotExecuted #22273
Merged
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
lesam
suggested changes
Aug 23, 2021
| @@ -380,7 +380,7 @@ LOOP: | |||
| } | |||
|
|
|||
| // Send error results for any statements which were not executed. | |||
| for ; i < len(query.Statements)-1; i++ { | |||
| for i++; i < len(query.Statements); i++ { | |||
There was a problem hiding this comment.
I ran your new tests and they pass without this change, which is concerning
There was a problem hiding this comment.
Have simplified tests conditions, complicated test failure modes. Now can differentiate between previous and new code, as well as correcting a few other small bugs.
lesam
reviewed
Aug 24, 2021
query/executor_test.go
Outdated
| } | ||
| for i := 0; i < len(q.Statements); i++ { | ||
| closing = make(chan struct{}) | ||
| testFn("executor", i, &executorFailIndex) |
There was a problem hiding this comment.
nitpick: I'd prefer to see:
executorFailIndex = i
testFn("executor", i)
lesam
reviewed
Aug 24, 2021
query/executor_test.go
Outdated
| if result.Err == query.ErrNotExecuted { | ||
| cnt++ | ||
| if result.StatementID <= failIndex { | ||
| t.Fatalf("StatementID for ErrNotExecuted is wrong index: %d", result.StatementID) |
There was a problem hiding this comment.
Should we just check that all the indexes we expect to fail are actually failing (build a list of fail indexes and compare to the expected list?) Here we could be missing if one index shows up twice and another is missing.
lesam
reviewed
Aug 24, 2021
query/executor_test.go
Outdated
| t.Fatalf("StatementID for ErrNotExecuted is wrong index: %d", result.StatementID) | ||
| } | ||
| } | ||
| r++ |
executeQuery() iterates over statements until each is processed or if an error is encountered that causes the loop to exit pre-maturely. It should return ErrNotExecuted for each remaining statement in the query closes #19136
davidby-influx
force-pushed
the
DSB_off_by_one
branch
from
b3aa31b
to
203a4dd
Compare
lesam
approved these changes
Aug 24, 2021
chengshiwen
pushed a commit
to chengshiwen/influxdb
that referenced
this pull request
Aug 11, 2024
executeQuery() iterates over statements until each is processed or if an error is encountered that causes the loop to exit pre-maturely. It should return ErrNotExecuted for each remaining statement in the query closes influxdata#19136
chengshiwen
pushed a commit
to chengshiwen/influxdb
that referenced
this pull request
Aug 27, 2024
executeQuery() iterates over statements until each is processed or if an error is encountered that causes the loop to exit pre-maturely. It should return ErrNotExecuted for each remaining statement in the query closes influxdata#19136
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.
executeQuery() iterates over statements until each is
processed or if an error is encountered that causes
the loop to exit pre-maturely. It should return
ErrNotExecuted for each remaining statement in the
query
closes #19136