Query: Fix #1664 - Tagged or named queries #12069
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
Contributor
anpete
commented
May 18, 2018
anpete
commented
- Adds WithTag query operator. From the doc comments: "Adds a tag to the collection of tags associated with an EF LINQ query. Tags are query annotations that can provide contextual tracing information at different points in the query pipeline." The first application of tags, included in this PR, is to cause a diagnostic header comment to be prefixed to generated SQL queries. E.g.
- Also fixes a bug uncovered in the new parameterization parameter caching - NotParameterized parameters are removed from the set of parameters values, but we can't do that if the parameter is being used in more than one place. Fix is to add simple ref counting to the parameter cache.
smitpatel
reviewed
May 18, 2018
| { | ||
| if (_tags == null) | ||
| { | ||
| _tags = _queryCompilationContext?.QueryAnnotations != null |
|
I know “Foo” and “Bar” are overdone, but why would you name or tag your example query “Laurel”? |
|
@tuespetre It's actually "Yanni". |
smitpatel
reviewed
May 21, 2018
| @@ -34,8 +34,10 @@ public class ParameterExtractingExpressionVisitor : ExpressionVisitor | |||
| private readonly bool _parameterize; | |||
| private readonly bool _generateContextAccessors; | |||
|
|
|||
| private readonly Dictionary<Expression, (ParameterExpression Parameter, int RefCount)> _parameterCache | |||
There was a problem hiding this comment.
Do we have regression test for this bug?
There was a problem hiding this comment.
Yeah, exposed by new test Duplicate_tags. The same thing would probably happen for duplicate sql in call to FromSql.
smitpatel
approved these changes
May 21, 2018
- Adds WithTag query operator. From the doc comments: "Adds a tag to the collection of tags associated with an EF LINQ query. Tags are query annotations that can provide contextual tracing information at different points in the query pipeline." The first application of tags, included in this PR, is to cause a diagnostic header comment to be prefixed to generated SQL queries. E.g. ```sql -- EFCore: (#Yanni) SELECT TOP(1) [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region] FROM [Customers] AS [c] ORDER BY [c].[CustomerID] ``` - Also fixes a bug uncovered in the new parameterization parameter caching - NotParameterized parameters are removed from the set of parameters values, but we can't do that if the parameter is being used in more than one place. Fix is to add simple ref counting to the parameter cache.
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.