Refactor scoping and make default_scopes thread-safe #683
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've used `active_scopes` and `default_scopes` to store scopes in the current
context. However, it has been thread-unsafe because we clear `default_scopes`
to unscope.
Moreover, `default_scopes` is the master data of default scopes, and we shouldn't
clear it.
Therefore, this commit introduces `current_context` as a thread local variable to
store the current scoped context in it:
- When `unscoped { ... }` is called, `current_context` stores a plain query object
- When `with_scope(...) { ... }` is called, `current_context` stores a query object
scoped with `default_scopes` and the method's arguments
- Otherwise, it stores nothing - nil, so we need to build a new query with
`default_scopes`
`current_context` includes active scopes naturally, so this commit removes the method.
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.
We've used
active_scopesanddefault_scopesto store scopes in the current context. However, it has been thread-unsafe because we cleardefault_scopesto unscope.Moreover,
default_scopesis the master data of default scopes, and we shouldn't clear it.Therefore, this commit introduces
current_contextas a thread local variable to store the current scoped context in it:unscoped { ... }is called,current_contextstores a plain query objectwith_scope(...) { ... }is called,current_contextstores a query object scoped withdefault_scopesand the method's argumentsdefault_scopesThen, we don't have to clear
default_scopesto unscope.current_contextincludes active scopes naturally, so this commit removes the method.