backport-2.0: sql: stop using txn.OrigTimestamp to reset TableCollection #24874
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
We use the transaction OrigTimestamp to figure out if a transaction is being retried, triggering a reset of TableCollection. This logic would get triggered when running PREPARE within a transaction, because PREPARE uses it's own transaction and thus has a different OrigTimestamp. Removed this logic because transaction retries trigger resetting the TableCollection in the new conn-executor code. fixes cockroachdb#24578 Release note sql: fix PREPARE hanging when run in the same transaction as a CREATE TABLE
|
This change is |
|
@andreimatei rubberstamp? |
|
LGTM But a nit: please copy the commit message into the PR message (the merge commit message). I think the release notes script needs the release note there, and also it's much easier to find on github - otherwise you have to click a lot to get to any message. And a question about the original PR - why was the |
|
bors r+ |
|
@andreimatei this is a fix for #24578 |
|
bors r+ |
|
Not awaiting review |
craig bot
pushed a commit
that referenced
this pull request
Apr 18, 2018
24874: backport-2.0: sql: stop using txn.OrigTimestamp to reset TableCollection r=vivekmenezes a=vivekmenezes Backport 1/1 commits from #23816. /cc @cockroachdb/release --- sql: Stop using txn.OrigTimestamp to reset TableCollection We use the transaction OrigTimestamp to figure out if a transaction is being retried, triggering a reset of TableCollection. This logic would get triggered when running PREPARE within a transaction, because PREPARE uses it's own transaction and thus has a different OrigTimestamp. Removed this logic because transaction retries trigger resetting the TableCollection in the new conn-executor code. fixes #24578 Release note sql: fix PREPARE hanging when run in the same transaction as a CREATE TABLE possibly related #23718 Co-authored-by: Vivek Menezes <[email protected]>
Build succeeded |
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.
Backport 1/1 commits from #23816.
/cc @cockroachdb/release
sql: Stop using txn.OrigTimestamp to reset TableCollection
We use the transaction OrigTimestamp to figure out if a
transaction is being retried, triggering a reset of
TableCollection. This logic would get triggered when
running PREPARE within a transaction, because PREPARE
uses it's own transaction and thus has a different
OrigTimestamp.
Removed this logic because transaction retries trigger
resetting the TableCollection in the new conn-executor code.
fixes #24578
Release note sql: fix PREPARE hanging when run in the same transaction
as a CREATE TABLE
possibly related #23718