[V1] Moves datum/catalog from eval/planner to spi java package (#1581)

partiql · Sep 17, 2024 · 8e0afff · 8e0afff
1 parent 82ae5d9
commit 8e0afff
Show file tree

Hide file tree

Showing 229 changed files with 682 additions and 628 deletions.
diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
@@ -24,14 +24,14 @@ import org.partiql.cli.pipeline.Pipeline
 import org.partiql.cli.shell.Shell
 import org.partiql.eval.PartiQLEngine
 import org.partiql.eval.PartiQLResult
-import org.partiql.planner.catalog.Name
 import org.partiql.plugins.memory.MemoryConnector
 import org.partiql.plugins.memory.MemoryTable
+import org.partiql.spi.catalog.Name
 import org.partiql.spi.connector.Connector
+import org.partiql.spi.value.ion.IonDatum
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.io.PartiQLValueTextWriter
-import org.partiql.value.ion.IonDatum
 import picocli.CommandLine
 import java.io.File
 import java.io.InputStream

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
@@ -9,9 +9,9 @@ import org.partiql.eval.PartiQLResult
 import org.partiql.parser.PartiQLParser
 import org.partiql.plan.v1.PartiQLPlan
 import org.partiql.planner.PartiQLPlanner
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.connector.Connector
 import java.time.Instant
-import org.partiql.planner.catalog.Session as PlannerSession
 
 internal class Pipeline private constructor(
     private val parser: PartiQLParser,
@@ -35,7 +35,7 @@ internal class Pipeline private constructor(
 
         private val catalogs = connectors.values.map { it.getCatalog() }
 
-        fun planner() = PlannerSession.builder()
+        fun planner() = org.partiql.spi.catalog.Session.builder()
             .identity(userId)
             .namespace(currentDirectory)
             .catalog(currentCatalog)

diff --git a/partiql-eval/api/partiql-eval.api b/partiql-eval/api/partiql-eval.api
@@ -1,7 +1,7 @@
 public abstract interface class org/partiql/eval/PartiQLEngine {
 	public static final field Companion Lorg/partiql/eval/PartiQLEngine$Companion;
 	public static fun builder ()Lorg/partiql/eval/builder/PartiQLEngineBuilder;
-	public abstract fun prepare (Lorg/partiql/plan/v1/PartiQLPlan;Lorg/partiql/eval/PartiQLEngine$Mode;Lorg/partiql/planner/catalog/Session;)Lorg/partiql/eval/PartiQLStatement;
+	public abstract fun prepare (Lorg/partiql/plan/v1/PartiQLPlan;Lorg/partiql/eval/PartiQLEngine$Mode;Lorg/partiql/spi/catalog/Session;)Lorg/partiql/eval/PartiQLStatement;
 	public static fun standard ()Lorg/partiql/eval/PartiQLEngine;
 }
 
@@ -44,7 +44,7 @@ public final class org/partiql/eval/PartiQLResult$Value : org/partiql/eval/Parti
 }
 
 public abstract interface class org/partiql/eval/PartiQLStatement {
-	public abstract fun execute (Lorg/partiql/planner/catalog/Session;)Lorg/partiql/eval/PartiQLResult;
+	public abstract fun execute (Lorg/partiql/spi/catalog/Session;)Lorg/partiql/eval/PartiQLResult;
 }
 
 public final class org/partiql/eval/builder/PartiQLEngineBuilder {

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt
@@ -2,7 +2,7 @@ package org.partiql.eval
 
 import org.partiql.eval.builder.PartiQLEngineBuilder
 import org.partiql.plan.v1.PartiQLPlan
-import org.partiql.planner.catalog.Session
+import org.partiql.spi.catalog.Session
 
 /**
  * PartiQL's Experimental Engine.

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLStatement.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLStatement.kt
@@ -1,6 +1,6 @@
 package org.partiql.eval
 
-import org.partiql.planner.catalog.Session
+import org.partiql.spi.catalog.Session
 
 /**
  * Represents a compiled PartiQL statement ready for execution.

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/Environment.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/Environment.kt
@@ -1,6 +1,6 @@
 package org.partiql.eval.internal
 
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 /**
  * This class represents the Variables Environment defined in the PartiQL Specification.

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/Record.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/Record.kt
@@ -1,6 +1,6 @@
 package org.partiql.eval.internal
 
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 internal class Record(val values: Array<Datum>) {
 

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/SqlCompiler.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/SqlCompiler.kt
@@ -52,7 +52,6 @@ import org.partiql.eval.internal.operator.rex.ExprSubquery
 import org.partiql.eval.internal.operator.rex.ExprSubqueryRow
 import org.partiql.eval.internal.operator.rex.ExprTable
 import org.partiql.eval.internal.operator.rex.ExprVar
-import org.partiql.eval.value.Datum
 import org.partiql.plan.relOpExcludePath
 import org.partiql.plan.relOpExcludeStep
 import org.partiql.plan.relOpExcludeTypeCollIndex
@@ -114,8 +113,9 @@ import org.partiql.plan.v1.operator.rex.RexSubqueryTest
 import org.partiql.plan.v1.operator.rex.RexTable
 import org.partiql.plan.v1.operator.rex.RexVar
 import org.partiql.plan.v1.operator.rex.RexVisitor
-import org.partiql.planner.catalog.Session
+import org.partiql.spi.catalog.Session
 import org.partiql.spi.fn.Agg
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 import org.partiql.plan.Rel as IRel
 

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
@@ -5,7 +5,7 @@ import org.partiql.eval.PartiQLStatement
 import org.partiql.eval.internal.statement.QueryStatement
 import org.partiql.plan.v1.PartiQLPlan
 import org.partiql.plan.v1.Statement
-import org.partiql.planner.catalog.Session
+import org.partiql.spi.catalog.Session
 
 internal class SqlEngine : PartiQLEngine {
 

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/RecordUtility.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/RecordUtility.kt
@@ -1,6 +1,6 @@
 package org.partiql.eval.internal.helpers
 
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 internal object RecordUtility {
     /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/RecordValueIterator.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/RecordValueIterator.kt
@@ -1,7 +1,7 @@
 package org.partiql.eval.internal.helpers
 
 import org.partiql.eval.internal.Record
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 /**
  * An [Iterator] over an [Iterator] lazily producing [Record]s as you call [next].

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/ValueUtility.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/ValueUtility.kt
@@ -1,7 +1,7 @@
 package org.partiql.eval.internal.helpers
 
 import org.partiql.errors.TypeCheckException
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
 import org.partiql.value.PartiQLValueExperimental

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/Operator.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/Operator.kt
@@ -2,8 +2,8 @@ package org.partiql.eval.internal.operator
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
-import org.partiql.eval.value.Datum
 import org.partiql.spi.fn.Agg
+import org.partiql.spi.value.Datum
 
 internal sealed interface Operator {
 

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/DatumArrayComparator.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/DatumArrayComparator.kt
@@ -1,6 +1,6 @@
 package org.partiql.eval.internal.operator.rel
 
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 internal object DatumArrayComparator : Comparator<Array<Datum>> {
     private val delegate = Datum.comparator(false)

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpAggregate.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpAggregate.kt
@@ -3,8 +3,8 @@ package org.partiql.eval.internal.operator.rel
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
 import org.partiql.spi.fn.Agg
+import org.partiql.spi.value.Datum
 import java.util.TreeMap
 import java.util.TreeSet
 

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpExceptAll.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpExceptAll.kt
@@ -4,7 +4,7 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.RecordUtility.coerceMissing
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import java.util.TreeMap
 
 internal class RelOpExceptAll(

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpExclude.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpExclude.kt
@@ -4,15 +4,15 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.IteratorSupplier
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
-import org.partiql.eval.value.Field
 import org.partiql.plan.v1.operator.rel.RelExcludeCollectionWildcard
 import org.partiql.plan.v1.operator.rel.RelExcludeIndex
 import org.partiql.plan.v1.operator.rel.RelExcludeKey
 import org.partiql.plan.v1.operator.rel.RelExcludePath
 import org.partiql.plan.v1.operator.rel.RelExcludeStep
 import org.partiql.plan.v1.operator.rel.RelExcludeStructWildcard
 import org.partiql.plan.v1.operator.rel.RelExcludeSymbol
+import org.partiql.spi.value.Datum
+import org.partiql.spi.value.Field
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
 import org.partiql.value.PartiQLValueType

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpExcludeOld.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpExcludeOld.kt
@@ -4,14 +4,14 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.IteratorSupplier
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
-import org.partiql.eval.value.Field
 import org.partiql.plan.Rel
 import org.partiql.plan.relOpExcludeTypeCollIndex
 import org.partiql.plan.relOpExcludeTypeCollWildcard
 import org.partiql.plan.relOpExcludeTypeStructKey
 import org.partiql.plan.relOpExcludeTypeStructSymbol
 import org.partiql.plan.relOpExcludeTypeStructWildcard
+import org.partiql.spi.value.Datum
+import org.partiql.spi.value.Field
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
 import org.partiql.value.PartiQLValueType

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIntersectAll.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIntersectAll.kt
@@ -4,7 +4,7 @@ import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.helpers.RecordUtility.coerceMissing
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import java.util.TreeMap
 
 internal class RelOpIntersectAll(

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIterate.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIterate.kt
@@ -4,7 +4,7 @@ import org.partiql.errors.TypeCheckException
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class RelOpIterate(

diff --git a/...iql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt b/...iql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
@@ -3,7 +3,7 @@ package org.partiql.eval.internal.operator.rel
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class RelOpIteratePermissive(

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,8 +4,8 @@ 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.eval.value.Datum
 import org.partiql.plan.v1.Schema
+import org.partiql.spi.value.Datum
 
 /**
  * Full Outer Join returns all joined records from the [lhs] and [rhs] when the [condition] evaluates to true. For all

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,9 +4,8 @@ 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.eval.value.Datum
 import org.partiql.plan.v1.Schema
-import org.partiql.value.PartiQLValueExperimental
+import org.partiql.spi.value.Datum
 
 /**
  * Left Outer Join returns all joined records from the [lhs] and [rhs] when the [condition] evaluates to true. For all
@@ -63,7 +62,6 @@ internal class RelOpJoinOuterLeft(
      *
      * Development Note: The non-lateral version wouldn't need to push to the current environment.
      */
-    @OptIn(PartiQLValueExperimental::class)
     private fun implementation() = iterator {
         for (lhsRecord in lhs) {
             var lhsMatched = false

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,8 +4,8 @@ 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.eval.value.Datum
 import org.partiql.plan.v1.Schema
+import org.partiql.spi.value.Datum
 
 /**
  * Right Outer Join returns all joined records from the [lhs] and [rhs] when the [condition] evaluates to true. For all

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpSort.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpSort.kt
@@ -3,7 +3,7 @@ package org.partiql.eval.internal.operator.rel
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import java.util.Collections
 
 internal class RelOpSort(

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpUnpivot.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpUnpivot.kt
@@ -4,8 +4,8 @@ import org.partiql.errors.TypeCheckException
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.Record
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
-import org.partiql.eval.value.Field
+import org.partiql.spi.value.Datum
+import org.partiql.spi.value.Field
 import org.partiql.types.PType
 
 /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/CastTable.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/CastTable.kt
@@ -5,7 +5,7 @@ import com.amazon.ionelement.api.IonElementException
 import com.amazon.ionelement.api.createIonElementLoader
 import org.partiql.errors.DataException
 import org.partiql.errors.TypeCheckException
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 import org.partiql.types.PType.Kind.ARRAY
 import org.partiql.types.PType.Kind.BAG

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprArray.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprArray.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 /**
  * Creates an array by evaluating each input value expression.

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprBag.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprBag.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 /**
  * Creates a bag by evaluating each input value expression.

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCallDynamic.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCallDynamic.kt
@@ -3,8 +3,8 @@ package org.partiql.eval.internal.operator.rex
 import org.partiql.errors.TypeCheckException
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
 import org.partiql.spi.fn.Fn
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
 

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCallStatic.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCallStatic.kt
@@ -2,8 +2,8 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
 import org.partiql.spi.fn.Fn
+import org.partiql.spi.value.Datum
 import org.partiql.value.PartiQLValueExperimental
 
 @OptIn(PartiQLValueExperimental::class)

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCase.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCase.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class ExprCase(

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCaseBranch.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCaseBranch.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCaseSearched.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCaseSearched.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 
 /**
  * Implementation of the <searched case> expression.

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCast.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCast.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 /**

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCoalesce.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprCoalesce.kt
@@ -2,7 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.internal.Environment
 import org.partiql.eval.internal.operator.Operator
-import org.partiql.eval.value.Datum
+import org.partiql.spi.value.Datum
 import org.partiql.value.PartiQLValueExperimental
 
 internal class ExprCoalesce(