diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutableQuery.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutableQuery.scala index dbcc6b4905db3..9cc06642319d2 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutableQuery.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutableQuery.scala @@ -21,7 +21,7 @@ package org.neo4j.cypher.internal import org.neo4j.cypher.CypherExecutionMode import org.neo4j.graphdb.Result -import org.neo4j.kernel.api.query.PlannerInfo +import org.neo4j.kernel.api.query.CompilerInfo import org.neo4j.kernel.impl.query.TransactionalContext import org.neo4j.values.virtual.MapValue @@ -38,15 +38,17 @@ trait ExecutableQuery { * @param params the parameters * @return the query result */ - def run(transactionalContext: TransactionalContext, executionMode: CypherExecutionMode, params: MapValue): Result + def execute(transactionalContext: TransactionalContext, executionMode: CypherExecutionMode, params: MapValue): Result /** * The reusability state of this executable query. */ def reusabilityState(lastCommittedTxId: () => Long, ctx: TransactionalContext): ReusabilityState - // This is to force eager calculation - val plannerInfo: PlannerInfo + /** + * Meta-data about the compiled used for this query. + */ + val compilerInfo: CompilerInfo // val to force eager calculation /** * Names of all parameters for this query, explicit and auto-parametrized. diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala index 3a8c9735b33e3..6263d6617e392 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala @@ -96,8 +96,8 @@ class ExecutionEngine(val queryService: GraphDatabaseQueryService, checkParameters(executableQuery.paramNames, params, executableQuery.extractedParams) } val combinedParams = params.updatedWith(executableQuery.extractedParams) - context.executingQuery().planningCompleted(executableQuery.plannerInfo) - executableQuery.run(context, preParsedQuery.executionMode, combinedParams) + context.executingQuery().compilationCompleted(executableQuery.compilerInfo) + executableQuery.execute(context, preParsedQuery.executionMode, combinedParams) } catch { case t: Throwable => diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/SchemaHelper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/SchemaHelper.scala index 100f2627332b2..3555a18fa92b0 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/SchemaHelper.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/SchemaHelper.scala @@ -63,7 +63,7 @@ class SchemaHelper(val queryCache: QueryCache[_,_]) { import scala.collection.JavaConverters._ def planLabels = { - plan.plannerInfo.indexes().asScala.collect { case item: SchemaIndexUsage => item.getLabelId.toLong } + plan.compilerInfo.indexes().asScala.collect { case item: SchemaIndexUsage => item.getLabelId.toLong } } def allLabels: Seq[Long] = { diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CypherCurrentCompiler.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CypherCurrentCompiler.scala index 597cd8a61a56b..050c1f9667ee4 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CypherCurrentCompiler.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CypherCurrentCompiler.scala @@ -30,7 +30,7 @@ import org.neo4j.cypher.internal.runtime.interpreted.{TransactionBoundQueryConte import org.neo4j.cypher.internal.v3_5.logical.plans.{ExplicitNodeIndexUsage, ExplicitRelationshipIndexUsage, SchemaIndexScanUsage, SchemaIndexSeekUsage} import org.neo4j.cypher.internal._ import org.neo4j.graphdb.{Notification, Result} -import org.neo4j.kernel.api.query.{ExplicitIndexUsage, PlannerInfo, SchemaIndexUsage} +import org.neo4j.kernel.api.query.{ExplicitIndexUsage, CompilerInfo, SchemaIndexUsage} import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, TransactionalContext} import org.neo4j.kernel.monitoring.{Monitors => KernelMonitors} import org.neo4j.values.virtual.MapValue @@ -103,8 +103,8 @@ case class CypherCurrentCompiler[CONTEXT <: RuntimeContext](planner: CypherPlann new ExceptionTranslatingQueryContext(ctx) } - def run(transactionalContext: TransactionalContext, executionMode: CypherExecutionMode, - params: MapValue): Result = { + def execute(transactionalContext: TransactionalContext, executionMode: CypherExecutionMode, + params: MapValue): Result = { val innerExecutionMode = executionMode match { case CypherExecutionMode.explain => ExplainMode case CypherExecutionMode.profile => ProfileMode @@ -127,8 +127,8 @@ case class CypherCurrentCompiler[CONTEXT <: RuntimeContext](planner: CypherPlann def reusabilityState(lastCommittedTxId: () => Long, ctx: TransactionalContext): ReusabilityState = reusabilityState - override val plannerInfo: PlannerInfo = { - new PlannerInfo(inner.plannerUsed.name, inner.runtimeUsed.name, inner.plannedIndexUsage.map { + override val compilerInfo: CompilerInfo = { + new CompilerInfo(inner.plannerUsed.name, inner.runtimeUsed.name, inner.plannedIndexUsage.map { case SchemaIndexSeekUsage(identifier, labelId, label, propertyKeys) => new SchemaIndexUsage(identifier, labelId, label, propertyKeys: _*) case SchemaIndexScanUsage(identifier, labelId, label, propertyKey) => new SchemaIndexUsage(identifier, labelId, label, propertyKey) case ExplicitNodeIndexUsage(identifier, index) => new ExplicitIndexUsage(identifier, "NODE", index) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Cypher23Compiler.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Cypher23Compiler.scala index 910b86e96c5df..ec66667be263e 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Cypher23Compiler.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/Cypher23Compiler.scala @@ -37,7 +37,7 @@ import org.neo4j.cypher.internal.spi.v2_3.{TransactionBoundGraphStatistics, Tran import org.neo4j.function.ThrowingBiConsumer import org.neo4j.graphdb.{Node, Relationship, Result} import org.neo4j.kernel.GraphDatabaseQueryService -import org.neo4j.kernel.api.query.{IndexUsage, PlannerInfo} +import org.neo4j.kernel.api.query.{IndexUsage, CompilerInfo} import org.neo4j.kernel.impl.core.EmbeddedProxySPI import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, TransactionalContext} import org.neo4j.kernel.monitoring.{Monitors => KernelMonitors} @@ -106,11 +106,11 @@ trait Cypher23Compiler extends CachingPlanner[PreparedQuery] with Compiler { FineToReuse } - override val plannerInfo = new PlannerInfo(inner.plannerUsed.name, inner.runtimeUsed.name, emptyList[IndexUsage]) + override val compilerInfo = new CompilerInfo(inner.plannerUsed.name, inner.runtimeUsed.name, emptyList[IndexUsage]) - override def run(transactionalContext: TransactionalContext, - executionMode: CypherExecutionMode, - params: MapValue): Result = { + override def execute(transactionalContext: TransactionalContext, + executionMode: CypherExecutionMode, + params: MapValue): Result = { var map: mutable.Map[String, Any] = mutable.Map[String, Any]() params.foreach(new ThrowingBiConsumer[String, AnyValue, RuntimeException] { override def accept(t: String, u: AnyValue): Unit = map.put(t, valueHelper.fromValue(u)) diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Cypher31Compiler.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Cypher31Compiler.scala index a961631530dce..3306f37d066be 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Cypher31Compiler.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/Cypher31Compiler.scala @@ -37,7 +37,7 @@ import org.neo4j.cypher.internal.spi.v3_1.{TransactionalContextWrapper => Transa import org.neo4j.function.ThrowingBiConsumer import org.neo4j.graphdb.Result import org.neo4j.kernel.GraphDatabaseQueryService -import org.neo4j.kernel.api.query.{IndexUsage, PlannerInfo} +import org.neo4j.kernel.api.query.{IndexUsage, CompilerInfo} import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, TransactionalContext} import org.neo4j.kernel.monitoring.{Monitors => KernelMonitors} import org.neo4j.logging.Log @@ -110,9 +110,9 @@ trait Cypher31Compiler extends CachingPlanner[PreparedQuerySyntax] with Compiler FineToReuse } - override val plannerInfo = new PlannerInfo(inner.plannerUsed.name, inner.runtimeUsed.name, emptyList[IndexUsage]) + override val compilerInfo = new CompilerInfo(inner.plannerUsed.name, inner.runtimeUsed.name, emptyList[IndexUsage]) - override def run(transactionalContext: TransactionalContext, executionMode: CypherExecutionMode, params: MapValue): Result = { + override def execute(transactionalContext: TransactionalContext, executionMode: CypherExecutionMode, params: MapValue): Result = { var map: mutable.Map[String, Any] = mutable.Map[String, Any]() params.foreach(new ThrowingBiConsumer[String, AnyValue, RuntimeException] { override def accept(t: String, u: AnyValue): Unit = map.put(t, valueHelper.fromValue(u)) diff --git a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionalContextWrapper.scala b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionalContextWrapper.scala index 2c2d0049cef09..07c369717ae1c 100644 --- a/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionalContextWrapper.scala +++ b/community/cypher/interpreted-runtime/src/main/scala/org/neo4j/cypher/internal/runtime/interpreted/TransactionalContextWrapper.scala @@ -27,7 +27,7 @@ import org.neo4j.internal.kernel.api.security.SecurityContext import org.neo4j.kernel.GraphDatabaseQueryService import org.neo4j.kernel.api.KernelTransaction.Revertable import org.neo4j.kernel.api.dbms.DbmsOperations -import org.neo4j.kernel.api.query.PlannerInfo +import org.neo4j.kernel.api.query.CompilerInfo import org.neo4j.kernel.api.txstate.TxStateHolder import org.neo4j.kernel.api.{KernelTransaction, ResourceTracker, Statement} import org.neo4j.kernel.impl.factory.DatabaseInfo @@ -80,7 +80,7 @@ case class TransactionalContextWrapper(tc: TransactionalContext) extends QueryTr def securityContext: SecurityContext = tc.securityContext - def notifyPlanningCompleted(plannerInfo: PlannerInfo): Unit = tc.executingQuery().planningCompleted(plannerInfo) + def notifyCompilationCompleted(compilerInfo: CompilerInfo): Unit = tc.executingQuery().compilationCompleted(compilerInfo) def kernelStatisticProvider: KernelStatisticProvider = new ProfileKernelStatisticProvider(tc.kernelStatisticProvider()) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/CompilerInfo.java similarity index 90% rename from community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java rename to community/kernel/src/main/java/org/neo4j/kernel/api/query/CompilerInfo.java index d467bc1092752..eab09f57d4753 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/PlannerInfo.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/CompilerInfo.java @@ -23,13 +23,13 @@ import javax.annotation.Nonnull; -public class PlannerInfo +public class CompilerInfo { private final String planner; private final String runtime; private final List indexes; - public PlannerInfo( @Nonnull String planner, @Nonnull String runtime, @Nonnull List indexes ) + public CompilerInfo( @Nonnull String planner, @Nonnull String runtime, @Nonnull List indexes ) { this.planner = planner; this.runtime = runtime; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java index 7899661fab8c4..29afebaeb9703 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/ExecutingQuery.java @@ -58,7 +58,7 @@ public class ExecutingQuery private final long startTimeNanos; private final long startTimestampMillis; /** Uses write barrier of {@link #status}. */ - private long planningDoneNanos; + private long compilationCompletedNanos; private final long threadExecutingTheQueryId; @SuppressWarnings( {"unused", "FieldCanBeLocal"} ) private final String threadExecutingTheQueryName; @@ -71,7 +71,7 @@ public class ExecutingQuery private final long heapAllocatedBytesWhenQueryStarted; private final Map transactionAnnotationData; /** Uses write barrier of {@link #status}. */ - private PlannerInfo plannerInfo; + private CompilerInfo compilerInfo; private volatile ExecutingQueryStatus status = SimpleState.planning(); /** Updated through {@link #WAIT_TIME} */ @SuppressWarnings( "unused" ) @@ -116,10 +116,10 @@ public ExecutingQuery( // update state - public void planningCompleted( PlannerInfo plannerInfo ) + public void compilationCompleted( CompilerInfo compilerInfo ) { - this.plannerInfo = plannerInfo; - this.planningDoneNanos = clock.nanos(); + this.compilerInfo = compilerInfo; + this.compilationCompletedNanos = clock.nanos(); this.status = SimpleState.running(); // write barrier - must be last } @@ -159,9 +159,9 @@ public QuerySnapshot snapshot() } while ( this.status != status ); // guarded by barrier - unused if status is planning, stable otherwise - long planningDoneNanos = this.planningDoneNanos; - // guarded by barrier - like planningDoneNanos - PlannerInfo planner = status.isPlanning() ? null : this.plannerInfo; + long compilationCompletedNanos = this.compilationCompletedNanos; + // guarded by barrier - like compilationCompletedNanos + CompilerInfo planner = status.isPlanning() ? null : this.compilerInfo; List waitingOnLocks = status.isWaitingOnLocks() ? status.waitingOnLocks() : Collections.emptyList(); // activeLockCount is not atomic to capture, so we capture it after the most sensitive part. long totalActiveLocks = this.activeLockCount.getAsLong(); @@ -170,7 +170,7 @@ public QuerySnapshot snapshot() PageCounterValues pageCounters = new PageCounterValues( pageCursorCounters ); // - at this point we are done capturing the "live" state, and can start computing the snapshot - - long planningTimeNanos = (status.isPlanning() ? currentTimeNanos : planningDoneNanos) - startTimeNanos; + long compilationTimeNanos = (status.isPlanning() ? currentTimeNanos : compilationCompletedNanos) - startTimeNanos; long elapsedTimeNanos = currentTimeNanos - startTimeNanos; cpuTimeNanos -= cpuTimeNanosWhenQueryStarted; waitTimeNanos += status.waitTimeNanos( currentTimeNanos ); @@ -184,7 +184,7 @@ public QuerySnapshot snapshot() this, planner, pageCounters, - NANOSECONDS.toMillis( planningTimeNanos ), + NANOSECONDS.toMillis( compilationTimeNanos ), NANOSECONDS.toMillis( elapsedTimeNanos ), cpuTimeNanos == 0 && cpuTimeNanosWhenQueryStarted == -1 ? -1 : NANOSECONDS.toMillis( cpuTimeNanos ), NANOSECONDS.toMillis( waitTimeNanos ), diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/query/QuerySnapshot.java b/community/kernel/src/main/java/org/neo4j/kernel/api/query/QuerySnapshot.java index 9a466c8734458..344b8b58aa585 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/api/query/QuerySnapshot.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/api/query/QuerySnapshot.java @@ -31,8 +31,8 @@ public class QuerySnapshot { private final ExecutingQuery query; - private final PlannerInfo plannerInfo; - private final long planningTimeMillis; + private final CompilerInfo compilerInfo; + private final long compilationTimeMillis; private final long elapsedTimeMillis; private final long cpuTimeMillis; private final long waitTimeMillis; @@ -43,14 +43,14 @@ public class QuerySnapshot private final long allocatedBytes; private final PageCounterValues page; - QuerySnapshot( ExecutingQuery query, PlannerInfo plannerInfo, PageCounterValues page, long planningTimeMillis, - long elapsedTimeMillis, long cpuTimeMillis, long waitTimeMillis, String status, - Map resourceInfo, List waitingLocks, long activeLockCount, long allocatedBytes ) + QuerySnapshot( ExecutingQuery query, CompilerInfo compilerInfo, PageCounterValues page, long compilationTimeMillis, + long elapsedTimeMillis, long cpuTimeMillis, long waitTimeMillis, String status, + Map resourceInfo, List waitingLocks, long activeLockCount, long allocatedBytes ) { this.query = query; - this.plannerInfo = plannerInfo; + this.compilerInfo = compilerInfo; this.page = page; - this.planningTimeMillis = planningTimeMillis; + this.compilationTimeMillis = compilationTimeMillis; this.elapsedTimeMillis = elapsedTimeMillis; this.cpuTimeMillis = cpuTimeMillis; this.waitTimeMillis = waitTimeMillis; @@ -98,23 +98,23 @@ public long activeLockCount() public String planner() { - return plannerInfo == null ? null : plannerInfo.planner(); + return compilerInfo == null ? null : compilerInfo.planner(); } public String runtime() { - return plannerInfo == null ? null : plannerInfo.runtime(); + return compilerInfo == null ? null : compilerInfo.runtime(); } public List> indexes() { - if ( plannerInfo == null ) + if ( compilerInfo == null ) { return Collections.emptyList(); } - return plannerInfo.indexes().stream() - .map( IndexUsage::asMap ) - .collect( Collectors.toList() ); + return compilerInfo.indexes().stream() + .map( IndexUsage::asMap ) + .collect( Collectors.toList() ); } public String status() @@ -137,9 +137,9 @@ public long startTimestampMillis() * * @return the time in milliseconds spent planning the query. */ - public long planningTimeMillis() + public long compilationTimeMillis() { - return planningTimeMillis; + return compilationTimeMillis; } /** diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/query/PlannerInfoTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/query/CompilerInfoTest.java similarity index 81% rename from community/kernel/src/test/java/org/neo4j/kernel/api/query/PlannerInfoTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/api/query/CompilerInfoTest.java index 532e923df6278..c5e68316b71a3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/query/PlannerInfoTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/query/CompilerInfoTest.java @@ -25,16 +25,16 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -public class PlannerInfoTest +public class CompilerInfoTest { @Test public void plannerInfoShouldBeInSmallCase() { // given - PlannerInfo plannerInfo = new PlannerInfo( "PLANNER", "RUNTIME", emptyList() ); + CompilerInfo compilerInfo = new CompilerInfo( "PLANNER", "RUNTIME", emptyList() ); // then - assertThat( plannerInfo.planner(), is( "planner" ) ); - assertThat( plannerInfo.runtime(), is( "runtime" ) ); + assertThat( compilerInfo.planner(), is( "planner" ) ); + assertThat( compilerInfo.runtime(), is( "runtime" ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java index 6f72567897249..23903f03ea56d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/api/query/ExecutingQueryTest.java @@ -85,7 +85,7 @@ public void shouldTransitionBetweenStates() assertEquals( "planning", query.snapshot().status() ); // when - query.planningCompleted( new PlannerInfo( "the-planner", "the-runtime", emptyList() ) ); + query.compilationCompleted( new CompilerInfo( "the-planner", "the-runtime", emptyList() ) ); // then assertEquals( "running", query.snapshot().status() ); @@ -120,16 +120,16 @@ public void shouldReportPlanningTime() // then QuerySnapshot snapshot = query.snapshot(); - assertEquals( snapshot.planningTimeMillis(), snapshot.elapsedTimeMillis() ); + assertEquals( snapshot.compilationTimeMillis(), snapshot.elapsedTimeMillis() ); // when clock.forward( 16, TimeUnit.MILLISECONDS ); - query.planningCompleted( new PlannerInfo( "the-planner", "the-runtime", emptyList() ) ); + query.compilationCompleted( new CompilerInfo( "the-planner", "the-runtime", emptyList() ) ); clock.forward( 200, TimeUnit.MILLISECONDS ); // then snapshot = query.snapshot(); - assertEquals( 140, snapshot.planningTimeMillis() ); + assertEquals( 140, snapshot.compilationTimeMillis() ); assertEquals( 340, snapshot.elapsedTimeMillis() ); } @@ -137,7 +137,7 @@ public void shouldReportPlanningTime() public void shouldReportWaitTime() { // given - query.planningCompleted( new PlannerInfo( "the-planner", "the-runtime", emptyList() ) ); + query.compilationCompleted( new CompilerInfo( "the-planner", "the-runtime", emptyList() ) ); // then assertEquals( "running", query.snapshot().status() ); @@ -189,7 +189,7 @@ public void shouldReportWaitTime() public void shouldReportQueryWaitTime() { // given - query.planningCompleted( new PlannerInfo( "the-planner", "the-runtime", emptyList() ) ); + query.compilationCompleted( new CompilerInfo( "the-planner", "the-runtime", emptyList() ) ); // when query.waitsForQuery( subQuery ); diff --git a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLogFormatter.java b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLogFormatter.java index 560a7ba16faf3..854cd71d03cb3 100644 --- a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLogFormatter.java +++ b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/QueryLogFormatter.java @@ -55,7 +55,7 @@ static void formatAllocatedBytes( StringBuilder result, QuerySnapshot query ) static void formatDetailedTime( StringBuilder result, QuerySnapshot query ) { - result.append( "(planning: " ).append( query.planningTimeMillis() ); + result.append( "(planning: " ).append( query.compilationTimeMillis() ); Long cpuTime = query.cpuTimeMillis(); if ( cpuTime != null ) { diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/ConfiguredQueryLoggerTest.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/ConfiguredQueryLoggerTest.java index 2bce0e5f16e12..296d1e2a89973 100644 --- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/ConfiguredQueryLoggerTest.java +++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/ConfiguredQueryLoggerTest.java @@ -34,7 +34,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.io.pagecache.tracing.cursor.PageCursorCounters; import org.neo4j.kernel.api.query.ExecutingQuery; -import org.neo4j.kernel.api.query.PlannerInfo; +import org.neo4j.kernel.api.query.CompilerInfo; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo; import org.neo4j.kernel.impl.query.clientconnection.ShellConnectionInfo; @@ -489,7 +489,7 @@ public void shouldLogRuntime() // when clock.forward( 11, TimeUnit.MILLISECONDS ); - query.planningCompleted( new PlannerInfo( "magic", "quantum", Collections.emptyList() ) ); + query.compilationCompleted( new CompilerInfo( "magic", "quantum", Collections.emptyList() ) ); queryLogger.success( query ); // then