Revert "Pick connections based on batch first statement's shard" #569
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
The new code, and in particualr the fancy GAT workaroound, cause problems when trying to pass batch values by reference, as described in scylladb#568. Fixes: scylladb#568 Unfixes: scylladb#448 This reverts commit 24ee954. Signed-off-by: Jan Ciolek <[email protected]>
Modified test_batch() to also test passing a bound value to batch statement by reference. This wasn't tested, and because of that we didn't catch the regression described in scylladb#568. Signed-off-by: Jan Ciolek <[email protected]>
piodul
reviewed
Oct 4, 2022
| @@ -388,7 +388,8 @@ async fn test_batch() { | |||
| batch.append_statement(&format!("INSERT INTO {}.t_batch (a, b, c) VALUES (7, 11, '')", ks)[..]); | |||
| batch.append_statement(prepared_statement.clone()); | |||
|
|
|||
| let values = ((1_i32, 2_i32, "abc"), (), (1_i32, 4_i32, "hello")); | |||
| let four_value: i32 = 4; | |||
| let values = ((1_i32, 2_i32, "abc"), (), (1_i32, &four_value, "hello")); | |||
There was a problem hiding this comment.
Just a tiny nitpick/clarification: "abc" and "hello" already are references (&str), but their lifetime is 'static. The problem with the code that is being reverted is that it doesn't work for references with non-static lifetimes.
No need to do anything here, I think it is obvious that the commit description talks about non-static references.
piodul
approved these changes
Oct 4, 2022
6 tasks
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.
The new code, and in particualr the fancy GAT workaroound, cause problems when trying to pass batch values by reference, as described in #568.
Fixes: #568
Unfixes: #448
This reverts commit 24ee954.
Pre-review checklist
Fixes:annotations to PR description.