Skip to content

Commit

Permalink
Remove QueryState.queryId
Browse files Browse the repository at this point in the history 
This should have been in the forward-merge of PR 10822
  • Loading branch information
@thobe
thobe committed Jan 22, 2018
1 parent 64235d3 commit d5e31e3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 16 deletions.
5 changes: 2 additions & 3 deletions .../org/neo4j/cypher/internal/compatibility/v3_3/runtime/BuildInterpretedExecutionPlan.scala
View file
Expand Up @@ -53,7 +53,7 @@ object BuildInterpretedExecutionPlan extends Phase[CommunityRuntimeContext, Logi
val PipeInfo(pipe, updating, periodicCommitInfo, fp, planner) = pipeInfo
val columns = from.statement().returnColumns
val resultBuilderFactory = DefaultExecutionResultBuilderFactory(pipeInfo, columns, logicalPlan)
val func = getExecutionPlanFunction(periodicCommitInfo, from.queryText, updating, resultBuilderFactory,
val func = getExecutionPlanFunction(periodicCommitInfo, updating, resultBuilderFactory,
context.notificationLogger, InterpretedRuntimeName)

val execPlan: ExecutionPlan = new InterpretedExecutionPlan(func,
Expand All @@ -75,7 +75,6 @@ object BuildInterpretedExecutionPlan extends Phase[CommunityRuntimeContext, Logi
}

def getExecutionPlanFunction(periodicCommit: Option[PeriodicCommitInfo],
queryId: AnyRef,
updating: Boolean,
resultBuilderFactory: ExecutionResultBuilderFactory,
notificationLogger: InternalNotificationLogger,
Expand All @@ -98,7 +97,7 @@ object BuildInterpretedExecutionPlan extends Phase[CommunityRuntimeContext, Logi
if (profiling)
builder.setPipeDecorator(new Profiler(queryContext.transactionalContext.databaseInfo))

builder.build(queryId, planType, params, notificationLogger, runtimeName)
builder.build(planType, params, notificationLogger, runtimeName)
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...ernal/compatibility/v3_3/runtime/executionplan/DefaultExecutionResultBuilderFactory.scala
View file
Expand Up @@ -64,10 +64,10 @@ case class DefaultExecutionResultBuilderFactory(pipeInfo: PipeInfo,
exceptionDecorator = newDecorator
}

def build(queryId: AnyRef, planType: ExecutionMode, params: MapValue,
def build(planType: ExecutionMode, params: MapValue,
notificationLogger: InternalNotificationLogger, runtimeName: RuntimeName): InternalExecutionResult = {
taskCloser.addTask(queryContext.transactionalContext.close)
val state = new QueryState(queryContext, externalResource, params, pipeDecorator, queryId = queryId,
val state = new QueryState(queryContext, externalResource, params, pipeDecorator,
triadicState = mutable.Map.empty, repeatableReads = mutable.Map.empty)
try {
try {
Expand Down
2 changes: 1 addition & 1 deletion ...o4j/cypher/internal/compatibility/v3_3/runtime/executionplan/ExecutionResultBuilder.scala
View file
Expand Up @@ -32,7 +32,7 @@ trait ExecutionResultBuilder {
def setLoadCsvPeriodicCommitObserver(batchRowCount: Long)
def setPipeDecorator(newDecorator: PipeDecorator)
def setExceptionDecorator(newDecorator: CypherException => CypherException)
def build(queryId: AnyRef, planType: ExecutionMode, params: MapValue,
def build(planType: ExecutionMode, params: MapValue,
notificationLogger: InternalNotificationLogger, runtimeName: RuntimeName): InternalExecutionResult
}

Expand Down
9 changes: 3 additions & 6 deletions ...rc/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/pipes/QueryState.scala
View file
Expand Up @@ -19,8 +19,6 @@
*/
package org.neo4j.cypher.internal.compatibility.v3_3.runtime.pipes

import java.util.UUID

import org.neo4j.collection.primitive.PrimitiveLongSet
import org.neo4j.cypher.internal.QueryStatistics
import org.neo4j.cypher.internal.compatibility.v3_3.runtime.ExecutionContext
Expand All @@ -39,7 +37,6 @@ class QueryState(val query: QueryContext,
val decorator: PipeDecorator = NullPipeDecorator,
val timeReader: TimeReader = new TimeReader,
var initialContext: Option[ExecutionContext] = None,
val queryId: AnyRef = UUID.randomUUID().toString,
val triadicState: mutable.Map[String, PrimitiveLongSet] = mutable.Map.empty,
val repeatableReads: mutable.Map[Pipe, Seq[ExecutionContext]] = mutable.Map.empty,
val cachedIn: SingleThreadedLRUCache[Any, InCheckContainer] =
Expand All @@ -65,10 +62,10 @@ class QueryState(val query: QueryContext,
def getStatistics: QueryStatistics = query.getOptStatistics.getOrElse(QueryState.defaultStatistics)

def withDecorator(decorator: PipeDecorator) =
new QueryState(query, resources, params, decorator, timeReader, initialContext, queryId, triadicState, repeatableReads, cachedIn)
new QueryState(query, resources, params, decorator, timeReader, initialContext, triadicState, repeatableReads, cachedIn)

def withInitialContext(initialContext: ExecutionContext) =
new QueryState(query, resources, params, decorator, timeReader, Some(initialContext), queryId, triadicState, repeatableReads, cachedIn)
new QueryState(query, resources, params, decorator, timeReader, Some(initialContext), triadicState, repeatableReads, cachedIn)

/**
* When running on the RHS of an Apply, this method will fill an execution context with argument data
Expand All @@ -79,7 +76,7 @@ class QueryState(val query: QueryContext,
def copyArgumentStateTo(ctx: ExecutionContext): Unit = initialContext.foreach(initData => initData.copyTo(ctx))

def withQueryContext(query: QueryContext) =
new QueryState(query, resources, params, decorator, timeReader, initialContext, queryId, triadicState, repeatableReads, cachedIn)
new QueryState(query, resources, params, decorator, timeReader, initialContext, triadicState, repeatableReads, cachedIn)
}

object QueryState {
Expand Down
6 changes: 3 additions & 3 deletions ...pher/internal/compatibility/v3_3/runtime/executionplan/ExecutionWorkflowBuilderTest.scala
View file
Expand Up @@ -55,7 +55,7 @@ class ExecutionWorkflowBuilderTest extends CypherFunSuite {
builder.setQueryContext(context)

// THEN
val result = builder.build("42", NormalMode, EMPTY_MAP, devNullLogger, InterpretedRuntimeName)
val result = builder.build(NormalMode, EMPTY_MAP, devNullLogger, InterpretedRuntimeName)
result shouldBe a [PipeExecutionResult]
result.asInstanceOf[PipeExecutionResult].result shouldBe a[EagerResultIterator]
}
Expand All @@ -73,7 +73,7 @@ class ExecutionWorkflowBuilderTest extends CypherFunSuite {
builder.setQueryContext(context)

// THEN
val result = builder.build("42", NormalMode, EMPTY_MAP, devNullLogger, InterpretedRuntimeName)
val result = builder.build(NormalMode, EMPTY_MAP, devNullLogger, InterpretedRuntimeName)
result shouldBe a [PipeExecutionResult]
result.asInstanceOf[PipeExecutionResult].result should not be an[EagerResultIterator]
}
Expand All @@ -92,7 +92,7 @@ class ExecutionWorkflowBuilderTest extends CypherFunSuite {
builder.setQueryContext(context)

// THEN
val result = builder.build("42", ExplainMode, EMPTY_MAP, devNullLogger, InterpretedRuntimeName)
val result = builder.build(ExplainMode, EMPTY_MAP, devNullLogger, InterpretedRuntimeName)
result shouldBe a [ExplainExecutionResult]
}
}
2 changes: 1 addition & 1 deletion ...se/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/BuildSlottedExecutionPlan.scala
View file
Expand Up @@ -66,7 +66,7 @@ object BuildSlottedExecutionPlan extends Phase[EnterpriseRuntimeContext, Logical
val PipeInfo(pipe: Pipe, updating, periodicCommitInfo, fp, planner) = pipeInfo
val columns = from.statement().returnColumns
val resultBuilderFactory = DefaultExecutionResultBuilderFactory(pipeInfo, columns, logicalPlan)
val func = BuildInterpretedExecutionPlan.getExecutionPlanFunction(periodicCommitInfo, from.queryText, updating,
val func = BuildInterpretedExecutionPlan.getExecutionPlanFunction(periodicCommitInfo, updating,
resultBuilderFactory,
context.notificationLogger,
SlottedRuntimeName)
Expand Down

0 comments on commit d5e31e3

Please sign in to comment.