Query: Log query execution plan

dotnet · Jun 13, 2019 · d519f14 · d519f14
1 parent 82df078
commit d519f14
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 371 deletions.
diff --git a/src/EFCore.Relational/Infrastructure/EntityFrameworkRelationalServicesBuilder.cs b/src/EFCore.Relational/Infrastructure/EntityFrameworkRelationalServicesBuilder.cs
@@ -145,7 +145,6 @@ public override EntityFrameworkServicesBuilder TryAddCoreServices()
             TryAdd<IRelationalValueBufferFactoryFactory, TypedRelationalValueBufferFactoryFactory>();
             TryAdd<IDatabaseCreator>(p => p.GetService<IRelationalDatabaseCreator>());
             TryAdd<IDbContextTransactionManager>(p => p.GetService<IRelationalConnection>());
-            TryAdd<IExpressionPrinter, RelationalExpressionPrinter>();
             TryAdd<IQueryContextFactory, RelationalQueryContextFactory>();
             TryAdd<ICompiledQueryCacheKeyGenerator, RelationalCompiledQueryCacheKeyGenerator>();
             TryAdd<INamedConnectionStringResolver, NamedConnectionStringResolver>();

diff --git a/src/EFCore.Relational/Query/Internal/RelationalExpressionPrinter.cs b/src/EFCore.Relational/Query/Internal/RelationalExpressionPrinter.cs
diff --git a/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlConstantExpression.cs b/src/EFCore.Relational/Query/Pipeline/SqlExpressions/SqlConstantExpression.cs
@@ -31,7 +31,8 @@ private void Print(
             ExpressionPrinter expressionPrinter)
         {
             if (value is IEnumerable enumerable
-                && !(value is string))
+                && !(value is string)
+                && !(value is byte[]))
             {
                 bool first = true;
                 foreach (var item in enumerable)

diff --git a/src/EFCore/Diagnostics/CoreLoggerExtensions.cs b/src/EFCore/Diagnostics/CoreLoggerExtensions.cs
@@ -400,7 +400,7 @@ private static string QueryIterationFailed(EventDefinitionBase definition, Event
         /// <param name="queryExecutorExpression"> The query expression tree. </param>
         public static void QueryExecutionPlanned(
             [NotNull] this IDiagnosticsLogger<DbLoggerCategory.Query> diagnostics,
-            [NotNull] IExpressionPrinter expressionPrinter,
+            [NotNull] ExpressionPrinter expressionPrinter,
             [NotNull] Expression queryExecutorExpression)
         {
             var definition = CoreResources.LogQueryExecutionPlanned(diagnostics);

diff --git a/src/EFCore/Diagnostics/QueryExpressionEventData.cs b/src/EFCore/Diagnostics/QueryExpressionEventData.cs
@@ -21,12 +21,12 @@ public class QueryExpressionEventData : EventData
         /// <param name="eventDefinition"> The event definition. </param>
         /// <param name="messageGenerator"> A delegate that generates a log message for this event. </param>
         /// <param name="queryExpression"> The <see cref="Expression" />. </param>
-        /// <param name="expressionPrinter"> An <see cref="IExpressionPrinter" /> that can be used to render the <see cref="Expression" />. </param>
+        /// <param name="expressionPrinter"> An <see cref="ExpressionPrinter" /> that can be used to render the <see cref="Expression" />. </param>
         public QueryExpressionEventData(
             [NotNull] EventDefinitionBase eventDefinition,
             [NotNull] Func<EventDefinitionBase, EventData, string> messageGenerator,
             [NotNull] Expression queryExpression,
-            [NotNull] IExpressionPrinter expressionPrinter)
+            [NotNull] ExpressionPrinter expressionPrinter)
             : base(eventDefinition, messageGenerator)
         {
             Expression = queryExpression;
@@ -39,8 +39,8 @@ public QueryExpressionEventData(
         public virtual Expression Expression { get; }
 
         /// <summary>
-        ///     An <see cref="IExpressionPrinter" /> that can be used to render the <see cref="Expression" />.
+        ///     An <see cref="ExpressionPrinter" /> that can be used to render the <see cref="Expression" />.
         /// </summary>
-        public virtual IExpressionPrinter ExpressionPrinter { get; }
+        public virtual ExpressionPrinter ExpressionPrinter { get; }
     }
 }
diff --git a/src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs b/src/EFCore/Infrastructure/EntityFrameworkServicesBuilder.cs
@@ -109,7 +109,6 @@ public static readonly IDictionary<Type, ServiceCharacteristics> CoreServices
                 { typeof(IChangeDetector), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IDbContextServices), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IValueGeneratorSelector), new ServiceCharacteristics(ServiceLifetime.Scoped) },
-                { typeof(IExpressionPrinter), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IExecutionStrategyFactory), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IAsyncQueryProvider), new ServiceCharacteristics(ServiceLifetime.Scoped) },
                 { typeof(IQueryCompiler), new ServiceCharacteristics(ServiceLifetime.Scoped) },
@@ -234,7 +233,6 @@ public virtual EntityFrameworkServicesBuilder TryAddCoreServices()
             TryAdd<ICompiledQueryCache, CompiledQueryCache>();
             TryAdd<IAsyncQueryProvider, EntityQueryProvider>();
             TryAdd<IQueryCompiler, QueryCompiler>();
-            TryAdd<IExpressionPrinter, ExpressionPrinter>();
             TryAdd<ICompiledQueryCacheKeyGenerator, CompiledQueryCacheKeyGenerator>();
             TryAdd<ISingletonOptionsInitializer, SingletonOptionsInitializer>();
             TryAdd(typeof(IDiagnosticsLogger<>), typeof(DiagnosticsLogger<>));