Skip to content

Commit

Permalink
Create frontend-3_4 module
Browse files Browse the repository at this point in the history
  • Loading branch information
@pontusmelke
pontusmelke committed Sep 22, 2017
1 parent 86f6087 commit 8c2b9d3
Show file tree
Hide file tree
Showing 1,175 changed files with 2,617 additions and 2,623 deletions.
4 changes: 2 additions & 2 deletions ...-3.3/src/main/java/org/neo4j/cypher/internal/compiler/v3_3/common/CypherOrderability.java
View file
Expand Up @@ -30,8 +30,8 @@

import org.neo4j.cypher.internal.compiler.v3_3.spi.NodeIdWrapper;
import org.neo4j.cypher.internal.compiler.v3_3.spi.RelationshipIdWrapper;
import org.neo4j.cypher.internal.frontend.v3_3.IncomparableValuesException;
import org.neo4j.cypher.internal.frontend.v3_3.UnorderableValueException;
import org.neo4j.cypher.internal.frontend.v3_4.IncomparableValuesException;
import org.neo4j.cypher.internal.frontend.v3_4.UnorderableValueException;
import org.neo4j.graphdb.Path;
import org.neo4j.graphdb.PropertyContainer;
import org.neo4j.helpers.MathUtil;
Expand Down
2 changes: 1 addition & 1 deletion ...r-compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/BoundOrdering.scala
View file
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.frontend.v3_3.Bound
import org.neo4j.cypher.internal.frontend.v3_4.Bound

// Tested by SeekRangeTest
final case class MinBoundOrdering[T](inner: Ordering[T]) extends Ordering[Bound[T]] {
Expand Down
4 changes: 2 additions & 2 deletions ...-compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/ContextCreator.scala
View file
Expand Up @@ -24,8 +24,8 @@ import java.time.Clock
import org.neo4j.cypher.internal.compiler.v3_3.phases.CompilerContext
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.{ExpressionEvaluator, Metrics, MetricsFactory, QueryGraphSolver}
import org.neo4j.cypher.internal.compiler.v3_3.spi.PlanContext
import org.neo4j.cypher.internal.frontend.v3_3.InputPosition
import org.neo4j.cypher.internal.frontend.v3_3.phases.{BaseContext, CompilationPhaseTracer, InternalNotificationLogger, Monitors}
import org.neo4j.cypher.internal.frontend.v3_4.InputPosition
import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseContext, CompilationPhaseTracer, InternalNotificationLogger, Monitors}

trait ContextCreator[Context <: BaseContext] {
def create(tracer: CompilationPhaseTracer,
Expand Down
8 changes: 4 additions & 4 deletions ...-compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/CypherCompiler.scala
View file
Expand Up @@ -25,10 +25,10 @@ import org.neo4j.cypher.internal.compiler.v3_3.phases.{CompilerContext, _}
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical._
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans.rewriter.PlanRewriter
import org.neo4j.cypher.internal.compiler.v3_3.planner.{CheckForUnresolvedTokens, ResolveTokens}
import org.neo4j.cypher.internal.frontend.v3_3.InputPosition
import org.neo4j.cypher.internal.frontend.v3_3.ast.rewriters.ASTRewriter
import org.neo4j.cypher.internal.frontend.v3_3.helpers.rewriting.RewriterStepSequencer
import org.neo4j.cypher.internal.frontend.v3_3.phases._
import org.neo4j.cypher.internal.frontend.v3_4.InputPosition
import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.ASTRewriter
import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSequencer
import org.neo4j.cypher.internal.frontend.v3_4.phases._
import org.neo4j.cypher.internal.ir.v3_3.UnionQuery
import org.neo4j.cypher.internal.v3_3.logical.plans.LogicalPlan

Expand Down
7 changes: 3 additions & 4 deletions ...er-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/CypherCompilerFactory.scala
View file
Expand Up @@ -23,10 +23,9 @@ import java.time.Clock

import org.neo4j.cypher.internal.compiler.v3_3.phases.{CompilerContext, LogicalPlanState}
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical._
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.idp._
import org.neo4j.cypher.internal.frontend.v3_3.ast.rewriters.{ASTRewriter, IfNoParameter}
import org.neo4j.cypher.internal.frontend.v3_3.helpers.rewriting.RewriterStepSequencer
import org.neo4j.cypher.internal.frontend.v3_3.phases.{Monitors, Transformer}
import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.{ASTRewriter, IfNoParameter}
import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSequencer
import org.neo4j.cypher.internal.frontend.v3_4.phases.{Monitors, Transformer}

class CypherCompilerFactory[C <: CompilerContext, T <: Transformer[C, LogicalPlanState, LogicalPlanState]] {
val monitorTag = "cypher3.3"
Expand Down
2 changes: 1 addition & 1 deletion ...3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/HardcodedGraphStatistics.scala
View file
Expand Up @@ -20,7 +20,7 @@
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.compiler.v3_3.spi.GraphStatistics
import org.neo4j.cypher.internal.frontend.v3_3.{LabelId, RelTypeId}
import org.neo4j.cypher.internal.frontend.v3_4.{LabelId, RelTypeId}
import org.neo4j.cypher.internal.ir.v3_3.{Cardinality, Selectivity}


Expand Down
2 changes: 1 addition & 1 deletion ...her-compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/IdentitySet.scala
View file
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.frontend.v3_3.IdentityMap
import org.neo4j.cypher.internal.frontend.v3_4.IdentityMap

object IdentitySet {
private val PRESENT = new Object
Expand Down
2 changes: 1 addition & 1 deletion ...compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/IndexDescriptor.scala
View file
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.frontend.v3_3.{LabelId, PropertyKeyId}
import org.neo4j.cypher.internal.frontend.v3_4.{LabelId, PropertyKeyId}

object IndexDescriptor {
def apply(label: Int, property: Int): IndexDescriptor = IndexDescriptor(LabelId(label), Seq(PropertyKeyId(property)))
Expand Down
2 changes: 1 addition & 1 deletion ...her-compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/PlannerName.scala
View file
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.frontend.v3_3.PlannerName
import org.neo4j.cypher.internal.frontend.v3_4.PlannerName

sealed abstract class CostBasedPlannerName extends PlannerName {
val toTextOutput = "COST"
Expand Down
10 changes: 5 additions & 5 deletions ...ala/org/neo4j/cypher/internal/compiler/v3_3/ProcedureCallOrSchemaCommandPlanBuilder.scala
View file
Expand Up @@ -20,11 +20,11 @@
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.compiler.v3_3.phases._
import org.neo4j.cypher.internal.frontend.v3_3._
import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.phases.CompilationPhaseTracer.CompilationPhase
import org.neo4j.cypher.internal.frontend.v3_3.phases.CompilationPhaseTracer.CompilationPhase.PIPE_BUILDING
import org.neo4j.cypher.internal.frontend.v3_3.phases.{BaseState, Condition, Phase}
import org.neo4j.cypher.internal.frontend.v3_4._
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase
import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase.PIPE_BUILDING
import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseState, Condition, Phase}
import org.neo4j.cypher.internal.ir.v3_3.IdName
import org.neo4j.cypher.internal.v3_3.logical.plans
import org.neo4j.cypher.internal.v3_3.logical.plans.{LogicalPlan, ResolvedCall}
Expand Down
2 changes: 1 addition & 1 deletion ...ypher-compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/SeekRange.scala
View file
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.frontend.v3_3.{Bound, Bounds}
import org.neo4j.cypher.internal.frontend.v3_4.{Bound, Bounds}

/*
Seek ranges describe intervals. In practice they are used to summarize all inequalities over the
Expand Down
2 changes: 1 addition & 1 deletion ...r-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/SyntaxExceptionCreator.scala
View file
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3

import org.neo4j.cypher.internal.frontend.v3_3.{CypherException, InputPosition, SemanticErrorDef, SyntaxException}
import org.neo4j.cypher.internal.frontend.v3_4.{CypherException, InputPosition, SemanticErrorDef, SyntaxException}

class SyntaxExceptionCreator(queryText: String, preParserOffset: Option[InputPosition]) extends ((String, InputPosition) => CypherException) {
override def apply(message: String, position: InputPosition): CypherException = {
Expand Down
6 changes: 3 additions & 3 deletions ...3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/ast/NestedPlanExpression.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast

import org.neo4j.cypher.internal.frontend.v3_3.ast.Expression
import org.neo4j.cypher.internal.frontend.v3_3.ast.Expression.SemanticContext
import org.neo4j.cypher.internal.frontend.v3_3.{InputPosition, SemanticCheck, SemanticCheckResult}
import org.neo4j.cypher.internal.frontend.v3_4.ast.Expression
import org.neo4j.cypher.internal.frontend.v3_4.ast.Expression.SemanticContext
import org.neo4j.cypher.internal.frontend.v3_4.{InputPosition, SemanticCheck, SemanticCheckResult}
import org.neo4j.cypher.internal.v3_3.logical.plans.LogicalPlan

case class NestedPlanExpression(plan: LogicalPlan, projection: Expression)(val position: InputPosition) extends Expression {
Expand Down
6 changes: 3 additions & 3 deletions ...compiler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/ast/QueryTagger.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast

import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.ast.functions._
import org.neo4j.cypher.internal.frontend.v3_3.parser.CypherParser
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.ast.functions._
import org.neo4j.cypher.internal.frontend.v3_4.parser.CypherParser

import scala.annotation.tailrec
import scala.util.{Failure, Success, Try}
Expand Down
10 changes: 5 additions & 5 deletions ...c/main/scala/org/neo4j/cypher/internal/compiler/v3_3/ast/ResolvedFunctionInvocation.scala
View file
Expand Up @@ -19,11 +19,11 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast

import org.neo4j.cypher.internal.frontend.v3_3.SemanticCheckResult._
import org.neo4j.cypher.internal.frontend.v3_3._
import org.neo4j.cypher.internal.frontend.v3_3.ast.Expression.SemanticContext
import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.ast.functions.UserDefinedFunctionInvocation
import org.neo4j.cypher.internal.frontend.v3_4.SemanticCheckResult._
import org.neo4j.cypher.internal.frontend.v3_4._
import org.neo4j.cypher.internal.frontend.v3_4.ast.Expression.SemanticContext
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.ast.functions.UserDefinedFunctionInvocation
import org.neo4j.cypher.internal.v3_3.logical.plans.{QualifiedName, UserFunctionSignature}

object ResolvedFunctionInvocation {
Expand Down
6 changes: 3 additions & 3 deletions ...ler-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/ast/SeekRangeWrapper.scala
View file
Expand Up @@ -20,9 +20,9 @@
package org.neo4j.cypher.internal.compiler.v3_3.ast

import org.neo4j.cypher.internal.compiler.v3_3.{InequalitySeekRange, PrefixRange}
import org.neo4j.cypher.internal.frontend.v3_3.ast.Expression
import org.neo4j.cypher.internal.frontend.v3_3.ast.Expression.SemanticContext
import org.neo4j.cypher.internal.frontend.v3_3.{InputPosition, SemanticCheck, SemanticCheckResult}
import org.neo4j.cypher.internal.frontend.v3_4.ast.Expression
import org.neo4j.cypher.internal.frontend.v3_4.ast.Expression.SemanticContext
import org.neo4j.cypher.internal.frontend.v3_4.{InputPosition, SemanticCheck, SemanticCheckResult}

case class PrefixSeekRangeWrapper(range: PrefixRange[Expression])(val position: InputPosition) extends Expression {
override def semanticCheck(ctx: SemanticContext): SemanticCheck = SemanticCheckResult.success
Expand Down
6 changes: 3 additions & 3 deletions ...j/cypher/internal/compiler/v3_3/ast/conditions/containsNamedPathOnlyForShortestPath.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast.conditions

import org.neo4j.cypher.internal.frontend.v3_3.ast.conditions.containsNoMatchingNodes
import org.neo4j.cypher.internal.frontend.v3_3.ast.{NamedPatternPart, ShortestPaths}
import org.neo4j.cypher.internal.frontend.v3_3.helpers.rewriting.Condition
import org.neo4j.cypher.internal.frontend.v3_4.ast.conditions.containsNoMatchingNodes
import org.neo4j.cypher.internal.frontend.v3_4.ast.{NamedPatternPart, ShortestPaths}
import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.Condition

case object containsNamedPathOnlyForShortestPath extends Condition {
private val matcher = containsNoMatchingNodes({
Expand Down
4 changes: 2 additions & 2 deletions ...a/org/neo4j/cypher/internal/compiler/v3_3/ast/convert/plannerQuery/ClauseConverters.scala
View file
Expand Up @@ -20,8 +20,8 @@
package org.neo4j.cypher.internal.compiler.v3_3.ast.convert.plannerQuery

import org.neo4j.cypher.internal.compiler.v3_3.planner._
import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.{InternalException, SemanticTable, SyntaxException}
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.{InternalException, SemanticTable, SyntaxException}
import org.neo4j.cypher.internal.ir.v3_3.helpers.ExpressionConverters._
import org.neo4j.cypher.internal.ir.v3_3.helpers.PatternConverters._
import org.neo4j.cypher.internal.ir.v3_3.{NoHeaders, _}
Expand Down
8 changes: 4 additions & 4 deletions ...rg/neo4j/cypher/internal/compiler/v3_3/ast/convert/plannerQuery/PlannerQueryBuilder.scala
View file
Expand Up @@ -20,9 +20,9 @@
package org.neo4j.cypher.internal.compiler.v3_3.ast.convert.plannerQuery

import org.neo4j.cypher.internal.compiler.v3_3.helpers.ListSupport
import org.neo4j.cypher.internal.frontend.v3_3.ast.RelationshipStartItem
import org.neo4j.cypher.internal.frontend.v3_3.helpers.UnNamedNameGenerator
import org.neo4j.cypher.internal.frontend.v3_3.{SemanticDirection, SemanticTable}
import org.neo4j.cypher.internal.frontend.v3_4.ast.RelationshipStartItem
import org.neo4j.cypher.internal.frontend.v3_4.helpers.UnNamedNameGenerator
import org.neo4j.cypher.internal.frontend.v3_4.{SemanticDirection, SemanticTable}
import org.neo4j.cypher.internal.ir.v3_3._

case class PlannerQueryBuilder(private val q: PlannerQuery, semanticTable: SemanticTable, returns: Seq[IdName] = Seq.empty)
Expand Down Expand Up @@ -117,7 +117,7 @@ case class PlannerQueryBuilder(private val q: PlannerQuery, semanticTable: Seman
}

def groupInequalities(plannerQuery: PlannerQuery): PlannerQuery = {
import org.neo4j.cypher.internal.frontend.v3_3.helpers.NonEmptyList._
import org.neo4j.cypher.internal.frontend.v3_4.helpers.NonEmptyList._

plannerQuery
.amendQueryGraph(_.mapSelections {
Expand Down
4 changes: 2 additions & 2 deletions ...rg/neo4j/cypher/internal/compiler/v3_3/ast/convert/plannerQuery/StatementConverters.scala
View file
Expand Up @@ -20,8 +20,8 @@
package org.neo4j.cypher.internal.compiler.v3_3.ast.convert.plannerQuery

import org.neo4j.cypher.internal.compiler.v3_3.ast.convert.plannerQuery.ClauseConverters._
import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.{Foldable, InternalException, SemanticTable, ast}
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.{Foldable, InternalException, SemanticTable, ast}
import org.neo4j.cypher.internal.ir.v3_3.{PeriodicCommit, UnionQuery}

object StatementConverters {
Expand Down
6 changes: 3 additions & 3 deletions ...4j/cypher/internal/compiler/v3_3/ast/convert/plannerQuery/groupInequalityPredicates.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast.convert.plannerQuery

import org.neo4j.cypher.internal.frontend.v3_3.ast.{AndedPropertyInequalities, InequalityExpression, Property, Variable}
import org.neo4j.cypher.internal.frontend.v3_3.helpers.NonEmptyList
import org.neo4j.cypher.internal.frontend.v3_3.helpers.NonEmptyList._
import org.neo4j.cypher.internal.frontend.v3_4.ast.{AndedPropertyInequalities, InequalityExpression, Property, Variable}
import org.neo4j.cypher.internal.frontend.v3_4.helpers.NonEmptyList
import org.neo4j.cypher.internal.frontend.v3_4.helpers.NonEmptyList._
import org.neo4j.cypher.internal.ir.v3_3.Predicate

// This transforms
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/scala/org/neo4j/cypher/internal/compiler/v3_3/ast/rewriters/InliningContext.scala
View file
Expand Up @@ -20,9 +20,9 @@
package org.neo4j.cypher.internal.compiler.v3_3.ast.rewriters

import org.neo4j.cypher.internal.compiler.v3_3.ast.rewriters.InliningContext._
import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.ast.rewriters.copyVariables
import org.neo4j.cypher.internal.frontend.v3_3.{Rewriter, TypedRewriter, bottomUp}
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.copyVariables
import org.neo4j.cypher.internal.frontend.v3_4.{Rewriter, TypedRewriter, bottomUp}

case class InliningContext(projections: Map[Variable, Expression] = Map.empty,
seenVariables: Set[Variable] = Set.empty,
Expand Down
6 changes: 3 additions & 3 deletions .../main/scala/org/neo4j/cypher/internal/compiler/v3_3/ast/rewriters/inlineProjections.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast.rewriters

import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.helpers.fixedPoint
import org.neo4j.cypher.internal.frontend.v3_3.{InternalException, Rewriter, TypedRewriter, topDown}
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.helpers.fixedPoint
import org.neo4j.cypher.internal.frontend.v3_4.{InternalException, Rewriter, TypedRewriter, topDown}

case object inlineProjections extends Rewriter {

Expand Down
4 changes: 2 additions & 2 deletions .../scala/org/neo4j/cypher/internal/compiler/v3_3/ast/rewriters/inliningContextCreator.scala
View file
Expand Up @@ -19,8 +19,8 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast.rewriters

import org.neo4j.cypher.internal.frontend.v3_3._
import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_4._
import org.neo4j.cypher.internal.frontend.v3_4.ast._

object inliningContextCreator extends (ast.Statement => InliningContext) {

Expand Down
6 changes: 3 additions & 3 deletions ...o4j/cypher/internal/compiler/v3_3/ast/rewriters/namePatternPredicatePatternElements.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast.rewriters

import org.neo4j.cypher.internal.frontend.v3_3.ast._
import org.neo4j.cypher.internal.frontend.v3_3.ast.rewriters.PatternExpressionPatternElementNamer
import org.neo4j.cypher.internal.frontend.v3_3.{Rewriter, bottomUp}
import org.neo4j.cypher.internal.frontend.v3_4.ast._
import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.PatternExpressionPatternElementNamer
import org.neo4j.cypher.internal.frontend.v3_4.{Rewriter, bottomUp}

case object namePatternPredicatePatternElements extends Rewriter {

Expand Down
4 changes: 2 additions & 2 deletions ...la/org/neo4j/cypher/internal/compiler/v3_3/ast/rewriters/reattachAliasedExpressions.scala
View file
Expand Up @@ -19,8 +19,8 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.ast.rewriters

import org.neo4j.cypher.internal.frontend.v3_3.ast.{Return, _}
import org.neo4j.cypher.internal.frontend.v3_3.{Rewriter, bottomUp}
import org.neo4j.cypher.internal.frontend.v3_4.ast.{Return, _}
import org.neo4j.cypher.internal.frontend.v3_4.{Rewriter, bottomUp}

case object reattachAliasedExpressions extends Rewriter {
override def apply(in: AnyRef): AnyRef = findingRewriter.apply(in)
Expand Down
6 changes: 3 additions & 3 deletions ...3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/phases/CompilationContains.scala
View file
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.phases

import org.neo4j.cypher.internal.frontend.v3_3.SemanticState
import org.neo4j.cypher.internal.frontend.v3_3.ast.Statement
import org.neo4j.cypher.internal.frontend.v3_3.phases.Condition
import org.neo4j.cypher.internal.frontend.v3_4.SemanticState
import org.neo4j.cypher.internal.frontend.v3_4.ast.Statement
import org.neo4j.cypher.internal.frontend.v3_4.phases.Condition
import org.neo4j.cypher.internal.ir.v3_3.UnionQuery
import org.neo4j.cypher.internal.v3_3.logical.plans.LogicalPlan

Expand Down
4 changes: 2 additions & 2 deletions ...r-3.3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/phases/CompilerContext.scala
View file
Expand Up @@ -24,8 +24,8 @@ import java.time.Clock
import org.neo4j.cypher.internal.compiler.v3_3._
import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.{Metrics, QueryGraphSolver}
import org.neo4j.cypher.internal.compiler.v3_3.spi.PlanContext
import org.neo4j.cypher.internal.frontend.v3_3.phases.{BaseContext, CompilationPhaseTracer, InternalNotificationLogger, Monitors}
import org.neo4j.cypher.internal.frontend.v3_3.{CypherException, InputPosition, SemanticErrorDef}
import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseContext, CompilationPhaseTracer, InternalNotificationLogger, Monitors}
import org.neo4j.cypher.internal.frontend.v3_4.{CypherException, InputPosition, SemanticErrorDef}

class CompilerContext(val exceptionCreator: (String, InputPosition) => CypherException,
val tracer: CompilationPhaseTracer,
Expand Down
8 changes: 4 additions & 4 deletions ....3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/phases/CreatePlannerQuery.scala
View file
Expand Up @@ -20,10 +20,10 @@
package org.neo4j.cypher.internal.compiler.v3_3.phases

import org.neo4j.cypher.internal.compiler.v3_3.ast.convert.plannerQuery.StatementConverters._
import org.neo4j.cypher.internal.frontend.v3_3.InternalException
import org.neo4j.cypher.internal.frontend.v3_3.ast.Query
import org.neo4j.cypher.internal.frontend.v3_3.phases.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING
import org.neo4j.cypher.internal.frontend.v3_3.phases.{BaseContext, BaseState, Phase}
import org.neo4j.cypher.internal.frontend.v3_4.InternalException
import org.neo4j.cypher.internal.frontend.v3_4.ast.Query
import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING
import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseContext, BaseState, Phase}
import org.neo4j.cypher.internal.ir.v3_3.UnionQuery

object CreatePlannerQuery extends Phase[BaseContext, BaseState, LogicalPlanState] {
Expand Down
10 changes: 5 additions & 5 deletions ...3/src/main/scala/org/neo4j/cypher/internal/compiler/v3_3/phases/DeprecationWarnings.scala
View file
Expand Up @@ -19,11 +19,11 @@
*/
package org.neo4j.cypher.internal.compiler.v3_3.phases

import org.neo4j.cypher.internal.frontend.v3_3.InternalException
import org.neo4j.cypher.internal.frontend.v3_3.ast.{ProcedureResultItem, Statement, UnresolvedCall}
import org.neo4j.cypher.internal.frontend.v3_3.notification.{DeprecatedFieldNotification, DeprecatedProcedureNotification, InternalNotification, ProcedureWarningNotification}
import org.neo4j.cypher.internal.frontend.v3_3.phases.CompilationPhaseTracer.CompilationPhase.DEPRECATION_WARNINGS
import org.neo4j.cypher.internal.frontend.v3_3.phases.{BaseContext, BaseState, VisitorPhase}
import org.neo4j.cypher.internal.frontend.v3_4.InternalException
import org.neo4j.cypher.internal.frontend.v3_4.ast.{ProcedureResultItem, Statement, UnresolvedCall}
import org.neo4j.cypher.internal.frontend.v3_4.notification.{DeprecatedFieldNotification, DeprecatedProcedureNotification, InternalNotification, ProcedureWarningNotification}
import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase.DEPRECATION_WARNINGS
import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseContext, BaseState, VisitorPhase}
import org.neo4j.cypher.internal.v3_3.logical.plans.{FieldSignature, ProcedureSignature, ResolvedCall}

object ProcedureDeprecationWarnings extends VisitorPhase[BaseContext, BaseState] {
Expand Down

0 comments on commit 8c2b9d3

Please sign in to comment.