Moved compiled_runtime to runtime.compiled

neo4j · Jun 28, 2017 · 0c5fb58 · 0c5fb58
1 parent 29022c2
commit 0c5fb58
Show file tree

Hide file tree

Showing 102 changed files with 319 additions and 318 deletions.
diff --git a/...her/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/QueryExecutionTracer.java b/...her/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/QueryExecutionTracer.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal.v3_3.codegen;
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.QueryExecutionEvent;
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.QueryExecutionEvent;
 import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id;
 
 public interface QueryExecutionTracer

diff --git a/...ypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/profiling/ProfilingTracer.java b/...ypher/src/main/java/org/neo4j/cypher/internal/v3_3/codegen/profiling/ProfilingTracer.java
@@ -22,7 +22,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.QueryExecutionEvent;
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.QueryExecutionEvent;
 import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id;
 import org.neo4j.cypher.internal.compiler.v3_3.spi.KernelStatisticProvider;
 import org.neo4j.cypher.internal.v3_3.codegen.QueryExecutionTracer;

diff --git a/...pher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseCompatibilityFactory.scala b/...pher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseCompatibilityFactory.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.internal
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.EnterpriseRuntimeContextCreator
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.EnterpriseRuntimeContextCreator
 import org.neo4j.cypher.internal.compatibility.v3_3.{Compatibility, CostCompatibility}
 import org.neo4j.cypher.internal.compatibility.{v2_3, v3_1, v3_2}
 import org.neo4j.cypher.internal.compiler.v3_3._

diff --git a/...ise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseRuntimeBuilder.scala b/...ise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/EnterpriseRuntimeBuilder.scala
@@ -19,38 +19,39 @@
  */
 package org.neo4j.cypher.internal
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.{BuildCompiledExecutionPlan, EnterpriseRuntimeContext}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.{BuildCompiledExecutionPlan, EnterpriseRuntimeContext}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.phases.CompilationState
 import org.neo4j.cypher.internal.compiler.v3_3.phases.LogicalPlanState
 import org.neo4j.cypher.internal.frontend.v3_3.InvalidArgumentException
 import org.neo4j.cypher.internal.frontend.v3_3.notification.RuntimeUnsupportedNotification
 import org.neo4j.cypher.internal.frontend.v3_3.phases.{Do, If, Transformer}
 
 object EnterpriseRuntimeBuilder extends RuntimeBuilder[Transformer[EnterpriseRuntimeContext, LogicalPlanState, CompilationState]] {
-  def create(runtimeName: Option[RuntimeName], useErrorsOverWarnings: Boolean): Transformer[EnterpriseRuntimeContext, LogicalPlanState, CompilationState] = runtimeName match {
-    case None =>
-      BuildCompiledExecutionPlan andThen
-      If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty) {
-        BuildInterpretedExecutionPlan
-      }
+  def create(runtimeName: Option[RuntimeName], useErrorsOverWarnings: Boolean): Transformer[EnterpriseRuntimeContext, LogicalPlanState, CompilationState] =
+    runtimeName match {
+      case None =>
+        BuildCompiledExecutionPlan andThen
+          If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty) {
+            BuildInterpretedExecutionPlan
+          }
 
-    case Some(InterpretedRuntimeName) =>
-      BuildInterpretedExecutionPlan
+      case Some(InterpretedRuntimeName) =>
+        BuildInterpretedExecutionPlan
 
-    case Some(CompiledRuntimeName) if useErrorsOverWarnings =>
-      BuildCompiledExecutionPlan andThen
-      If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
-        Do((_,_) => throw new InvalidArgumentException("The given query is not currently supported in the selected runtime"))
-      )
+      case Some(CompiledRuntimeName) if useErrorsOverWarnings =>
+        BuildCompiledExecutionPlan andThen
+          If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
+            Do((_, _) => throw new InvalidArgumentException("The given query is not currently supported in the selected runtime"))
+          )
 
-    case Some(CompiledRuntimeName) =>
-      BuildCompiledExecutionPlan andThen
-      If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
-        Do((_: EnterpriseRuntimeContext).notificationLogger.log(RuntimeUnsupportedNotification)) andThen
-        BuildInterpretedExecutionPlan
-      )
+      case Some(CompiledRuntimeName) =>
+        BuildCompiledExecutionPlan andThen
+          If[EnterpriseRuntimeContext, LogicalPlanState, CompilationState](_.maybeExecutionPlan.isEmpty)(
+            Do((_: EnterpriseRuntimeContext).notificationLogger.log(RuntimeUnsupportedNotification)) andThen
+              BuildInterpretedExecutionPlan
+          )
 
-    case Some(x) => throw new InvalidArgumentException(s"This version of Neo4j does not support requested runtime: $x")
-  }
+      case Some(x) => throw new InvalidArgumentException(s"This version of Neo4j does not support requested runtime: $x")
+    }
 }
diff --git a/..._runtime/BuildCompiledExecutionPlan.scala → ...compiled/BuildCompiledExecutionPlan.scala b/..._runtime/BuildCompiledExecutionPlan.scala → ...compiled/BuildCompiledExecutionPlan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan._
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.phases.CompilationState
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{TaskCloser, _}

diff --git a/...led_runtime/CompiledExecutionResult.scala → ...me/compiled/CompiledExecutionResult.scala b/...led_runtime/CompiledExecutionResult.scala → ...me/compiled/CompiledExecutionResult.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
 
 import java.util
 

diff --git a/...iled_runtime/CompiledRuntimeBuilder.scala → ...ime/compiled/CompiledRuntimeBuilder.scala b/...iled_runtime/CompiledRuntimeBuilder.scala → ...ime/compiled/CompiledRuntimeBuilder.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
 
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.phases.CompilationState
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{CompiledRuntimeName, _}

diff --git a/...ed_runtime/EnterpriseRuntimeContext.scala → ...e/compiled/EnterpriseRuntimeContext.scala b/...ed_runtime/EnterpriseRuntimeContext.scala → ...e/compiled/EnterpriseRuntimeContext.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
 
 import java.time.Clock
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.CodeStructure
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.CommunityRuntimeContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.CodeStructure
 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.compiler.v3_3.{ContextCreator, CypherCompilerConfiguration, SyntaxExceptionCreator, UpdateStrategy}
@@ -71,4 +71,4 @@ case class EnterpriseRuntimeContextCreator(codeStructure: CodeStructure[Generate
     new EnterpriseRuntimeContext(exceptionCreator, tracer, notificationLogger, planContext,
                                 monitors, metrics, config, queryGraphSolver, updateStrategy, debugOptions, clock, codeStructure)
   }
-}
+}
diff --git a/...mpiled_runtime/ExecutionPlanBuilder.scala → ...ntime/compiled/ExecutionPlanBuilder.scala b/...mpiled_runtime/ExecutionPlanBuilder.scala → ...ntime/compiled/ExecutionPlanBuilder.scala
@@ -17,9 +17,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.DescriptionProvider
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{InternalExecutionResult, PeriodicCommitInfo, PlanFingerprint, Provider}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, ProfileMode, TaskCloser}
 import org.neo4j.cypher.internal.compiler.v3_3.planDescription.InternalPlanDescription

diff --git a/...untime/codegen/CodeGenConfiguration.scala → ...mpiled/codegen/CodeGenConfiguration.scala b/...untime/codegen/CodeGenConfiguration.scala → ...mpiled/codegen/CodeGenConfiguration.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
 
 import java.nio.file.{Path, Paths}
 

diff --git a/...iled_runtime/codegen/CodeGenContext.scala → ...ime/compiled/codegen/CodeGenContext.scala b/...iled_runtime/codegen/CodeGenContext.scala → ...ime/compiled/codegen/CodeGenContext.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.JoinData
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.JoinData
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenType
 import org.neo4j.cypher.internal.compiler.v3_3.planDescription.Id
 import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans.LogicalPlan
 import org.neo4j.cypher.internal.frontend.v3_3.SemanticTable

diff --git a/...ompiled_runtime/codegen/CodeGenPlan.scala → ...untime/compiled/codegen/CodeGenPlan.scala b/...ompiled_runtime/codegen/CodeGenPlan.scala → ...untime/compiled/codegen/CodeGenPlan.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.Instruction
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.JoinTableType
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.Instruction
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.JoinTableType
 import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans.LogicalPlan
 
 trait CodeGenPlan {

diff --git a/...piled_runtime/codegen/CodeGenerator.scala → ...time/compiled/codegen/CodeGenerator.scala b/...piled_runtime/codegen/CodeGenerator.scala → ...time/compiled/codegen/CodeGenerator.scala
@@ -17,15 +17,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
 
 import java.time.Clock
 import java.util
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.ExecutionPlanBuilder.DescriptionProvider
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.{CodeStructure, CodeStructureResult}
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.{CompiledExecutionResult, CompiledPlan, RunnablePlan}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.ExecutionPlanBuilder.DescriptionProvider
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.{CodeStructure, CodeStructureResult}
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.{CompiledExecutionResult, CompiledPlan, RunnablePlan}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.{InternalExecutionResult, PlanFingerprint, Provider}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, TaskCloser}
 import org.neo4j.cypher.internal.compiler.v3_3.planDescription.{Id, InternalPlanDescription}

diff --git a/...untime/codegen/LogicalPlanConverter.scala → ...mpiled/codegen/LogicalPlanConverter.scala b/...untime/codegen/LogicalPlanConverter.scala → ...mpiled/codegen/LogicalPlanConverter.scala
@@ -17,12 +17,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation.AggregationConverter.aggregateExpressionConverter
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.SortItem
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation.AggregationConverter.aggregateExpressionConverter
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.SortItem
 import org.neo4j.cypher.internal.compiler.v3_3.helpers.{One, ZeroOneOrMany}
 import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.plans._
 import org.neo4j.cypher.internal.compiler.v3_3.planner.logical.{SortDescription, plans}
@@ -33,7 +33,7 @@ import org.neo4j.cypher.internal.frontend.v3_3.{InternalException, ast, symbols}
 import org.neo4j.cypher.internal.frontend.v3_3.Foldable._
 import org.neo4j.cypher.internal.ir.v3_3.IdName
 import ExpressionConverter.createExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation.Distinct
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation.Distinct
 
 object LogicalPlanConverter {
 

diff --git a/...v3_3/compiled_runtime/codegen/Namer.scala → ...v3_3/runtime/compiled/codegen/Namer.scala b/...v3_3/compiled_runtime/codegen/Namer.scala → ...v3_3/runtime/compiled/codegen/Namer.scala
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen
 
 import java.util.concurrent.atomic.AtomicInteger
 

diff --git a/..._runtime/codegen/QueryExecutionEvent.java → ...compiled/codegen/QueryExecutionEvent.java b/..._runtime/codegen/QueryExecutionEvent.java → ...compiled/codegen/QueryExecutionEvent.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen;
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen;
 
 public interface QueryExecutionEvent extends AutoCloseable
 {

diff --git a/...ed_runtime/codegen/ir/AcceptVisitor.scala → ...e/compiled/codegen/ir/AcceptVisitor.scala b/...ed_runtime/codegen/ir/AcceptVisitor.scala → ...e/compiled/codegen/ir/AcceptVisitor.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
 
 case class AcceptVisitor(produceResultOpName: String, columns: Map[String, CodeGenExpression])
   extends Instruction {

diff --git a/...e/codegen/ir/AggregationInstruction.scala → ...d/codegen/ir/AggregationInstruction.scala b/...e/codegen/ir/AggregationInstruction.scala → ...d/codegen/ir/AggregationInstruction.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.aggregation.AggregateExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.aggregation.AggregateExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
 
 case class AggregationInstruction(opName: String, aggregationFunctions: Iterable[AggregateExpression])
   extends Instruction {

diff --git a/..._runtime/codegen/ir/BuildProbeTable.scala → ...compiled/codegen/ir/BuildProbeTable.scala b/..._runtime/codegen/ir/BuildProbeTable.scala → ...compiled/codegen/ir/BuildProbeTable.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
 
 sealed trait BuildProbeTable extends Instruction {
 

diff --git a/...d_runtime/codegen/ir/BuildSortTable.scala → .../compiled/codegen/ir/BuildSortTable.scala b/...d_runtime/codegen/ir/BuildSortTable.scala → .../compiled/codegen/ir/BuildSortTable.scala
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen._
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir.expressions.CodeGenExpression
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen._
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir.expressions.CodeGenExpression
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi._
 
 case class BuildSortTable(opName: String, tableName: String, columnVariables: Map[String, Variable],
                           sortItems: Iterable[SortItem], estimateCardinality: Double)

diff --git a/...egen/ir/CartesianProductInstruction.scala → ...egen/ir/CartesianProductInstruction.scala b/...egen/ir/CartesianProductInstruction.scala → ...egen/ir/CartesianProductInstruction.scala
@@ -17,10 +17,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.ir
+package org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.ir
 
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.CodeGenContext
-import org.neo4j.cypher.internal.compatibility.v3_3.compiled_runtime.codegen.spi.MethodStructure
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.CodeGenContext
+import org.neo4j.cypher.internal.compatibility.v3_3.runtime.compiled.codegen.spi.MethodStructure
 
 case class CartesianProductInstruction(id: String, instruction: Instruction) extends Instruction {