Change cypher 'aux' package to 'util'

'aux' is apparently reserved by windows, and project containing a 'aux' directory cannot be checked out by windows users!
neo4j · Oct 3, 2017 · f671843 · f671843
1 parent dea7245
commit f671843
Show file tree

Hide file tree

Showing 909 changed files with 1,244 additions and 1,266 deletions.
diff --git a/community/cypher/cypher-compiler-3.4/pom.xml b/community/cypher/cypher-compiler-3.4/pom.xml
@@ -120,7 +120,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-aux-3.4</artifactId>
+      <artifactId>neo4j-cypher-util-3.4</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

diff --git a/...-3.4/src/main/java/org/neo4j/cypher/internal/compiler/v3_4/common/CypherOrderability.java b/...-3.4/src/main/java/org/neo4j/cypher/internal/compiler/v3_4/common/CypherOrderability.java
@@ -30,8 +30,8 @@
 
 import org.neo4j.cypher.internal.compiler.v3_4.spi.NodeIdWrapper;
 import org.neo4j.cypher.internal.compiler.v3_4.spi.RelationshipIdWrapper;
-import org.neo4j.cypher.internal.aux.v3_4.IncomparableValuesException;
-import org.neo4j.cypher.internal.aux.v3_4.UnorderableValueException;
+import org.neo4j.cypher.internal.util.v3_4.IncomparableValuesException;
+import org.neo4j.cypher.internal.util.v3_4.UnorderableValueException;
 import org.neo4j.graphdb.Path;
 import org.neo4j.graphdb.PropertyContainer;
 import org.neo4j.helpers.MathUtil;

diff --git a/...-compiler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ContextCreator.scala b/...-compiler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ContextCreator.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4
 
 import java.time.Clock
 
-import org.neo4j.cypher.internal.aux.v3_4.InputPosition
+import org.neo4j.cypher.internal.util.v3_4.InputPosition
 import org.neo4j.cypher.internal.compiler.v3_4.phases.CompilerContext
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.{ExpressionEvaluator, Metrics, MetricsFactory, QueryGraphSolver}
 import org.neo4j.cypher.internal.compiler.v3_4.spi.PlanContext

diff --git a/...-compiler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/CypherCompiler.scala b/...-compiler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/CypherCompiler.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4
 
 import java.time.Clock
 
-import org.neo4j.cypher.internal.aux.v3_4.InputPosition
+import org.neo4j.cypher.internal.util.v3_4.InputPosition
 import org.neo4j.cypher.internal.compiler.v3_4.phases.{CompilerContext, _}
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter.PlanRewriter

diff --git a/...r-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/SyntaxExceptionCreator.scala b/...r-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/SyntaxExceptionCreator.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4
 
-import org.neo4j.cypher.internal.aux.v3_4.{CypherException, InputPosition, SyntaxException}
+import org.neo4j.cypher.internal.util.v3_4.{CypherException, InputPosition, SyntaxException}
 import org.neo4j.cypher.internal.frontend.v3_4.semantics.SemanticErrorDef
 
 class SyntaxExceptionCreator(queryText: String, preParserOffset: Option[InputPosition]) extends ((String, InputPosition) => CypherException) {

diff --git a/...3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/NestedPlanExpression.scala b/...3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/NestedPlanExpression.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast
 
-import org.neo4j.cypher.internal.aux.v3_4.InputPosition
+import org.neo4j.cypher.internal.util.v3_4.InputPosition
 import org.neo4j.cypher.internal.v3_4.logical.plans.LogicalPlan
 import org.neo4j.cypher.internal.v3_4.expressions.Expression
 import org.neo4j.cypher.internal.v3_4.expressions.Expression.SemanticContext

diff --git a/...compiler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/QueryTagger.scala b/...compiler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/QueryTagger.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast
 
-import org.neo4j.cypher.internal.aux.v3_4.ASTNode
+import org.neo4j.cypher.internal.util.v3_4.ASTNode
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.v3_4.functions._
 import org.neo4j.cypher.internal.frontend.v3_4.parser.CypherParser

diff --git a/...c/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/ResolvedFunctionInvocation.scala b/...c/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/ResolvedFunctionInvocation.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast
 
-import org.neo4j.cypher.internal.aux.v3_4.InputPosition
+import org.neo4j.cypher.internal.util.v3_4.InputPosition
 import org.neo4j.cypher.internal.frontend.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans.{QualifiedName, UserFunctionSignature}
 import org.neo4j.cypher.internal.frontend.v3_4.semantics.SemanticCheckResult._

diff --git a/...ler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/SeekRangeWrapper.scala b/...ler-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/SeekRangeWrapper.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast
 
-import org.neo4j.cypher.internal.aux.v3_4.InputPosition
+import org.neo4j.cypher.internal.util.v3_4.InputPosition
 import org.neo4j.cypher.internal.compiler.v3_4.{InequalitySeekRange, PrefixRange}
 import org.neo4j.cypher.internal.v3_4.expressions.Expression
 import org.neo4j.cypher.internal.v3_4.expressions.Expression.SemanticContext

diff --git a/...a/org/neo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/ClauseConverters.scala b/...a/org/neo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/ClauseConverters.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.aux.v3_4.{InternalException, SyntaxException}
+import org.neo4j.cypher.internal.util.v3_4.{InternalException, SyntaxException}
 import org.neo4j.cypher.internal.compiler.v3_4.planner._
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.semantics.SemanticTable

diff --git a/...rg/neo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/PlannerQueryBuilder.scala b/...rg/neo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/PlannerQueryBuilder.scala
@@ -118,7 +118,7 @@ case class PlannerQueryBuilder(private val q: PlannerQuery, semanticTable: Seman
     }
 
     def groupInequalities(plannerQuery: PlannerQuery): PlannerQuery = {
-      import org.neo4j.cypher.internal.aux.v3_4.NonEmptyList._
+      import org.neo4j.cypher.internal.util.v3_4.NonEmptyList._
 
       plannerQuery
         .amendQueryGraph(_.mapSelections {

diff --git a/...rg/neo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/StatementConverters.scala b/...rg/neo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/StatementConverters.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.aux.v3_4.{ASTNode, InternalException}
+import org.neo4j.cypher.internal.util.v3_4.{ASTNode, InternalException}
 import org.neo4j.cypher.internal.compiler.v3_4.ast.convert.plannerQuery.ClauseConverters._
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.ast
@@ -28,7 +28,7 @@ import org.neo4j.cypher.internal.ir.v3_4.{PeriodicCommit, UnionQuery}
 import org.neo4j.cypher.internal.v3_4.expressions.{And, Or}
 
 object StatementConverters {
-  import org.neo4j.cypher.internal.aux.v3_4.Foldable._
+  import org.neo4j.cypher.internal.util.v3_4.Foldable._
 
   def toPlannerQueryBuilder(q: SingleQuery, semanticTable: SemanticTable): PlannerQueryBuilder =
     q.clauses.foldLeft(PlannerQueryBuilder(semanticTable)) {

diff --git a/...4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/groupInequalityPredicates.scala b/...4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/groupInequalityPredicates.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.convert.plannerQuery
 
-import org.neo4j.cypher.internal.aux.v3_4.NonEmptyList
+import org.neo4j.cypher.internal.util.v3_4.NonEmptyList
 import org.neo4j.cypher.internal.ir.v3_4.Predicate
 import org.neo4j.cypher.internal.v3_4.expressions.{AndedPropertyInequalities, InequalityExpression, Property, Variable}
 

diff --git a/...rc/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/InliningContext.scala b/...rc/main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/InliningContext.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, TypedRewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, TypedRewriter, bottomUp}
 import org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters.InliningContext._
 import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.copyVariables
 import org.neo4j.cypher.internal.v3_4.expressions._

diff --git a/.../main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/inlineProjections.scala b/.../main/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/inlineProjections.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters
 
-import org.neo4j.cypher.internal.aux.v3_4._
+import org.neo4j.cypher.internal.util.v3_4._
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.fixedPoint
 import org.neo4j.cypher.internal.v3_4.expressions.{Expression, Pattern, Variable}

diff --git a/...o4j/cypher/internal/compiler/v3_4/ast/rewriters/namePatternPredicatePatternElements.scala b/...o4j/cypher/internal/compiler/v3_4/ast/rewriters/namePatternPredicatePatternElements.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.PatternExpressionPatternElementNamer
 import org.neo4j.cypher.internal.v3_4.expressions.PatternExpression
 

diff --git a/...la/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/reattachAliasedExpressions.scala b/...la/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/reattachAliasedExpressions.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.frontend.v3_4.ast.{Return, ReturnItem, With}
 import org.neo4j.cypher.internal.v3_4.expressions.{Expression, Variable}
 

diff --git a/...r-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/CompilerContext.scala b/...r-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/CompilerContext.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.phases
 
 import java.time.Clock
 
-import org.neo4j.cypher.internal.aux.v3_4.{CypherException, InputPosition}
+import org.neo4j.cypher.internal.util.v3_4.{CypherException, InputPosition}
 import org.neo4j.cypher.internal.compiler.v3_4._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.{Metrics, QueryGraphSolver}
 import org.neo4j.cypher.internal.compiler.v3_4.spi.PlanContext

diff --git a/....4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/CreatePlannerQuery.scala b/....4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/CreatePlannerQuery.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.phases
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.v3_4.InternalException
 import org.neo4j.cypher.internal.compiler.v3_4.ast.convert.plannerQuery.StatementConverters._
 import org.neo4j.cypher.internal.frontend.v3_4.ast.Query
 import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING

diff --git a/...4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/DeprecationWarnings.scala b/...4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/DeprecationWarnings.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.phases
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.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

diff --git a/...-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/LogicalPlanState.scala b/...-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/LogicalPlanState.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.phases
 
-import org.neo4j.cypher.internal.aux.v3_4.InputPosition
+import org.neo4j.cypher.internal.util.v3_4.InputPosition
 import org.neo4j.cypher.internal.frontend.v3_4.PlannerName
 import org.neo4j.cypher.internal.frontend.v3_4.ast.{Query, Statement}
 import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseState, Condition}

diff --git a/...src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/RewriteProcedureCalls.scala b/...src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/RewriteProcedureCalls.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.phases
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.compiler.v3_4.ast.ResolvedFunctionInvocation
 import org.neo4j.cypher.internal.compiler.v3_4.spi.PlanContext
 import org.neo4j.cypher.internal.frontend.v3_4.ast._

diff --git a/...ain/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/CantCompileQueryException.scala b/...ain/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/CantCompileQueryException.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner
 
-import org.neo4j.cypher.internal.aux.v3_4.CypherException
-import org.neo4j.cypher.internal.aux.v3_4.spi.MapToPublicExceptions
+import org.neo4j.cypher.internal.util.v3_4.CypherException
+import org.neo4j.cypher.internal.util.v3_4.spi.MapToPublicExceptions
 
 class CantCompileQueryException(message: String = "Internal error - should have used fall back to execute query, but something went horribly wrong", cause:Throwable=null)
   extends CypherException(message, cause) {

diff --git a/....4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/Eagerness.scala b/....4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/Eagerness.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.fixedPoint
 import org.neo4j.cypher.internal.ir.v3_4.{IdName, PlannerQuery, QueryGraph}
 import org.neo4j.cypher.internal.v3_4.logical.plans._

diff --git a/.../scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/OptionalMatchRemover.scala b/.../scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/OptionalMatchRemover.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
-import org.neo4j.cypher.internal.aux.v3_4.Rewritable._
-import org.neo4j.cypher.internal.aux.v3_4.{InputPosition, Rewriter, topDown}
+import org.neo4j.cypher.internal.util.v3_4.Rewritable._
+import org.neo4j.cypher.internal.util.v3_4.{InputPosition, Rewriter, topDown}
 import org.neo4j.cypher.internal.compiler.v3_4.phases.{CompilerContext, LogicalPlanState}
 import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase
 import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase.LOGICAL_PLANNING

diff --git a/...main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/PlanEventHorizon.scala b/...main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/PlanEventHorizon.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.v3_4.InternalException
 import org.neo4j.cypher.internal.compiler.v3_4.planner._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.steps.{PatternExpressionSolver, aggregation, projection, sortSkipAndLimit}
 import org.neo4j.cypher.internal.ir.v3_4._

diff --git a/.../src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/PlanUpdates.scala b/.../src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/PlanUpdates.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.v3_4.InternalException
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.steps.{LogicalPlanProducer, mergeUniqueIndexSeekLeafPlanner}
 import org.neo4j.cypher.internal.ir.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans.{LockNodes, LogicalPlan}

diff --git a/...main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/QueryGraphSolver.scala b/...main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/QueryGraphSolver.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.v3_4.InternalException
 import org.neo4j.cypher.internal.v3_4.logical.plans.LogicalPlan
 import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.PatternExpressionPatternElementNamer
 import org.neo4j.cypher.internal.ir.v3_4.{IdName, QueryGraph}

diff --git a/...scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/cardinality/TokenSpec.scala b/...scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/cardinality/TokenSpec.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.cardinality
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.v3_4.InternalException
 import org.neo4j.cypher.internal.frontend.v3_4._
 import org.neo4j.cypher.internal.frontend.v3_4.semantics.SemanticTable
 import org.neo4j.cypher.internal.ir.v3_4.IdName

diff --git a/.../org/neo4j/cypher/internal/compiler/v3_4/planner/logical/idp/SingleComponentPlanner.scala b/.../org/neo4j/cypher/internal/compiler/v3_4/planner/logical/idp/SingleComponentPlanner.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.idp
 
 
-import org.neo4j.cypher.internal.aux.v3_4.InternalException
+import org.neo4j.cypher.internal.util.v3_4.InternalException
 import org.neo4j.cypher.internal.compiler.v3_4.helpers.IteratorSupport._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.LogicalPlanningSupport._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical._

diff --git a/...scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/idp/extractPredicates.scala b/...scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/idp/extractPredicates.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.idp
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.v3_4.expressions._
 
 object extractPredicates {

diff --git a/...a/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/patternExpressionRewriter.scala b/...a/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/patternExpressionRewriter.scala
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
-import org.neo4j.cypher.internal.aux.v3_4.Foldable._
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, topDown}
+import org.neo4j.cypher.internal.util.v3_4.Foldable._
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, topDown}
 import org.neo4j.cypher.internal.compiler.v3_4.ast.NestedPlanExpression
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.projectNamedPaths

diff --git a/...4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/LogicalPlanRewriter.scala b/...4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/LogicalPlanRewriter.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.Rewriter
+import org.neo4j.cypher.internal.util.v3_4.Rewriter
 import org.neo4j.cypher.internal.compiler.v3_4.phases.{CompilerContext, LogicalPlanState}
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.fixedPoint
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSequencer

diff --git a/...org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/cleanUpEager.scala b/...org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/cleanUpEager.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.v3_4.logical.plans.{Eager, Limit, LoadCSV, UnwindCollection}
 
 case object cleanUpEager extends Rewriter {

diff --git a/...g/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/fuseSelections.scala b/...g/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/fuseSelections.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
 import org.neo4j.cypher.internal.v3_4.logical.plans.Selection
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 
 case object fuseSelections extends Rewriter {
 

diff --git a/.../internal/compiler/v3_4/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala b/.../internal/compiler/v3_4/planner/logical/plans/rewriter/predicateRemovalThroughJoins.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.v3_4.expressions.Expression
 import org.neo4j.cypher.internal.ir.v3_4.{CardinalityEstimation, IdName, QueryGraph}
 import org.neo4j.cypher.internal.v3_4.logical.plans.{NodeHashJoin, Selection}

diff --git a/...o4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/pruningVarExpander.scala b/...o4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/pruningVarExpander.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
 import org.neo4j.cypher.internal.v3_4.logical.plans._
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, topDown}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, topDown}
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans._
 import org.neo4j.cypher.internal.v3_4.expressions.{Expression, FunctionInvocation}
 

diff --git a/...j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/removeIdenticalPlans.scala b/...j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/removeIdenticalPlans.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.compiler.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans.LogicalPlan
 

diff --git a/...o4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/simplifyPredicates.scala b/...o4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/simplifyPredicates.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.v3_4.expressions.{AndedPropertyInequalities, Equals, In, ListLiteral}
 
 case object simplifyPredicates extends Rewriter {

diff --git a/.../org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/unnestApply.scala b/.../org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/unnestApply.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, topDown}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, topDown}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 
 case object unnestApply extends Rewriter {

diff --git a/...g/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/unnestOptional.scala b/...g/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/unnestOptional.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
-import org.neo4j.cypher.internal.aux.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.util.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.v3_4.expressions.Expression
 import org.neo4j.cypher.internal.ir.v3_4.{CardinalityEstimation, PlannerQuery}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
@@ -28,7 +28,7 @@ case object unnestOptional extends Rewriter {
 
   override def apply(input: AnyRef) = if (isSafe(input)) instance.apply(input) else input
 
-  import org.neo4j.cypher.internal.aux.v3_4.Foldable._
+  import org.neo4j.cypher.internal.util.v3_4.Foldable._
 
   /*
    * It is not safe to unnest an optional expand with when we have