Use AsyncLocal instead of ThreadStatic for SqlStatement.Current#79
Merged
seesharper merged 1 commit intomasterfrom Feb 24, 2026
Merged
Use AsyncLocal instead of ThreadStatic for SqlStatement.Current#79seesharper merged 1 commit intomasterfrom
seesharper merged 1 commit intomasterfrom
Conversation
ThreadStatic breaks in async contexts where continuations resume on a different thread pool thread. AsyncLocal flows through ExecutionContext and correctly tracks the current SQL statement across await boundaries. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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
SqlStatement.Currentwas annotated with[ThreadStatic], which stores values per OS threadasync/await, continuations can resume on a different thread pool thread (especially after.ConfigureAwait(false)), causingSqlStatement.Currentto benullor stale in the async read pathAsyncLocal<string>, which flows throughExecutionContextand correctly tracks the value acrossawaitboundariesSqlStatement.Currentthe same wayTest plan
ReadAsync,ReadWithoutNavigationPropertiesAsync) correctly use the cache key across thread switches🤖 Generated with Claude Code