Cleanup imports

partiql · Oct 2, 2024 · c7d47d3 · c7d47d3
1 parent 9c24402
commit c7d47d3
Show file tree

Hide file tree

Showing 66 changed files with 253 additions and 209 deletions.
diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/pipeline/Pipeline.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/pipeline/Pipeline.kt
@@ -7,6 +7,7 @@ import org.partiql.errors.ProblemSeverity
 import org.partiql.eval.PartiQLEngine
 import org.partiql.eval.PartiQLResult
 import org.partiql.parser.PartiQLParser
+import org.partiql.plan.Plan
 import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Session
 
@@ -30,7 +31,7 @@ internal class Pipeline private constructor(
         return result.root
     }
 
-    private fun plan(statement: Statement, session: Session): org.partiql.plan.Plan {
+    private fun plan(statement: Statement, session: Session): Plan {
         val callback = ProblemListener()
         val result = planner.plan(statement, session, callback)
         val errors = callback.problems.filter { it.details.severity == ProblemSeverity.ERROR }
@@ -40,7 +41,7 @@ internal class Pipeline private constructor(
         TODO("Add V1 planner to the CLI")
     }
 
-    private fun execute(plan: org.partiql.plan.Plan, session: Session): PartiQLResult {
+    private fun execute(plan: Plan, session: Session): PartiQLResult {
         // val statement = engine.prepare(plan, session.mode, session.planner())
         // return engine.execute(statement)
         TODO("Add V1 planner to the CLI")

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt
@@ -1,6 +1,7 @@
 package org.partiql.eval
 
 import org.partiql.eval.builder.PartiQLEngineBuilder
+import org.partiql.plan.Plan
 import org.partiql.spi.catalog.Session
 
 /**
@@ -23,7 +24,7 @@ import org.partiql.spi.catalog.Session
  */
 public interface PartiQLEngine {
 
-    public fun prepare(plan: org.partiql.plan.Plan, mode: Mode, session: Session): PartiQLStatement
+    public fun prepare(plan: Plan, mode: Mode, session: Session): PartiQLStatement
 
     companion object {
 

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/SqlEngine.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/SqlEngine.kt
@@ -3,18 +3,20 @@ package org.partiql.eval.internal
 import org.partiql.eval.PartiQLEngine
 import org.partiql.eval.PartiQLStatement
 import org.partiql.eval.internal.statement.QueryStatement
+import org.partiql.plan.Operation.Query
+import org.partiql.plan.Plan
 import org.partiql.spi.catalog.Session
 
 internal class SqlEngine : PartiQLEngine {
 
-    override fun prepare(plan: org.partiql.plan.Plan, mode: PartiQLEngine.Mode, session: Session): PartiQLStatement {
+    override fun prepare(plan: Plan, mode: PartiQLEngine.Mode, session: Session): PartiQLStatement {
         try {
-            val statement = plan.getStatement()
-            if (statement !is org.partiql.plan.Statement.Query) {
+            val operation = plan.getOperation()
+            if (operation !is Query) {
                 throw IllegalArgumentException("Only query statements are supported")
             }
             val compiler = SqlCompiler(mode, session)
-            val root = compiler.compile(statement.getRoot())
+            val root = compiler.compile(operation.getRoot())
             return QueryStatement(root)
         } catch (ex: Exception) {
             // TODO wrap in some PartiQL Exception

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpJoinOuterFull.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpJoinOuterFull.kt
@@ -4,7 +4,7 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.ValueUtility.isTrue
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.plan.Schema
+import org.partiql.plan.rel.RelType
 import org.partiql.spi.value.Datum
 
 /**
@@ -18,8 +18,8 @@ internal class RelOpJoinOuterFull(
     private val lhs: Operator.Relation,
     private val rhs: Operator.Relation,
     private val condition: Operator.Expr,
-    lhsType: org.partiql.plan.Schema,
-    rhsType: org.partiql.plan.Schema,
+    lhsType: RelType,
+    rhsType: RelType,
 ) : RelOpPeeking() {
 
     // TODO BETTER MECHANISM FOR NULL PADDING

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpJoinOuterLeft.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpJoinOuterLeft.kt
@@ -4,7 +4,7 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.ValueUtility.isTrue
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.plan.Schema
+import org.partiql.plan.rel.RelType
 import org.partiql.spi.value.Datum
 
 /**
@@ -18,7 +18,7 @@ internal class RelOpJoinOuterLeft(
     private val lhs: Operator.Relation,
     private val rhs: Operator.Relation,
     private val condition: Operator.Expr,
-    rhsType: org.partiql.plan.Schema,
+    rhsType: RelType,
 ) : RelOpPeeking() {
 
     // TODO BETTER MECHANISM FOR NULL PADDING

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpJoinOuterRight.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpJoinOuterRight.kt
@@ -4,7 +4,7 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.ValueUtility.isTrue
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.plan.Schema
+import org.partiql.plan.rel.RelType
 import org.partiql.spi.value.Datum
 
 /**
@@ -17,7 +17,7 @@ internal class RelOpJoinOuterRight(
     private val lhs: Operator.Relation,
     private val rhs: Operator.Relation,
     private val condition: Operator.Expr,
-    lhsType: org.partiql.plan.Schema
+    lhsType: RelType
 ) : RelOpPeeking() {
 
     // TODO BETTER MECHANISM FOR NULL PADDING

diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEngineDefaultTest.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEngineDefaultTest.kt
@@ -11,6 +11,7 @@ import org.junit.jupiter.params.provider.MethodSource
 import org.partiql.eval.PartiQLEngine
 import org.partiql.eval.PartiQLResult
 import org.partiql.parser.PartiQLParser
+import org.partiql.plan.Plan
 import org.partiql.planner.builder.PartiQLPlannerBuilder
 import org.partiql.plugins.memory.MemoryCatalog
 import org.partiql.plugins.memory.MemoryTable
@@ -1293,7 +1294,7 @@ class PartiQLEngineDefaultTest {
         }
 
         @OptIn(PartiQLValueExperimental::class)
-        private fun comparisonString(expected: PartiQLValue, actual: PartiQLValue, plan: org.partiql.plan.Plan): String {
+        private fun comparisonString(expected: PartiQLValue, actual: PartiQLValue, plan: Plan): String {
             val expectedBuffer = ByteArrayOutputStream()
             val expectedWriter = PartiQLValueIonWriterBuilder.standardIonTextBuilder().build(expectedBuffer)
             expectedWriter.append(expected)
@@ -1349,7 +1350,7 @@ class PartiQLEngineDefaultTest {
             assertNotNull(error)
         }
 
-        private fun run(mode: PartiQLEngine.Mode): Pair<PartiQLValue, org.partiql.plan.Plan> {
+        private fun run(mode: PartiQLEngine.Mode): Pair<PartiQLValue, Plan> {
             val statement = parser.parse(input).root
             val catalog = MemoryCatalog.builder().name("memory").build()
             val session = Session.builder()
@@ -1372,7 +1373,7 @@ class PartiQLEngineDefaultTest {
         }
 
         @OptIn(PartiQLValueExperimental::class)
-        private fun comparisonString(expected: PartiQLValue, actual: PartiQLValue, plan: org.partiql.plan.Plan): String {
+        private fun comparisonString(expected: PartiQLValue, actual: PartiQLValue, plan: Plan): String {
             val expectedBuffer = ByteArrayOutputStream()
             val expectedWriter = PartiQLValueIonWriterBuilder.standardIonTextBuilder().build(expectedBuffer)
             expectedWriter.append(expected)