From b7852b7271b91a8c1d2449cc6caf033cadbd3bd3 Mon Sep 17 00:00:00 2001
From: John Ed Quinn <johqunn@amazon.com>
Date: Tue, 10 Dec 2024 09:23:56 -0800
Subject: [PATCH 1/4] Removes PartiQLValue from public API

Removes PartiQLValueType from public API

Removes PartiQLValueExperimental from public API

Removes PartiQLValue reader/writer from public API

Moves public and internal APIs to textFixtures until testing can be fully migrated
---
 .../tutorials/Pluggable Functions Tutorial.md |   3 +-
 partiql-cli/build.gradle.kts                  |   1 +
 .../src/main/kotlin/org/partiql/cli/Main.kt   |   8 +-
 .../kotlin/org/partiql/cli/shell/Shell.kt     |   8 +-
 partiql-eval/build.gradle.kts                 |   1 +
 .../eval/internal/helpers/ValueUtility.kt     |  10 +-
 .../internal/operator/rel/RelOpExclude.kt     |   6 +-
 .../internal/operator/rex/ExprCallDynamic.kt  |   3 +-
 .../internal/operator/rex/ExprCoalesce.kt     |   2 -
 .../eval/internal/operator/rex/ExprPathKey.kt |   8 +-
 .../internal/operator/rex/ExprPathSymbol.kt   |   6 +-
 .../eval/internal/operator/rex/ExprSelect.kt  |   3 -
 .../eval/internal/operator/rex/ExprSpread.kt  |   5 +-
 .../eval/internal/PartiQLEvaluatorTest.kt     |   2 -
 .../partiql/eval/internal/SuccessTestCase.kt  |   5 +-
 .../partiql/eval/internal/TypingTestCase.kt   |  10 +-
 .../operator/rex/ExprCallDynamicTest.kt       |   6 +-
 .../parser/internal/PartiQLParserDDLTests.kt  |   2 -
 partiql-planner/build.gradle.kts              |   1 -
 .../org/partiql/planner/internal/ir/Nodes.kt  |  14 +-
 .../internal/transforms/PlanTransform.kt      |  15 +-
 .../internal/transforms/RelConverter.kt       |  13 +-
 .../internal/transforms/RexConverter.kt       | 103 ++-
 .../planner/internal/typer/DynamicTyper.kt    |  69 +-
 .../planner/internal/typer/PlanTyper.kt       |  24 +-
 .../partiql/planner/internal/typer/Scope.kt   |   6 +-
 .../main/resources/partiql_plan_internal.ion  |   2 +-
 .../planner/internal/typer/PlanTyperTest.kt   |  21 +-
 partiql-spi/api/partiql-spi.api               | 590 +-----------------
 partiql-spi/build.gradle.kts                  |   7 +
 .../java/org/partiql/spi/value/Datum.java     | 226 +------
 .../java/org/partiql/spi/value/DatumTime.java |   9 +-
 .../org/partiql/spi/value/DatumTimestamp.java |   9 +-
 .../java/org/partiql/spi/value/Field.java     |   2 +-
 .../partiql/spi/value/ion/IonDatumReader.kt   |  85 ++-
 .../partiql/value/PartiQLValueExperimental.kt |  21 -
 .../value/PartiQLValueComparatorTest.kt       |   1 -
 .../value/io/PartiQLValueIonSerdeTest.kt      |   4 +-
 .../value/io/PartiQLValueTextWriterTest.kt    |   6 +-
 .../org/partiql/spi/value/DatumUtils.java     | 195 ++++++
 .../spi/value/PQLToPartiQLIterable.java       |   3 +-
 .../partiql/spi/value/PQLToPartiQLStruct.java |   3 +-
 .../spi/value/PartiQLToPQLIterable.java       |   2 +-
 .../partiql/spi/value/PartiQLToPQLStruct.java |   2 +-
 .../spi}/value/io/PartiQLValueIonReader.kt    |   5 +-
 .../spi}/value/io/PartiQLValueIonWriter.kt    |   5 +-
 .../spi}/value/io/PartiQLValueReader.kt       |   4 +-
 .../spi}/value/io/PartiQLValueTextWriter.kt   |   5 +-
 .../spi}/value/io/PartiQLValueWriter.kt       |   4 +-
 .../kotlin/org/partiql/value/PartiQL.kt       |  32 -
 .../kotlin/org/partiql/value/PartiQLValue.kt  |  35 +-
 .../value/PartiQLValueComparatorInternal.kt   |   1 -
 .../org/partiql/value/PartiQLValueType.kt     |   3 +-
 .../kotlin/org/partiql/value/helpers/ToIon.kt |   2 -
 .../org/partiql/value/impl/Annotations.kt     |   5 -
 .../org/partiql/value/impl/BagValueImpl.kt    |   2 -
 .../org/partiql/value/impl/BinaryValueImpl.kt |   2 -
 .../org/partiql/value/impl/BlobValueImpl.kt   |   2 -
 .../org/partiql/value/impl/BoolValueImpl.kt   |   2 -
 .../org/partiql/value/impl/ByteValueImpl.kt   |   2 -
 .../org/partiql/value/impl/CharValueImpl.kt   |   2 -
 .../org/partiql/value/impl/ClobValueImpl.kt   |   2 -
 .../org/partiql/value/impl/DateValueImpl.kt   |   2 -
 .../partiql/value/impl/DecimalValueImpl.kt    |   2 -
 .../partiql/value/impl/Float32ValueImpl.kt    |   2 -
 .../partiql/value/impl/Float64ValueImpl.kt    |   2 -
 .../org/partiql/value/impl/Int16ValueImpl.kt  |   2 -
 .../org/partiql/value/impl/Int32ValueImpl.kt  |   2 -
 .../org/partiql/value/impl/Int64ValueImpl.kt  |   2 -
 .../org/partiql/value/impl/Int8ValueImpl.kt   |   2 -
 .../org/partiql/value/impl/IntValueImpl.kt    |   2 -
 .../partiql/value/impl/IntervalValueImpl.kt   |   2 -
 .../org/partiql/value/impl/ListValueImpl.kt   |   2 -
 .../partiql/value/impl/MissingValueImpl.kt    |   2 -
 .../org/partiql/value/impl/NullValueImpl.kt   |   2 -
 .../org/partiql/value/impl/SexpValueImpl.kt   |   2 -
 .../org/partiql/value/impl/StringValueImpl.kt |   2 -
 .../org/partiql/value/impl/StructValueImpl.kt |   4 -
 .../org/partiql/value/impl/SymbolValueImpl.kt |   2 -
 .../org/partiql/value/impl/TimeValueImpl.kt   |   2 -
 .../partiql/value/impl/TimestampValueImpl.kt  |   2 -
 .../value/util/PartiQLValueBaseVisitor.kt     |   2 -
 .../partiql/value/util/PartiQLValueVisitor.kt |   2 -
 partiql-types/api/partiql-types.api           |   1 +
 .../main/java/org/partiql/types/PType.java    |  66 ++
 test/partiql-randomized-tests/build.gradle    |   1 +
 .../org/partiql/lang/randomized/eval/Utils.kt |   7 +-
 test/partiql-tests-runner/build.gradle.kts    |   1 +
 .../partiql/runner/executor/EvalExecutor.kt   |   7 +-
 .../org/partiql/runner/util/ValueEquals.kt    |   3 -
 90 files changed, 481 insertions(+), 1286 deletions(-)
 delete mode 100644 partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueExperimental.kt
 create mode 100644 partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
 rename partiql-spi/src/{main => testFixtures}/java/org/partiql/spi/value/PQLToPartiQLIterable.java (91%)
 rename partiql-spi/src/{main => testFixtures}/java/org/partiql/spi/value/PQLToPartiQLStruct.java (89%)
 rename partiql-spi/src/{main => testFixtures}/java/org/partiql/spi/value/PartiQLToPQLIterable.java (95%)
 rename partiql-spi/src/{main => testFixtures}/java/org/partiql/spi/value/PartiQLToPQLStruct.java (95%)
 rename partiql-spi/src/{main/kotlin/org/partiql => testFixtures/java/org/partiql/spi}/value/io/PartiQLValueIonReader.kt (99%)
 rename partiql-spi/src/{main/kotlin/org/partiql => testFixtures/java/org/partiql/spi}/value/io/PartiQLValueIonWriter.kt (90%)
 rename partiql-spi/src/{main/kotlin/org/partiql => testFixtures/java/org/partiql/spi}/value/io/PartiQLValueReader.kt (88%)
 rename partiql-spi/src/{main/kotlin/org/partiql => testFixtures/java/org/partiql/spi}/value/io/PartiQLValueTextWriter.kt (98%)
 rename partiql-spi/src/{main/kotlin/org/partiql => testFixtures/java/org/partiql/spi}/value/io/PartiQLValueWriter.kt (89%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/PartiQL.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/PartiQLValue.kt (95%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt (99%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/PartiQLValueType.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/helpers/ToIon.kt (99%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Annotations.kt (86%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/BagValueImpl.kt (95%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/BinaryValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/BlobValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/BoolValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/ByteValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/CharValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/ClobValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/DateValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/DecimalValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Float32ValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Float64ValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Int16ValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Int32ValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Int64ValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/Int8ValueImpl.kt (96%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/IntValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/IntervalValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/ListValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/MissingValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/NullValueImpl.kt (97%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/SexpValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/StringValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/StructValueImpl.kt (96%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/SymbolValueImpl.kt (93%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/TimeValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/impl/TimestampValueImpl.kt (94%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt (98%)
 rename partiql-spi/src/{main => testFixtures}/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt (97%)

diff --git a/docs/wiki/tutorials/Pluggable Functions Tutorial.md b/docs/wiki/tutorials/Pluggable Functions Tutorial.md
index 6bd965070..54f4747b8 100644
--- a/docs/wiki/tutorials/Pluggable Functions Tutorial.md	
+++ b/docs/wiki/tutorials/Pluggable Functions Tutorial.md	
@@ -27,7 +27,7 @@ import org.partiql.types.PartiQLValueType
 import org.partiql.types.function.FunctionParameter
 import org.partiql.types.function.FunctionSignature
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
+
 import org.partiql.value.StringValue
 import org.partiql.value.stringValue
 
@@ -43,7 +43,6 @@ object TrimLead : PartiQLFunction {
         description = "Trims leading whitespace of a [str]." // A brief description of your function
     )
 
-    @OptIn(PartiQLValueExperimental::class)
     override operator fun invoke(session: ConnectorSession, arguments: List<PartiQLValue>): PartiQLValue {
         // Implement the function logic here
         val str = (arguments[0] as? StringValue)?.string ?: ""
diff --git a/partiql-cli/build.gradle.kts b/partiql-cli/build.gradle.kts
index ed163fa5a..e10d9ebe3 100644
--- a/partiql-cli/build.gradle.kts
+++ b/partiql-cli/build.gradle.kts
@@ -26,6 +26,7 @@ dependencies {
     implementation(project(":partiql-planner"))
     implementation(project(":partiql-types"))
     implementation(project(":partiql-spi"))
+    implementation(testFixtures(project(":partiql-spi")))
     implementation(Deps.csv)
     implementation(Deps.awsSdkBom)
     implementation(Deps.awsSdkDynamodb)
diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
index 878409a77..bd57d7f7f 100644
--- a/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
+++ b/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
@@ -24,8 +24,8 @@ import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.io.PartiQLValueTextWriter
+import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.io.PartiQLValueTextWriter
 import picocli.CommandLine
 import java.io.File
 import java.io.InputStream
@@ -187,7 +187,6 @@ internal class MainCommand : Runnable {
         Shell(pipeline, session(), debug).start()
     }
 
-    @OptIn(PartiQLValueExperimental::class)
     private fun run(statement: String) {
         val config = getPipelineConfig()
         val pipeline = when (strict) {
@@ -206,7 +205,8 @@ internal class MainCommand : Runnable {
         // TODO add format support
         checkFormat(format)
         val writer = PartiQLValueTextWriter(System.out)
-        writer.append(result.toPartiQLValue()) // TODO: Create a Datum writer
+        val p = DatumUtils.toPartiQLValue(result)
+        writer.append(p) // TODO: Create a Datum writer
         println()
     }
 
diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt
index 2f036a71d..d696d714a 100644
--- a/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt
+++ b/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt
@@ -31,8 +31,8 @@ import org.jline.utils.InfoCmp
 import org.joda.time.Duration
 import org.partiql.cli.pipeline.Pipeline
 import org.partiql.spi.catalog.Session
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.io.PartiQLValueTextWriter
+import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.io.PartiQLValueTextWriter
 import java.io.Closeable
 import java.io.PrintStream
 import java.nio.file.Path
@@ -161,7 +161,6 @@ internal class Shell(
         }
     }
 
-    @OptIn(PartiQLValueExperimental::class)
     private fun run(exiting: AtomicBoolean) = TerminalBuilder.builder()
         .name("PartiQL")
         .nativeSignals(true)
@@ -276,7 +275,8 @@ internal class Shell(
                         out.appendLine()
                         out.info("=== RESULT ===")
                         val writer = PartiQLValueTextWriter(out)
-                        writer.append(result.toPartiQLValue()) // TODO: Create a Datum writer
+                        val p = DatumUtils.toPartiQLValue(result)
+                        writer.append(p) // TODO: Create a Datum writer
                         out.appendLine()
                         out.appendLine()
                         out.success("OK!")
diff --git a/partiql-eval/build.gradle.kts b/partiql-eval/build.gradle.kts
index 17f013af7..4771c998e 100644
--- a/partiql-eval/build.gradle.kts
+++ b/partiql-eval/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
     // Test
     testImplementation(project(":partiql-parser"))
     testImplementation(testFixtures(project(":partiql-types"))) // TODO: Remove use of StaticType
+    testImplementation(testFixtures(project(":partiql-spi")))
     testImplementation(Deps.junit4)
     testImplementation(Deps.junit4Params)
     testImplementation(Deps.junitVintage) // Enables JUnit4
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
index 08d5ea4cf..7418616c0 100644
--- 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
@@ -3,13 +3,10 @@ package org.partiql.eval.internal.helpers
 import org.partiql.errors.TypeCheckException
 import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.PartiQLValueType
 import java.math.BigInteger
 
 /**
- * Holds helper functions for [PartiQLValue].
+ * Holds helper functions for [Datum].
  */
 internal object ValueUtility {
 
@@ -21,11 +18,6 @@ internal object ValueUtility {
         return this.type.code() == PType.BOOL && !this.isNull && !this.isMissing && this.boolean
     }
 
-    @OptIn(PartiQLValueExperimental::class)
-    fun Datum.check(type: PartiQLValueType): Datum {
-        return this.check(type.toPType())
-    }
-
     /**
      * Asserts that [this] is of a specific type. Note that, if [this] value is null ([Datum.isNull]), then the null
      * value is coerced to the expected type.
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
index 2d48ce430..f98b3d579 100644
--- 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
@@ -7,8 +7,6 @@ import org.partiql.plan.Exclusion
 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
 
 /**
  * Implementation of the EXCLUDE clause; there are good opportunities to tune/optimize this.
@@ -133,8 +131,8 @@ internal class RelOpExclude(
     }
 
     /**
-     * Returns a [PartiQLValue] created from an iterable of [coll]. Requires [type] to be a collection type
-     * (i.e. [PartiQLValueType.LIST] or [PartiQLValueType.BAG].).
+     * Returns a [Datum] created from an iterable of [coll]. Requires [type] to be a collection type
+     * (i.e. [PType.ARRAY] or [PType.BAG].).
      */
     private fun newCollValue(type: PType, coll: Iterable<Datum>): Datum {
         return when (type.code()) {
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
index d75b283c3..a8abb07bb 100644
--- 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
@@ -10,7 +10,6 @@ import org.partiql.eval.internal.operator.rex.ExprCallDynamic.CoercionFamily.UNK
 import org.partiql.spi.function.Function
 import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValue
 
 /**
  * Implementation of Dynamic Dispatch.
@@ -23,7 +22,7 @@ import org.partiql.value.PartiQLValue
  *  3. Lookup the candidate to dispatch to and invoke.
  *
  * This implementation can evaluate ([eval]) the input [Row], execute and gather the
- * arguments, and pass the [PartiQLValue]s directly to the [Candidate.eval].
+ * arguments, and pass the values directly to the [Candidate.eval].
  *
  * This implementation also caches previously resolved candidates.
  *
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
index 96f84b016..e05895192 100644
--- 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
@@ -3,13 +3,11 @@ package org.partiql.eval.internal.operator.rex
 import org.partiql.eval.Environment
 import org.partiql.eval.ExprValue
 import org.partiql.spi.value.Datum
-import org.partiql.value.PartiQLValueExperimental
 
 internal class ExprCoalesce(
     private val args: Array<ExprValue>
 ) : ExprValue {
 
-    @PartiQLValueExperimental
     override fun eval(env: Environment): Datum {
         for (arg in args) {
             val result = arg.eval(env)
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathKey.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathKey.kt
index 6a99487de..6a4cb61f1 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathKey.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathKey.kt
@@ -5,18 +5,16 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprValue
 import org.partiql.eval.internal.helpers.ValueUtility.check
 import org.partiql.spi.value.Datum
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.PartiQLValueType
+import org.partiql.types.PType
 
 internal class ExprPathKey(
     @JvmField val root: ExprValue,
     @JvmField val key: ExprValue
 ) : ExprValue {
 
-    @OptIn(PartiQLValueExperimental::class)
     override fun eval(env: Environment): Datum {
-        val rootEvaluated = root.eval(env).check(PartiQLValueType.STRUCT)
-        val keyEvaluated = key.eval(env).check(PartiQLValueType.STRING)
+        val rootEvaluated = root.eval(env).check(PType.struct())
+        val keyEvaluated = key.eval(env).check(PType.string())
         if (rootEvaluated.isNull || keyEvaluated.isNull) {
             return Datum.nullValue()
         }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathSymbol.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathSymbol.kt
index 5b3cda14b..1b8339883 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathSymbol.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathSymbol.kt
@@ -5,17 +5,15 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprValue
 import org.partiql.eval.internal.helpers.ValueUtility.check
 import org.partiql.spi.value.Datum
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.PartiQLValueType
+import org.partiql.types.PType
 
 internal class ExprPathSymbol(
     @JvmField val root: ExprValue,
     @JvmField val symbol: String,
 ) : ExprValue {
 
-    @OptIn(PartiQLValueExperimental::class)
     override fun eval(env: Environment): Datum {
-        val struct = root.eval(env).check(PartiQLValueType.STRUCT)
+        val struct = root.eval(env).check(PType.struct())
         if (struct.isNull) {
             return Datum.nullValue()
         }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSelect.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSelect.kt
index 1ef8d1ee6..2d9788d3b 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSelect.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSelect.kt
@@ -4,7 +4,6 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.spi.value.Datum
-import org.partiql.value.PartiQLValueExperimental
 
 /**
  * Invoke the constructor over all inputs.
@@ -18,7 +17,6 @@ internal class ExprSelect(
     private val ordered: Boolean,
 ) : ExprValue {
 
-    @OptIn(PartiQLValueExperimental::class)
     class Elements(
         private val input: ExprRelation,
         private val constructor: ExprValue,
@@ -49,7 +47,6 @@ internal class ExprSelect(
         }
     }
 
-    @PartiQLValueExperimental
     override fun eval(env: Environment): Datum {
         val elements = Elements(input, constructor, env)
         return when (ordered) {
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSpread.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSpread.kt
index 03fc9ef87..734cde82f 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSpread.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprSpread.kt
@@ -5,17 +5,14 @@ import org.partiql.eval.ExprValue
 import org.partiql.eval.internal.helpers.ValueUtility.check
 import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.PartiQLValueType
 
 internal class ExprSpread(
     val args: Array<ExprValue>
 ) : ExprValue {
 
-    @OptIn(PartiQLValueExperimental::class)
     override fun eval(env: Environment): Datum {
         val tuples = args.map {
-            it.eval(env).check(PartiQLValueType.STRUCT)
+            it.eval(env).check(PType.struct())
         }
 
         // Return NULL if any arguments are NULL
diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEvaluatorTest.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEvaluatorTest.kt
index c2535b420..7d4a60cdd 100644
--- a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEvaluatorTest.kt
+++ b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/PartiQLEvaluatorTest.kt
@@ -9,7 +9,6 @@ import org.junit.jupiter.params.provider.MethodSource
 import org.partiql.eval.Mode
 import org.partiql.eval.compiler.PartiQLCompiler
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.bagValue
 import org.partiql.value.boolValue
 import org.partiql.value.decimalValue
@@ -25,7 +24,6 @@ import java.math.BigDecimal
 /**
  * This holds sanity tests during the development of the [PartiQLCompiler.standard] implementation.
  */
-@OptIn(PartiQLValueExperimental::class)
 class PartiQLEvaluatorTest {
 
     @ParameterizedTest
diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
index 32bd8d72b..fcfeb8986 100644
--- a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
+++ b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
@@ -12,10 +12,10 @@ import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
+import org.partiql.spi.value.DatumUtils
 import org.partiql.types.StaticType
 import org.partiql.types.fromStaticType
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import kotlin.test.assertEquals
 
 public class SuccessTestCase(
@@ -26,13 +26,12 @@ public class SuccessTestCase(
     val jvmEquality: Boolean = false
 ) : PTestCase {
 
-    @OptIn(PartiQLValueExperimental::class)
     constructor(
         input: String,
         expected: PartiQLValue,
         mode: Mode = Mode.PERMISSIVE(),
         globals: List<Global> = emptyList(),
-    ) : this(input, Datum.of(expected), mode, globals)
+    ) : this(input, DatumUtils.toDatum(expected), mode, globals)
 
     private val compiler = PartiQLCompiler.standard()
     private val parser = PartiQLParser.standard()
diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
index dda974399..4810731e5 100644
--- a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
+++ b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
@@ -9,15 +9,15 @@ import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Session
 import org.partiql.spi.value.Datum
+import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.io.PartiQLValueIonWriterBuilder
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.io.PartiQLValueIonWriterBuilder
 import java.io.ByteArrayOutputStream
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 
-public class TypingTestCase @OptIn(PartiQLValueExperimental::class) constructor(
+public class TypingTestCase(
     val name: String,
     val input: String,
     val expectedPermissive: PartiQLValue,
@@ -27,10 +27,9 @@ public class TypingTestCase @OptIn(PartiQLValueExperimental::class) constructor(
     private val parser = PartiQLParser.standard()
     private val planner = PartiQLPlanner.standard()
 
-    @OptIn(PartiQLValueExperimental::class)
     override fun run() {
         val (permissiveResult, plan) = run(mode = Mode.PERMISSIVE())
-        val permissiveResultPValue = permissiveResult.toPartiQLValue()
+        val permissiveResultPValue = DatumUtils.toPartiQLValue(permissiveResult)
         val assertionCondition = try {
             expectedPermissive == permissiveResultPValue // TODO: Assert using Datum
         } catch (t: Throwable) {
@@ -71,7 +70,6 @@ public class TypingTestCase @OptIn(PartiQLValueExperimental::class) constructor(
         return result to plan
     }
 
-    @OptIn(PartiQLValueExperimental::class)
     private fun comparisonString(expected: PartiQLValue, actual: PartiQLValue, plan: Plan): String {
         val expectedBuffer = ByteArrayOutputStream()
         val expectedWriter = PartiQLValueIonWriterBuilder.standardIonTextBuilder().build(expectedBuffer)
diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/operator/rex/ExprCallDynamicTest.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/operator/rex/ExprCallDynamicTest.kt
index 72735cc10..840aa5fd7 100644
--- a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/operator/rex/ExprCallDynamicTest.kt
+++ b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/operator/rex/ExprCallDynamicTest.kt
@@ -16,7 +16,6 @@ import org.partiql.spi.value.Datum.bool
 import org.partiql.spi.value.Datum.integer
 import org.partiql.spi.value.Datum.string
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.PartiQLValueType
 
 class ExprCallDynamicTest {
@@ -32,20 +31,18 @@ class ExprCallDynamicTest {
         val expectedIndex: Int,
     ) {
 
-        @OptIn(PartiQLValueExperimental::class)
         fun assert() {
             val expr = ExprCallDynamic(
                 name = "example_function",
                 functions = functions,
                 args = arrayOf(ExprLit(lhs), ExprLit(rhs)),
             )
-            val result = expr.eval(Environment()).check(PartiQLValueType.INT32)
+            val result = expr.eval(Environment()).check(PType.integer())
             assertEquals(expectedIndex, result.int)
         }
 
         companion object {
 
-            @OptIn(PartiQLValueExperimental::class)
             private val params = listOf(
                 PartiQLValueType.LIST to PartiQLValueType.LIST, // Index 0
                 PartiQLValueType.BAG to PartiQLValueType.BAG, // Index 1
@@ -62,7 +59,6 @@ class ExprCallDynamicTest {
                 PartiQLValueType.ANY to PartiQLValueType.ANY, // Index 12
             )
 
-            @OptIn(PartiQLValueExperimental::class)
             internal val functions: Array<Function> = params.mapIndexed { index, it ->
                 object : Function {
 
diff --git a/partiql-parser/src/test/kotlin/org/partiql/parser/internal/PartiQLParserDDLTests.kt b/partiql-parser/src/test/kotlin/org/partiql/parser/internal/PartiQLParserDDLTests.kt
index 4999e5b88..4f32c83fb 100644
--- a/partiql-parser/src/test/kotlin/org/partiql/parser/internal/PartiQLParserDDLTests.kt
+++ b/partiql-parser/src/test/kotlin/org/partiql/parser/internal/PartiQLParserDDLTests.kt
@@ -22,7 +22,6 @@ import org.partiql.ast.AstNode
 import org.partiql.ast.DataType
 import org.partiql.ast.Literal.intNum
 import org.partiql.ast.expr.Scope
-import org.partiql.value.PartiQLValueExperimental
 import java.util.stream.Stream
 import kotlin.test.assertEquals
 
@@ -116,7 +115,6 @@ class PartiQLParserDDLTests {
             ),
         )
 
-        @OptIn(PartiQLValueExperimental::class)
         val createTableTests_addition = listOf(
             //
             // Column Constraints
diff --git a/partiql-planner/build.gradle.kts b/partiql-planner/build.gradle.kts
index 88a0586b8..25cd111d6 100644
--- a/partiql-planner/build.gradle.kts
+++ b/partiql-planner/build.gradle.kts
@@ -115,7 +115,6 @@ tasks.register<Exec>("codegen") {
         "--poems", "visitor",
         "--poems", "builder",
         "--poems", "util",
-        "--opt-in", "org.partiql.value.PartiQLValueExperimental",
         "./src/main/resources/partiql_plan_internal.ion"
     )
 }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/ir/Nodes.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/ir/Nodes.kt
index ad5f69a85..3330e3ced 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/ir/Nodes.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/ir/Nodes.kt
@@ -1,5 +1,3 @@
-@file:OptIn(PartiQLValueExperimental::class)
-
 package org.partiql.planner.`internal`.ir
 
 import org.partiql.planner.internal.ir.builder.PartiQlPlanBuilder
@@ -70,8 +68,7 @@ import org.partiql.spi.catalog.Name
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.function.Aggregation
 import org.partiql.spi.function.Function
-import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
+import org.partiql.spi.value.Datum
 import kotlin.random.Random
 
 internal abstract class PlanNode {
@@ -231,12 +228,19 @@ internal data class Rex(
         }
 
         internal data class Lit(
-            @JvmField internal val `value`: PartiQLValue,
+            @JvmField internal val `value`: Datum,
         ) : Op() {
             public override val children: List<PlanNode> = emptyList()
 
             override fun <R, C> accept(visitor: PlanVisitor<R, C>, ctx: C): R = visitor.visitRexOpLit(this, ctx)
 
+            override fun equals(other: Any?): Boolean {
+                if (this === other) return true
+                if (other !is Lit) return false
+                val result = Datum.comparator().compare(value, other.value)
+                return result == 0
+            }
+
             internal companion object {
                 @JvmStatic
                 internal fun builder(): RexOpLitBuilder = RexOpLitBuilder()
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/PlanTransform.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/PlanTransform.kt
index 8d1537e38..5c2405235 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/PlanTransform.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/PlanTransform.kt
@@ -18,11 +18,8 @@ import org.partiql.planner.internal.ir.Rel
 import org.partiql.planner.internal.ir.SetQuantifier
 import org.partiql.planner.internal.ir.visitor.PlanBaseVisitor
 import org.partiql.spi.errors.PErrorListener
-import org.partiql.spi.value.Datum
 import org.partiql.types.Field
 import org.partiql.types.PType
-import org.partiql.value.DecimalValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.planner.internal.ir.PartiQLPlan as IPlan
 import org.partiql.planner.internal.ir.PlanNode as INode
 import org.partiql.planner.internal.ir.Rel as IRel
@@ -221,18 +218,8 @@ internal class PlanTransform(private val flags: Set<PlannerFlag>) {
             return operators.variable(depth, offset, ctx)
         }
 
-        @OptIn(PartiQLValueExperimental::class)
         override fun visitRexOpLit(node: IRex.Op.Lit, ctx: PType): Any {
-            val value = node.value
-            // TODO: PartiQLValue doesn't have a finite decimal type, so we need to specially handle this until we remove
-            //  PartiQLValue.
-            if (value is DecimalValue && ctx.code() == PType.DECIMAL) {
-                return when (val dec = value.value) {
-                    null -> operators.lit(Datum.nullValue(ctx))
-                    else -> operators.lit(Datum.decimal(dec, ctx.precision, ctx.scale))
-                }
-            }
-            return operators.lit(Datum.of(node.value))
+            return operators.lit(node.value)
         }
 
         // RELATION OPERATORS
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt
index bbc99472d..511fb6ecd 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RelConverter.kt
@@ -86,10 +86,8 @@ import org.partiql.planner.internal.ir.rexOpStruct
 import org.partiql.planner.internal.ir.rexOpStructField
 import org.partiql.planner.internal.ir.rexOpVarLocal
 import org.partiql.planner.internal.typer.CompilerType
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.boolValue
-import org.partiql.value.stringValue
 
 /**
  * Lexically scoped state for use in translating an individual SELECT statement.
@@ -255,12 +253,11 @@ internal object RelConverter {
             return rel(type, op)
         }
 
-        @OptIn(PartiQLValueExperimental::class)
         override fun visitFrom(node: From, ctx: Rel): Rel {
             val tableRefs = node.tableRefs.map { visitFromTableRef(it, ctx) }
             return tableRefs.drop(1).fold(tableRefs.first()) { acc, tRef ->
                 val joinType = Rel.Op.Join.Type.INNER
-                val condition = rex(BOOL, rexOpLit(boolValue(true)))
+                val condition = rex(BOOL, rexOpLit(Datum.bool(true)))
                 val schema = acc.type.schema + tRef.type.schema
                 val props = emptySet<Rel.Prop>()
                 val type = relType(schema, props)
@@ -310,13 +307,12 @@ internal object RelConverter {
          *
          * TODO compute basic schema
          */
-        @OptIn(PartiQLValueExperimental::class)
         override fun visitFromJoin(node: FromJoin, nil: Rel): Rel {
             val lhs = visitFromTableRef(node.lhs, nil)
             val rhs = visitFromTableRef(node.rhs, nil)
             val schema = lhs.type.schema + rhs.type.schema // Note: This gets more specific in PlanTyper. It is only used to find binding names here.
             val props = emptySet<Rel.Prop>()
-            val condition = node.condition?.let { RexConverter.apply(it, env) } ?: rex(BOOL, rexOpLit(boolValue(true)))
+            val condition = node.condition?.let { RexConverter.apply(it, env) } ?: rex(BOOL, rexOpLit(Datum.bool(true)))
             val joinType = when (node.joinType?.code()) {
                 JoinType.LEFT_OUTER, JoinType.LEFT, JoinType.LEFT_CROSS -> Rel.Op.Join.Type.LEFT
                 JoinType.RIGHT_OUTER, JoinType.RIGHT -> Rel.Op.Join.Type.RIGHT
@@ -406,7 +402,6 @@ internal object RelConverter {
          *         1. Ast.Expr.SFW has every Ast.Expr.CallAgg replaced by a synthetic Ast.Expr.Var
          *         2. Rel which has the appropriate Rex.Agg calls and groups
          */
-        @OptIn(PartiQLValueExperimental::class)
         private fun convertAgg(input: Rel, select: QueryBody.SFW, groupBy: GroupBy?): Pair<QueryBody.SFW, Rel> {
             // Rewrite and extract all aggregations in the SELECT clause
             val (sel, aggregations) = AggregationTransform.apply(select)
@@ -459,7 +454,7 @@ internal object RelConverter {
                     schema.add(binding)
                     val fields = input.type.schema.mapIndexed { bindingIndex, currBinding ->
                         rexOpStructField(
-                            k = rex(STRING, rexOpLit(stringValue(currBinding.name))),
+                            k = rex(STRING, rexOpLit(Datum.string(currBinding.name))),
                             v = rex(ANY, rexOpVarLocal(0, bindingIndex))
                         )
                     }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
index 0f8fab3ae..6938b9f75 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
@@ -16,7 +16,6 @@
 
 package org.partiql.planner.internal.transforms
 
-import com.amazon.ionelement.api.loadSingleElement
 import org.partiql.ast.AstNode
 import org.partiql.ast.AstVisitor
 import org.partiql.ast.DataType
@@ -89,24 +88,11 @@ import org.partiql.planner.internal.typer.CompilerType
 import org.partiql.planner.internal.typer.PlanTyper.Companion.toCType
 import org.partiql.planner.internal.utils.DateTimeUtils
 import org.partiql.spi.catalog.Identifier
+import org.partiql.spi.value.Datum
+import org.partiql.spi.value.DatumReader
 import org.partiql.types.PType
-import org.partiql.value.DecimalValue
-import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.boolValue
-import org.partiql.value.dateValue
 import org.partiql.value.datetime.DateTimeValue
-import org.partiql.value.decimalValue
-import org.partiql.value.float64Value
-import org.partiql.value.int32Value
-import org.partiql.value.int64Value
-import org.partiql.value.intValue
-import org.partiql.value.io.PartiQLValueIonReaderBuilder
-import org.partiql.value.missingValue
-import org.partiql.value.nullValue
-import org.partiql.value.stringValue
-import org.partiql.value.timeValue
-import org.partiql.value.timestampValue
+import java.math.BigDecimal
 import java.math.BigInteger
 import java.math.MathContext
 import java.math.RoundingMode
@@ -123,7 +109,6 @@ internal object RexConverter {
 
     internal fun applyRel(expr: Expr, context: Env): Rex = expr.accept(ToRex, context)
 
-    @OptIn(PartiQLValueExperimental::class)
     @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
     private object ToRex : AstVisitor<Rex, Env>() {
 
@@ -148,51 +133,34 @@ internal object RexConverter {
         }
 
         override fun visitExprLit(node: ExprLit, context: Env): Rex {
-            val pValue = node.lit.toPartiQLValue()
-            val type = when (pValue) {
-                // Specifically handle the lack of an infinite precision/scale
-                // TODO: PartiQLValue won't be in AST soon
-                is DecimalValue -> {
-                    when (val decimal = pValue.value) {
-                        null -> PType.decimal(38, 19)
-                        else -> PType.decimal(decimal.precision(), decimal.scale())
-                    }
-                }
-                else -> pValue.type.toPType()
-            }
+            val datum = node.lit.toDatum()
+            val type = datum.type
             val cType = CompilerType(
                 _delegate = type,
                 isNullValue = node.lit.code() == Literal.NULL,
                 isMissingValue = node.lit.code() == Literal.MISSING
             )
-            val op = rexOpLit(pValue)
+            val op = rexOpLit(datum)
             return rex(cType, op)
         }
 
-        private fun Literal.toPartiQLValue(): PartiQLValue {
+        private fun Literal.toDatum(): Datum {
             val lit = this
             return when (lit.code()) {
-                Literal.NULL -> nullValue()
-                Literal.MISSING -> missingValue()
-                Literal.STRING -> stringValue(lit.stringValue())
-                Literal.BOOL -> boolValue(lit.booleanValue())
+                Literal.NULL -> Datum.nullValue()
+                Literal.MISSING -> Datum.missing()
+                Literal.STRING -> Datum.string(lit.stringValue())
+                Literal.BOOL -> Datum.bool(lit.booleanValue())
                 Literal.EXACT_NUM -> {
-                    // TODO previous behavior inferred decimals with scale = 0 to be a PartiQLValue.IntValue with
-                    //  PType of numeric. Since we're keeping numeric and decimal, need to take another look at
-                    //  whether the literal should have type decimal or numeric.
                     val dec = lit.bigDecimalValue().round(MathContext(38, RoundingMode.HALF_EVEN))
-                    if (dec.scale() == 0) {
-                        intValue(dec.toBigInteger())
-                    } else {
-                        decimalValue(dec)
-                    }
+                    Datum.decimal(dec, dec.precision(), dec.scale())
                 }
                 Literal.INT_NUM -> {
                     val n = lit.numberValue()
                     // 1st, try parse as int
                     try {
                         val v = n.toInt(10)
-                        return int32Value(v)
+                        return Datum.integer(v)
                     } catch (ex: NumberFormatException) {
                         // ignore
                     }
@@ -200,7 +168,7 @@ internal object RexConverter {
                     // 2nd, try parse as long
                     try {
                         val v = n.toLong(10)
-                        return int64Value(v)
+                        return Datum.bigint(v)
                     } catch (ex: NumberFormatException) {
                         // ignore
                     }
@@ -208,13 +176,14 @@ internal object RexConverter {
                     // 3rd, try parse as BigInteger
                     try {
                         val v = BigInteger(n)
-                        return intValue(v)
+                        val vDecimal = BigDecimal(v)
+                        return Datum.decimal(vDecimal, vDecimal.precision(), vDecimal.scale())
                     } catch (ex: NumberFormatException) {
                         throw ex
                     }
                 }
                 Literal.APPROX_NUM -> {
-                    float64Value(lit.numberValue().toDouble())
+                    return Datum.doublePrecision(lit.numberValue().toDouble())
                 }
                 Literal.TYPED_STRING -> {
                     val type = this.dataType()
@@ -223,18 +192,18 @@ internal object RexConverter {
                         DataType.DATE -> {
                             val value = LocalDate.parse(typedString, DateTimeFormatter.ISO_LOCAL_DATE)
                             val date = DateTimeValue.date(value.year, value.monthValue, value.dayOfMonth)
-                            dateValue(date)
+                            return Datum.date(date)
                         }
                         DataType.TIME, DataType.TIME_WITH_TIME_ZONE -> {
                             val time = DateTimeUtils.parseTimeLiteral(typedString)
                             val precision = type.precision ?: 6
-                            timeValue(time.toPrecision(precision))
+                            return Datum.time(time, precision)
                         }
                         DataType.TIMESTAMP, DataType.TIMESTAMP_WITH_TIME_ZONE -> {
                             val timestamp = DateTimeUtils.parseTimestamp(typedString)
                             val precision = type.precision ?: 6
                             val value = timestamp.toPrecision(precision)
-                            timestampValue(value)
+                            return Datum.timestamp(value)
                         }
                         else -> error("Unsupported typed literal string: $this")
                     }
@@ -243,17 +212,16 @@ internal object RexConverter {
             }
         }
 
-        /**
-         * TODO PartiQLValue will be replaced by Datum (i.e. IonDatum) is a subsequent PR.
-         */
         override fun visitExprVariant(node: ExprVariant, ctx: Env): Rex {
             if (node.encoding != "ion") {
                 throw IllegalArgumentException("unsupported encoding ${node.encoding}")
             }
-            val ion = loadSingleElement(node.value)
-            val value = PartiQLValueIonReaderBuilder.standard().build(ion).read()
-            val type = CompilerType(value.type.toPType())
-            return rex(type, rexOpLit(value))
+            // TODO: Does this result in a Datum of type variant?
+            val v = DatumReader.ion(node.value.byteInputStream())
+            val datum = v.next() ?: error("Expected a single value")
+            v.next()?.let { throw TypeCheckException("Expected a single value") }
+            val type = CompilerType(datum.type)
+            return rex(type, rexOpLit(datum))
         }
 
         /**
@@ -561,7 +529,7 @@ internal object RexConverter {
                 val schema = acc.type.schema + scan.type.schema
                 val props = emptySet<Rel.Prop>()
                 val type = relType(schema, props)
-                rel(type, relOpJoin(acc, scan, rex(BOOL, rexOpLit(boolValue(true))), Rel.Op.Join.Type.INNER))
+                rel(type, relOpJoin(acc, scan, rex(BOOL, rexOpLit(Datum.bool(true))), Rel.Op.Join.Type.INNER))
             }
 
             // compute the ref used by select construct
@@ -622,7 +590,7 @@ internal object RexConverter {
             return rel(relType, relOpUnpivot(path))
         }
 
-        private fun rexString(str: String) = rex(STRING, rexOpLit(stringValue(str)))
+        private fun rexString(str: String) = rex(STRING, rexOpLit(Datum.string(str)))
 
         override fun visitExprCall(node: ExprCall, context: Env): Rex {
             val type = (ANY)
@@ -737,7 +705,7 @@ internal object RexConverter {
             }.toMutableList()
 
             val defaultRex = when (val default = node.defaultExpr) {
-                null -> rex(type = ANY, op = rexOpLit(value = nullValue()))
+                null -> rex(type = ANY, op = rexOpLit(value = Datum.nullValue()))
                 else -> visitExprCoerce(default, context)
             }
             val op = rexOpCase(branches = branches, default = defaultRex)
@@ -926,7 +894,7 @@ internal object RexConverter {
             val type = ANY
             // Args
             val arg0 = visitExprCoerce(node.value, ctx)
-            val arg1 = node.start?.let { visitExprCoerce(it, ctx) } ?: rex(INT, rexOpLit(int64Value(1)))
+            val arg1 = node.start?.let { visitExprCoerce(it, ctx) } ?: rex(INT, rexOpLit(Datum.bigint(1L)))
             val arg2 = node.length?.let { visitExprCoerce(it, ctx) }
             // Call Variants
             val call = when (arg2) {
@@ -1004,8 +972,8 @@ internal object RexConverter {
                 call(
                     "substring",
                     cv,
-                    rex(INT4, rexOpLit(int32Value(1))),
-                    rex(ANY, call("minus", sp, rex(INT4, rexOpLit(int32Value(1)))))
+                    rex(INT4, rexOpLit(Datum.integer(1))),
+                    rex(ANY, call("minus", sp, rex(INT4, rexOpLit(Datum.integer(1)))))
                 )
             )
             val p2 = rex(ANY, call("concat", p1, rs))
@@ -1173,7 +1141,12 @@ internal object RexConverter {
             return rexOpCallUnresolved(id, args.toList())
         }
 
-        private fun Int?.toRex() = rex(INT4, rexOpLit(int32Value(this)))
+        private fun Int?.toRex(): Rex {
+            return when (this) {
+                null -> rex(INT4, rexOpLit(Datum.nullValue(PType.integer())))
+                else -> rex(INT4, rexOpLit(Datum.integer(this)))
+            }
+        }
 
         private val ANY: CompilerType = CompilerType(PType.dynamic())
         private val BOOL: CompilerType = CompilerType(PType.bool())
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/DynamicTyper.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/DynamicTyper.kt
index 3475090f0..d0f65c17c 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/DynamicTyper.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/DynamicTyper.kt
@@ -3,31 +3,8 @@ package org.partiql.planner.internal.typer
 import org.partiql.planner.internal.ir.Rex
 import org.partiql.planner.internal.typer.PlanTyper.Companion.anyOf
 import org.partiql.planner.internal.typer.PlanTyper.Companion.toCType
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.MissingValue
-import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.bagValue
-import org.partiql.value.blobValue
-import org.partiql.value.boolValue
-import org.partiql.value.charValue
-import org.partiql.value.clobValue
-import org.partiql.value.dateValue
-import org.partiql.value.decimalValue
-import org.partiql.value.float32Value
-import org.partiql.value.float64Value
-import org.partiql.value.int16Value
-import org.partiql.value.int32Value
-import org.partiql.value.int64Value
-import org.partiql.value.int8Value
-import org.partiql.value.intValue
-import org.partiql.value.listValue
-import org.partiql.value.missingValue
-import org.partiql.value.nullValue
-import org.partiql.value.stringValue
-import org.partiql.value.structValue
-import org.partiql.value.timeValue
-import org.partiql.value.timestampValue
 
 /**
  * Graph of super types for quick lookup because we don't have a tree.
@@ -63,7 +40,6 @@ internal class DynamicTyper {
     /**
      * Checks for literal NULL
      */
-    @OptIn(PartiQLValueExperimental::class)
     private fun Rex.isLiteralNull(): Boolean {
         val op = this.op
         return op is Rex.Op.Lit && op.value.isNull
@@ -72,10 +48,9 @@ internal class DynamicTyper {
     /**
      * Checks for literal MISSING
      */
-    @OptIn(PartiQLValueExperimental::class)
     private fun Rex.isLiteralMissing(): Boolean {
         val op = this.op
-        return op is Rex.Op.Lit && op.value is MissingValue
+        return op is Rex.Op.Lit && op.value.isMissing
     }
 
     /**
@@ -104,7 +79,6 @@ internal class DynamicTyper {
      *
      * @return
      */
-    @OptIn(PartiQLValueExperimental::class)
     fun mapping(): Pair<CompilerType, List<Mapping?>?> {
         var s = supertype ?: return CompilerType(PType.dynamic()) to null
         val superTypeBase = s.code()
@@ -134,8 +108,8 @@ internal class DynamicTyper {
         // Otherwise, return the supertype along with the coercion mapping
         val mapping = args.map {
             when {
-                it.isLiteralNull() -> Mapping.Replacement(Rex(s, Rex.Op.Lit(nullValue(s.code()))))
-                it.isLiteralMissing() -> Mapping.Replacement(Rex(s, Rex.Op.Lit(missingValue())))
+                it.isLiteralNull() -> Mapping.Replacement(Rex(s, Rex.Op.Lit(Datum.nullValue(PType.of(s.code())))))
+                it.isLiteralMissing() -> Mapping.Replacement(Rex(s, Rex.Op.Lit(Datum.missing(PType.of(s.code())))))
                 it.type == s -> Mapping.Coercion(s)
                 else -> null
             }
@@ -416,40 +390,5 @@ internal class DynamicTyper {
             PType.VARIANT -> TODO("variant in dynamic typer")
             else -> error("Unknown type: $this")
         }.toCType()
-
-        @OptIn(PartiQLValueExperimental::class)
-        private fun nullValue(kind: Int): PartiQLValue {
-            return when (kind) {
-                PType.DYNAMIC -> nullValue()
-                PType.BOOL -> boolValue(null)
-                PType.TINYINT -> int8Value(null)
-                PType.SMALLINT -> int16Value(null)
-                PType.INTEGER -> int32Value(null)
-                PType.BIGINT -> int64Value(null)
-                PType.NUMERIC -> intValue(null)
-                PType.DECIMAL -> decimalValue(null)
-                PType.REAL -> float32Value(null)
-                PType.DOUBLE -> float64Value(null)
-                PType.CHAR -> charValue(null)
-                PType.VARCHAR -> TODO("No implementation of VAR CHAR")
-                PType.STRING -> stringValue(null)
-                PType.BLOB -> blobValue(null)
-                PType.CLOB -> clobValue(null)
-                PType.DATE -> dateValue(null)
-                PType.TIMEZ,
-                PType.TIME -> timeValue(null)
-
-                PType.TIMESTAMPZ,
-                PType.TIMESTAMP -> timestampValue(null)
-
-                PType.BAG -> bagValue<PartiQLValue>(null)
-                PType.ARRAY -> listValue<PartiQLValue>(null)
-                PType.ROW -> structValue<PartiQLValue>(null)
-                PType.STRUCT -> structValue<PartiQLValue>()
-                PType.UNKNOWN -> nullValue()
-                PType.VARIANT -> TODO("variant in dynamic typer")
-                else -> error("Unknown type: $kind")
-            }
-        }
     }
 }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt
index 260876cd6..c054d5a93 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt
@@ -55,13 +55,9 @@ import org.partiql.spi.Context
 import org.partiql.spi.catalog.Identifier
 import org.partiql.spi.errors.PError
 import org.partiql.spi.errors.PErrorListener
+import org.partiql.spi.value.Datum
 import org.partiql.types.Field
 import org.partiql.types.PType
-import org.partiql.value.BoolValue
-import org.partiql.value.MissingValue
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.TextValue
-import org.partiql.value.stringValue
 import kotlin.math.max
 
 /**
@@ -69,7 +65,6 @@ import kotlin.math.max
  *
  * @property env
  */
-@OptIn(PartiQLValueExperimental::class)
 internal class PlanTyper(private val env: Env, config: Context) {
 
     private val _listener = config.errorListener
@@ -575,7 +570,6 @@ internal class PlanTyper(private val env: Env, config: Context) {
      *
      * @property typeEnv TypeEnv in which this rex tree is evaluated.
      */
-    @OptIn(PartiQLValueExperimental::class)
     private inner class RexTyper(
         private val typeEnv: TypeEnv,
         private val strategy: Strategy,
@@ -647,7 +641,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             return rex(root.type.typeParameter, rexOpPathIndex(root, key))
         }
 
-        private fun Rex.isLiteralMissing(): Boolean = this.op is Rex.Op.Lit && this.op.value is MissingValue
+        private fun Rex.isLiteralMissing(): Boolean = this.op is Rex.Op.Lit && this.op.value.isMissing
 
         override fun visitRexOpPathKey(node: Rex.Op.Path.Key, ctx: CompilerType?): Rex {
             val root = visitRex(node.root, node.root.type)
@@ -670,7 +664,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
 
             // Get Literal Key
             val keyOp = key.op
-            val keyLiteral = when (keyOp is Rex.Op.Lit && keyOp.value is TextValue<*> && !keyOp.value.isNull) {
+            val keyLiteral = when (keyOp is Rex.Op.Lit && keyOp.value.isTextValue() && !keyOp.value.isNull) {
                 true -> keyOp.value.string!!
                 false -> return rex(CompilerType(PType.dynamic()), rexOpPathKey(root, key))
             }
@@ -683,6 +677,10 @@ internal class PlanTyper(private val env: Env, config: Context) {
             return rex(elementType, rexOpPathKey(root, key))
         }
 
+        private fun Datum.isTextValue(): Boolean {
+            return this.type.code() in setOf(PType.STRING, PType.CHAR, PType.VARCHAR)
+        }
+
         override fun visitRexOpPathSymbol(node: Rex.Op.Path.Symbol, ctx: CompilerType?): Rex {
             val root = visitRex(node.root, node.root.type)
 
@@ -729,7 +727,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             }
         }
 
-        private fun rexString(str: String) = rex(CompilerType(PType.string()), Rex.Op.Lit(stringValue(str)))
+        private fun rexString(str: String) = rex(CompilerType(PType.string()), Rex.Op.Lit(Datum.string(str)))
 
         override fun visitRexOpCastUnresolved(node: Rex.Op.Cast.Unresolved, ctx: CompilerType?): Rex {
             val arg = visitRex(node.arg, null)
@@ -931,9 +929,8 @@ internal class PlanTyper(private val env: Env, config: Context) {
         /**
          * Returns the boolean value of the expression. For now, only handle literals.
          */
-        @OptIn(PartiQLValueExperimental::class)
         private fun boolOrNull(op: Rex.Op): Boolean? {
-            return if (op is Rex.Op.Lit && op.value is BoolValue) op.value.value else null
+            return if (op is Rex.Op.Lit && op.value.type.code() == PType.BOOL) op.value.boolean else null
         }
 
         /**
@@ -972,7 +969,6 @@ internal class PlanTyper(private val env: Env, config: Context) {
             return rex(CompilerType(type), rexOpCollection(values))
         }
 
-        @OptIn(PartiQLValueExperimental::class)
         override fun visitRexOpStruct(node: Rex.Op.Struct, ctx: CompilerType?): Rex {
             val fields = node.fields.map {
                 val k = visitRex(it.k, it.k.type)
@@ -984,7 +980,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             for (field in fields) {
                 val keyOp = field.k.op
                 // TODO: Check key type
-                if (keyOp !is Rex.Op.Lit || keyOp.value !is TextValue<*>) {
+                if (keyOp !is Rex.Op.Lit || !keyOp.value.isTextValue()) {
                     structIsClosed = false
                     continue
                 }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt
index 7c6752c35..153efac74 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt
@@ -9,9 +9,8 @@ import org.partiql.planner.internal.ir.rexOpPathSymbol
 import org.partiql.planner.internal.ir.rexOpVarLocal
 import org.partiql.planner.internal.typer.PlanTyper.Companion.toCType
 import org.partiql.spi.catalog.Identifier
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.stringValue
 
 /**
  * Represents local variable scopes.
@@ -171,7 +170,6 @@ internal data class Scope(
             rex(type, op)
         }
 
-        @OptIn(PartiQLValueExperimental::class)
-        private fun string(text: String) = rex(CompilerType(PType.string()), rexOpLit(stringValue(text)))
+        private fun string(text: String) = rex(CompilerType(PType.string()), rexOpLit(Datum.string(text)))
     }
 }
diff --git a/partiql-planner/src/main/resources/partiql_plan_internal.ion b/partiql-planner/src/main/resources/partiql_plan_internal.ion
index efc9b4560..f101659ff 100644
--- a/partiql-planner/src/main/resources/partiql_plan_internal.ion
+++ b/partiql-planner/src/main/resources/partiql_plan_internal.ion
@@ -2,7 +2,7 @@ imports::{
   kotlin: [
     identifier::'org.partiql.spi.catalog.Identifier',
     name::'org.partiql.spi.catalog.Name',
-    partiql_value::'org.partiql.value.PartiQLValue',
+    partiql_value::'org.partiql.spi.value.Datum',
     partiql_value_type::'org.partiql.planner.internal.typer.CompilerType',
     static_type::'org.partiql.planner.internal.typer.CompilerType',
     fn_signature::'org.partiql.spi.function.Function',
diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTest.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTest.kt
index 6d6d12f03..fa8301fd5 100644
--- a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTest.kt
+++ b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTest.kt
@@ -23,10 +23,8 @@ import org.partiql.spi.catalog.Identifier
 import org.partiql.spi.catalog.Name
 import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
-import org.partiql.value.PartiQLValueExperimental
-import org.partiql.value.int32Value
-import org.partiql.value.stringValue
 import kotlin.io.path.toPath
 
 class PlanTyperTest {
@@ -41,20 +39,19 @@ class PlanTyperTest {
         private val DOUBLE_PRECISION = PType.doublePrecision().toCType()
         private val DECIMAL = PType.decimal(38, 0).toCType()
 
-        @OptIn(PartiQLValueExperimental::class)
         private val LITERAL_STRUCT_1 = rex(
             ANY,
             rexOpStruct(
                 fields = listOf(
                     rexOpStructField(
-                        k = rex(STRING, rexOpLit(stringValue("FiRsT_KeY"))),
+                        k = rex(STRING, rexOpLit(Datum.string("FiRsT_KeY"))),
                         v = rex(
                             ANY,
                             rexOpStruct(
                                 fields = listOf(
                                     rexOpStructField(
-                                        k = rex(STRING, rexOpLit(stringValue("sEcoNd_KEY"))),
-                                        v = rex(INT4, rexOpLit(int32Value(5)))
+                                        k = rex(STRING, rexOpLit(Datum.string("sEcoNd_KEY"))),
+                                        v = rex(INT4, rexOpLit(Datum.integer(5)))
                                     )
                                 )
                             )
@@ -68,7 +65,6 @@ class PlanTyperTest {
             listOf(CompilerType.Field("sEcoNd_KEY", INT4)),
         ).toCType()
 
-        @OptIn(PartiQLValueExperimental::class)
         private val LITERAL_STRUCT_1_TYPED: Rex
             get() {
                 val topLevelStruct = PType.row(
@@ -79,14 +75,14 @@ class PlanTyperTest {
                     rexOpStruct(
                         fields = listOf(
                             rexOpStructField(
-                                k = rex(STRING, rexOpLit(stringValue("FiRsT_KeY"))),
+                                k = rex(STRING, rexOpLit(Datum.string("FiRsT_KeY"))),
                                 v = rex(
                                     type = LITERAL_STRUCT_1_FIRST_KEY_TYPE,
                                     rexOpStruct(
                                         fields = listOf(
                                             rexOpStructField(
-                                                k = rex(STRING, rexOpLit(stringValue("sEcoNd_KEY"))),
-                                                v = rex(INT4, rexOpLit(int32Value(5)))
+                                                k = rex(STRING, rexOpLit(Datum.string("sEcoNd_KEY"))),
+                                                v = rex(INT4, rexOpLit(Datum.integer(5)))
                                             )
                                         )
                                     )
@@ -308,8 +304,7 @@ class PlanTyperTest {
         assertEquals(expected, actual)
     }
 
-    @OptIn(PartiQLValueExperimental::class)
-    private fun rexString(str: String) = rex(STRING, rexOpLit(stringValue(str)))
+    private fun rexString(str: String) = rex(STRING, rexOpLit(Datum.string(str)))
 
     private fun Rex.pathKey(key: String, type: CompilerType = ANY): Rex = Rex(type, rexOpPathKey(this, rexString(key)))
 
diff --git a/partiql-spi/api/partiql-spi.api b/partiql-spi/api/partiql-spi.api
index 4d308d4b5..cec1f2fd7 100644
--- a/partiql-spi/api/partiql-spi.api
+++ b/partiql-spi/api/partiql-spi.api
@@ -510,7 +510,6 @@ public abstract interface class org/partiql/spi/value/Datum : java/lang/Iterable
 	public static fun nullValue ()Lorg/partiql/spi/value/Datum;
 	public static fun nullValue (Lorg/partiql/types/PType;)Lorg/partiql/spi/value/Datum;
 	public static fun numeric (Ljava/math/BigInteger;)Lorg/partiql/spi/value/Datum;
-	public static fun of (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/spi/value/Datum;
 	public fun pack (Ljava/nio/charset/Charset;)[B
 	public static fun real (F)Lorg/partiql/spi/value/Datum;
 	public static fun smallint (S)Lorg/partiql/spi/value/Datum;
@@ -518,9 +517,10 @@ public abstract interface class org/partiql/spi/value/Datum : java/lang/Iterable
 	public static fun struct ()Lorg/partiql/spi/value/Datum;
 	public static fun struct (Ljava/lang/Iterable;)Lorg/partiql/spi/value/Datum;
 	public static fun time (Lorg/partiql/value/datetime/Time;)Lorg/partiql/spi/value/Datum;
+	public static fun time (Lorg/partiql/value/datetime/Time;I)Lorg/partiql/spi/value/Datum;
 	public static fun timestamp (Lorg/partiql/value/datetime/Timestamp;)Lorg/partiql/spi/value/Datum;
+	public static fun timestamp (Lorg/partiql/value/datetime/Timestamp;I)Lorg/partiql/spi/value/Datum;
 	public static fun tinyint (B)Lorg/partiql/spi/value/Datum;
-	public fun toPartiQLValue ()Lorg/partiql/value/PartiQLValue;
 	public static fun varchar (Ljava/lang/String;)Lorg/partiql/spi/value/Datum;
 	public static fun varchar (Ljava/lang/String;I)Lorg/partiql/spi/value/Datum;
 }
@@ -555,453 +555,6 @@ public abstract interface class org/partiql/spi/value/Field {
 	public static fun of (Ljava/lang/String;Lorg/partiql/spi/value/Datum;)Lorg/partiql/spi/value/Field;
 }
 
-public abstract class org/partiql/value/BagValue : org/partiql/value/CollectionValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/BagValue;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun hashCode ()I
-	public fun iterator ()Ljava/util/Iterator;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/BagValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/BagValue;
-}
-
-public abstract class org/partiql/value/BinaryValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/BinaryValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/BinaryValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/BinaryValue;
-}
-
-public abstract class org/partiql/value/BlobValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/BlobValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/BlobValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/BlobValue;
-}
-
-public abstract class org/partiql/value/BoolValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/BoolValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/BoolValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/BoolValue;
-}
-
-public abstract class org/partiql/value/ByteValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/ByteValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/ByteValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/ByteValue;
-}
-
-public abstract class org/partiql/value/CharValue : org/partiql/value/TextValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/CharValue;
-	public fun getString ()Ljava/lang/String;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/CharValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/CharValue;
-}
-
-public abstract class org/partiql/value/ClobValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/ClobValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/ClobValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/ClobValue;
-}
-
-public abstract interface class org/partiql/value/CollectionValue : java/lang/Iterable, kotlin/jvm/internal/markers/KMappedMarker, org/partiql/value/PartiQLValue {
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/CollectionValue;
-	public abstract fun isNull ()Z
-	public abstract fun iterator ()Ljava/util/Iterator;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/CollectionValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/CollectionValue;
-}
-
-public abstract class org/partiql/value/DateValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/DateValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/DateValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/DateValue;
-}
-
-public abstract class org/partiql/value/DecimalValue : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/DecimalValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/DecimalValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/DecimalValue;
-}
-
-public abstract class org/partiql/value/Float32Value : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/Float32Value;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/Float32Value;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/Float32Value;
-}
-
-public abstract class org/partiql/value/Float64Value : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/Float64Value;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/Float64Value;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/Float64Value;
-}
-
-public abstract class org/partiql/value/Int16Value : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/Int16Value;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/Int16Value;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/Int16Value;
-}
-
-public abstract class org/partiql/value/Int32Value : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/Int32Value;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/Int32Value;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/Int32Value;
-}
-
-public abstract class org/partiql/value/Int64Value : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/Int64Value;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/Int64Value;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/Int64Value;
-}
-
-public abstract class org/partiql/value/Int8Value : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/Int8Value;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/Int8Value;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/Int8Value;
-}
-
-public abstract class org/partiql/value/IntValue : org/partiql/value/NumericValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/IntValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/IntValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/IntValue;
-}
-
-public abstract class org/partiql/value/IntervalValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/IntervalValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/IntervalValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/IntervalValue;
-}
-
-public abstract class org/partiql/value/ListValue : org/partiql/value/CollectionValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/ListValue;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun hashCode ()I
-	public fun iterator ()Ljava/util/Iterator;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/ListValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/ListValue;
-}
-
-public abstract class org/partiql/value/MissingValue : org/partiql/value/PartiQLValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/MissingValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/MissingValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/MissingValue;
-}
-
-public abstract class org/partiql/value/NullValue : org/partiql/value/PartiQLValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/NullValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/NullValue;
-	public abstract fun withType (Lorg/partiql/value/PartiQLValueType;)Lorg/partiql/value/PartiQLValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/NullValue;
-}
-
-public abstract class org/partiql/value/NumericValue : org/partiql/value/ScalarValue {
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/NumericValue;
-	public fun isNull ()Z
-	public abstract fun toDecimal ()Lorg/partiql/value/DecimalValue;
-	public abstract fun toFloat32 ()Lorg/partiql/value/Float32Value;
-	public abstract fun toFloat64 ()Lorg/partiql/value/Float64Value;
-	public abstract fun toInt ()Lorg/partiql/value/IntValue;
-	public abstract fun toInt16 ()Lorg/partiql/value/Int16Value;
-	public abstract fun toInt32 ()Lorg/partiql/value/Int32Value;
-	public abstract fun toInt64 ()Lorg/partiql/value/Int64Value;
-	public abstract fun toInt8 ()Lorg/partiql/value/Int8Value;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/NumericValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/NumericValue;
-}
-
-public final class org/partiql/value/PartiQL {
-	public static final fun bagValue (Ljava/lang/Iterable;)Lorg/partiql/value/BagValue;
-	public static final fun bagValue (Ljava/lang/Iterable;Ljava/util/List;)Lorg/partiql/value/BagValue;
-	public static final fun bagValue ([Lorg/partiql/value/PartiQLValue;)Lorg/partiql/value/BagValue;
-	public static final fun bagValue ([Lorg/partiql/value/PartiQLValue;Ljava/util/List;)Lorg/partiql/value/BagValue;
-	public static synthetic fun bagValue$default (Ljava/lang/Iterable;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/BagValue;
-	public static synthetic fun bagValue$default ([Lorg/partiql/value/PartiQLValue;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/BagValue;
-	public static final fun binaryValue (Ljava/util/BitSet;)Lorg/partiql/value/BinaryValue;
-	public static final fun binaryValue (Ljava/util/BitSet;Ljava/util/List;)Lorg/partiql/value/BinaryValue;
-	public static synthetic fun binaryValue$default (Ljava/util/BitSet;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/BinaryValue;
-	public static final fun blobValue ([B)Lorg/partiql/value/BlobValue;
-	public static final fun blobValue ([BLjava/util/List;)Lorg/partiql/value/BlobValue;
-	public static synthetic fun blobValue$default ([BLjava/util/List;ILjava/lang/Object;)Lorg/partiql/value/BlobValue;
-	public static final fun boolValue (Ljava/lang/Boolean;)Lorg/partiql/value/BoolValue;
-	public static final fun boolValue (Ljava/lang/Boolean;Ljava/util/List;)Lorg/partiql/value/BoolValue;
-	public static synthetic fun boolValue$default (Ljava/lang/Boolean;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/BoolValue;
-	public static final fun byteValue (Ljava/lang/Byte;)Lorg/partiql/value/ByteValue;
-	public static final fun byteValue (Ljava/lang/Byte;Ljava/util/List;)Lorg/partiql/value/ByteValue;
-	public static synthetic fun byteValue$default (Ljava/lang/Byte;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/ByteValue;
-	public static final fun charValue (Ljava/lang/Character;)Lorg/partiql/value/CharValue;
-	public static final fun charValue (Ljava/lang/Character;Ljava/util/List;)Lorg/partiql/value/CharValue;
-	public static synthetic fun charValue$default (Ljava/lang/Character;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/CharValue;
-	public static final fun clobValue ([B)Lorg/partiql/value/ClobValue;
-	public static final fun clobValue ([BLjava/util/List;)Lorg/partiql/value/ClobValue;
-	public static synthetic fun clobValue$default ([BLjava/util/List;ILjava/lang/Object;)Lorg/partiql/value/ClobValue;
-	public static final fun dateValue (Lorg/partiql/value/datetime/Date;)Lorg/partiql/value/DateValue;
-	public static final fun dateValue (Lorg/partiql/value/datetime/Date;Ljava/util/List;)Lorg/partiql/value/DateValue;
-	public static synthetic fun dateValue$default (Lorg/partiql/value/datetime/Date;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/DateValue;
-	public static final fun decimalValue (Ljava/math/BigDecimal;)Lorg/partiql/value/DecimalValue;
-	public static final fun decimalValue (Ljava/math/BigDecimal;Ljava/util/List;)Lorg/partiql/value/DecimalValue;
-	public static synthetic fun decimalValue$default (Ljava/math/BigDecimal;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/DecimalValue;
-	public static final fun float32Value (Ljava/lang/Float;)Lorg/partiql/value/Float32Value;
-	public static final fun float32Value (Ljava/lang/Float;Ljava/util/List;)Lorg/partiql/value/Float32Value;
-	public static synthetic fun float32Value$default (Ljava/lang/Float;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/Float32Value;
-	public static final fun float64Value (Ljava/lang/Double;)Lorg/partiql/value/Float64Value;
-	public static final fun float64Value (Ljava/lang/Double;Ljava/util/List;)Lorg/partiql/value/Float64Value;
-	public static synthetic fun float64Value$default (Ljava/lang/Double;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/Float64Value;
-	public static final fun int16Value (Ljava/lang/Short;)Lorg/partiql/value/Int16Value;
-	public static final fun int16Value (Ljava/lang/Short;Ljava/util/List;)Lorg/partiql/value/Int16Value;
-	public static synthetic fun int16Value$default (Ljava/lang/Short;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/Int16Value;
-	public static final fun int32Value (Ljava/lang/Integer;)Lorg/partiql/value/Int32Value;
-	public static final fun int32Value (Ljava/lang/Integer;Ljava/util/List;)Lorg/partiql/value/Int32Value;
-	public static synthetic fun int32Value$default (Ljava/lang/Integer;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/Int32Value;
-	public static final fun int64Value (Ljava/lang/Long;)Lorg/partiql/value/Int64Value;
-	public static final fun int64Value (Ljava/lang/Long;Ljava/util/List;)Lorg/partiql/value/Int64Value;
-	public static synthetic fun int64Value$default (Ljava/lang/Long;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/Int64Value;
-	public static final fun int8Value (Ljava/lang/Byte;)Lorg/partiql/value/Int8Value;
-	public static final fun int8Value (Ljava/lang/Byte;Ljava/util/List;)Lorg/partiql/value/Int8Value;
-	public static synthetic fun int8Value$default (Ljava/lang/Byte;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/Int8Value;
-	public static final fun intValue (Ljava/math/BigInteger;)Lorg/partiql/value/IntValue;
-	public static final fun intValue (Ljava/math/BigInteger;Ljava/util/List;)Lorg/partiql/value/IntValue;
-	public static synthetic fun intValue$default (Ljava/math/BigInteger;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/IntValue;
-	public static final fun intervalValue (Ljava/lang/Long;)Lorg/partiql/value/IntervalValue;
-	public static final fun intervalValue (Ljava/lang/Long;Ljava/util/List;)Lorg/partiql/value/IntervalValue;
-	public static synthetic fun intervalValue$default (Ljava/lang/Long;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/IntervalValue;
-	public static final fun listValue (Ljava/lang/Iterable;)Lorg/partiql/value/ListValue;
-	public static final fun listValue (Ljava/lang/Iterable;Ljava/util/List;)Lorg/partiql/value/ListValue;
-	public static final fun listValue ([Lorg/partiql/value/PartiQLValue;)Lorg/partiql/value/ListValue;
-	public static final fun listValue ([Lorg/partiql/value/PartiQLValue;Ljava/util/List;)Lorg/partiql/value/ListValue;
-	public static synthetic fun listValue$default (Ljava/lang/Iterable;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/ListValue;
-	public static synthetic fun listValue$default ([Lorg/partiql/value/PartiQLValue;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/ListValue;
-	public static final fun missingValue ()Lorg/partiql/value/MissingValue;
-	public static final fun missingValue (Ljava/util/List;)Lorg/partiql/value/MissingValue;
-	public static synthetic fun missingValue$default (Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/MissingValue;
-	public static final fun nullValue ()Lorg/partiql/value/NullValue;
-	public static final fun nullValue (Ljava/util/List;)Lorg/partiql/value/NullValue;
-	public static synthetic fun nullValue$default (Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/NullValue;
-	public static final fun sexpValue (Ljava/lang/Iterable;)Lorg/partiql/value/SexpValue;
-	public static final fun sexpValue (Ljava/lang/Iterable;Ljava/util/List;)Lorg/partiql/value/SexpValue;
-	public static final fun sexpValue ([Lorg/partiql/value/PartiQLValue;)Lorg/partiql/value/SexpValue;
-	public static final fun sexpValue ([Lorg/partiql/value/PartiQLValue;Ljava/util/List;)Lorg/partiql/value/SexpValue;
-	public static synthetic fun sexpValue$default (Ljava/lang/Iterable;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/SexpValue;
-	public static synthetic fun sexpValue$default ([Lorg/partiql/value/PartiQLValue;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/SexpValue;
-	public static final fun stringValue (Ljava/lang/String;)Lorg/partiql/value/StringValue;
-	public static final fun stringValue (Ljava/lang/String;Ljava/util/List;)Lorg/partiql/value/StringValue;
-	public static synthetic fun stringValue$default (Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/StringValue;
-	public static final fun structValue (Ljava/lang/Iterable;)Lorg/partiql/value/StructValue;
-	public static final fun structValue (Ljava/lang/Iterable;Ljava/util/List;)Lorg/partiql/value/StructValue;
-	public static final fun structValue ([Lkotlin/Pair;)Lorg/partiql/value/StructValue;
-	public static final fun structValue ([Lkotlin/Pair;Ljava/util/List;)Lorg/partiql/value/StructValue;
-	public static synthetic fun structValue$default (Ljava/lang/Iterable;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/StructValue;
-	public static synthetic fun structValue$default ([Lkotlin/Pair;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/StructValue;
-	public static final fun structValueMap (Ljava/util/Map;)Lorg/partiql/value/StructValue;
-	public static final fun structValueMap (Ljava/util/Map;Ljava/util/List;)Lorg/partiql/value/StructValue;
-	public static synthetic fun structValueMap$default (Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/StructValue;
-	public static final fun structValueMultiMap (Ljava/util/Map;)Lorg/partiql/value/StructValue;
-	public static final fun structValueMultiMap (Ljava/util/Map;Ljava/util/List;)Lorg/partiql/value/StructValue;
-	public static synthetic fun structValueMultiMap$default (Ljava/util/Map;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/StructValue;
-	public static final fun symbolValue (Ljava/lang/String;)Lorg/partiql/value/SymbolValue;
-	public static final fun symbolValue (Ljava/lang/String;Ljava/util/List;)Lorg/partiql/value/SymbolValue;
-	public static synthetic fun symbolValue$default (Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/SymbolValue;
-	public static final fun timeValue (Lorg/partiql/value/datetime/Time;)Lorg/partiql/value/TimeValue;
-	public static final fun timeValue (Lorg/partiql/value/datetime/Time;Ljava/util/List;)Lorg/partiql/value/TimeValue;
-	public static synthetic fun timeValue$default (Lorg/partiql/value/datetime/Time;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/TimeValue;
-	public static final fun timestampValue (Lorg/partiql/value/datetime/Timestamp;)Lorg/partiql/value/TimestampValue;
-	public static final fun timestampValue (Lorg/partiql/value/datetime/Timestamp;Ljava/util/List;)Lorg/partiql/value/TimestampValue;
-	public static synthetic fun timestampValue$default (Lorg/partiql/value/datetime/Timestamp;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/TimestampValue;
-}
-
-public abstract interface class org/partiql/value/PartiQLValue {
-	public static final field Companion Lorg/partiql/value/PartiQLValue$Companion;
-	public abstract fun accept (Lorg/partiql/value/util/PartiQLValueVisitor;Ljava/lang/Object;)Ljava/lang/Object;
-	public static fun comparator ()Ljava/util/Comparator;
-	public static fun comparator (Z)Ljava/util/Comparator;
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/PartiQLValue;
-	public abstract fun getAnnotations ()Ljava/util/List;
-	public abstract fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/PartiQLValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/PartiQLValue;
-}
-
-public final class org/partiql/value/PartiQLValue$Companion {
-	public final fun comparator ()Ljava/util/Comparator;
-	public final fun comparator (Z)Ljava/util/Comparator;
-	public static synthetic fun comparator$default (Lorg/partiql/value/PartiQLValue$Companion;ZILjava/lang/Object;)Ljava/util/Comparator;
-}
-
-public final class org/partiql/value/PartiQLValue$DefaultImpls {
-	public static synthetic fun copy$default (Lorg/partiql/value/PartiQLValue;Ljava/util/List;ILjava/lang/Object;)Lorg/partiql/value/PartiQLValue;
-}
-
-public abstract interface annotation class org/partiql/value/PartiQLValueExperimental : java/lang/annotation/Annotation {
-}
-
-public final class org/partiql/value/PartiQLValueKt {
-	public static final fun toIon (Lorg/partiql/value/PartiQLValue;)Lcom/amazon/ionelement/api/IonElement;
-}
-
-public final class org/partiql/value/PartiQLValueType : java/lang/Enum {
-	public static final field ANY Lorg/partiql/value/PartiQLValueType;
-	public static final field BAG Lorg/partiql/value/PartiQLValueType;
-	public static final field BINARY Lorg/partiql/value/PartiQLValueType;
-	public static final field BLOB Lorg/partiql/value/PartiQLValueType;
-	public static final field BOOL Lorg/partiql/value/PartiQLValueType;
-	public static final field BYTE Lorg/partiql/value/PartiQLValueType;
-	public static final field CHAR Lorg/partiql/value/PartiQLValueType;
-	public static final field CLOB Lorg/partiql/value/PartiQLValueType;
-	public static final field DATE Lorg/partiql/value/PartiQLValueType;
-	public static final field DECIMAL Lorg/partiql/value/PartiQLValueType;
-	public static final field DECIMAL_ARBITRARY Lorg/partiql/value/PartiQLValueType;
-	public static final field FLOAT32 Lorg/partiql/value/PartiQLValueType;
-	public static final field FLOAT64 Lorg/partiql/value/PartiQLValueType;
-	public static final field INT Lorg/partiql/value/PartiQLValueType;
-	public static final field INT16 Lorg/partiql/value/PartiQLValueType;
-	public static final field INT32 Lorg/partiql/value/PartiQLValueType;
-	public static final field INT64 Lorg/partiql/value/PartiQLValueType;
-	public static final field INT8 Lorg/partiql/value/PartiQLValueType;
-	public static final field INTERVAL Lorg/partiql/value/PartiQLValueType;
-	public static final field LIST Lorg/partiql/value/PartiQLValueType;
-	public static final field MISSING Lorg/partiql/value/PartiQLValueType;
-	public static final field NULL Lorg/partiql/value/PartiQLValueType;
-	public static final field SEXP Lorg/partiql/value/PartiQLValueType;
-	public static final field STRING Lorg/partiql/value/PartiQLValueType;
-	public static final field STRUCT Lorg/partiql/value/PartiQLValueType;
-	public static final field SYMBOL Lorg/partiql/value/PartiQLValueType;
-	public static final field TIME Lorg/partiql/value/PartiQLValueType;
-	public static final field TIMESTAMP Lorg/partiql/value/PartiQLValueType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun toPType ()Lorg/partiql/types/PType;
-	public static fun valueOf (Ljava/lang/String;)Lorg/partiql/value/PartiQLValueType;
-	public static fun values ()[Lorg/partiql/value/PartiQLValueType;
-}
-
-public abstract interface class org/partiql/value/ScalarValue : org/partiql/value/PartiQLValue {
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/ScalarValue;
-	public abstract fun getValue ()Ljava/lang/Object;
-	public abstract fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/ScalarValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/ScalarValue;
-}
-
-public final class org/partiql/value/ScalarValue$DefaultImpls {
-	public static fun isNull (Lorg/partiql/value/ScalarValue;)Z
-}
-
-public abstract class org/partiql/value/SexpValue : org/partiql/value/CollectionValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/SexpValue;
-	public fun equals (Ljava/lang/Object;)Z
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun hashCode ()I
-	public fun iterator ()Ljava/util/Iterator;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/SexpValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/SexpValue;
-}
-
-public abstract class org/partiql/value/StringValue : org/partiql/value/TextValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/StringValue;
-	public fun getString ()Ljava/lang/String;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/StringValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/StringValue;
-}
-
-public abstract class org/partiql/value/StructValue : org/partiql/value/PartiQLValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/StructValue;
-	public fun equals (Ljava/lang/Object;)Z
-	public abstract fun get (Ljava/lang/String;)Lorg/partiql/value/PartiQLValue;
-	public abstract fun getAll (Ljava/lang/String;)Ljava/lang/Iterable;
-	public abstract fun getEntries ()Ljava/lang/Iterable;
-	public abstract fun getFields ()Ljava/lang/Iterable;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun getValues ()Ljava/lang/Iterable;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/StructValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/StructValue;
-}
-
-public abstract class org/partiql/value/SymbolValue : org/partiql/value/TextValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/SymbolValue;
-	public fun getString ()Ljava/lang/String;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/SymbolValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/SymbolValue;
-}
-
-public abstract class org/partiql/value/TextValue : org/partiql/value/ScalarValue {
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/TextValue;
-	public abstract fun getString ()Ljava/lang/String;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/TextValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/TextValue;
-}
-
-public abstract class org/partiql/value/TimeValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/TimeValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/TimeValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/TimeValue;
-}
-
-public abstract class org/partiql/value/TimestampValue : org/partiql/value/ScalarValue {
-	public fun <init> ()V
-	public abstract fun copy (Ljava/util/List;)Lorg/partiql/value/TimestampValue;
-	public fun getType ()Lorg/partiql/value/PartiQLValueType;
-	public fun isNull ()Z
-	public abstract fun withAnnotations (Ljava/util/List;)Lorg/partiql/value/TimestampValue;
-	public abstract fun withoutAnnotations ()Lorg/partiql/value/TimestampValue;
-}
-
 public abstract interface class org/partiql/value/datetime/Date : java/lang/Comparable, org/partiql/value/datetime/DateTime {
 	public abstract fun atTime (Lorg/partiql/value/datetime/Time;)Lorg/partiql/value/datetime/Timestamp;
 	public abstract fun compareTo (Lorg/partiql/value/datetime/Date;)I
@@ -1268,146 +821,7 @@ public abstract class org/partiql/value/datetime/TimestampWithoutTimeZone : org/
 	public abstract fun withTimeZone (Lorg/partiql/value/datetime/TimeZone;)Lorg/partiql/value/datetime/TimestampWithTimeZone;
 }
 
-public final class org/partiql/value/io/PartiQLValueIonReaderBuilder {
-	public static final field Companion Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$Companion;
-	public synthetic fun <init> (Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat;Lcom/amazon/ion/system/IonReaderBuilder;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun build (Lcom/amazon/ionelement/api/IonElement;)Lorg/partiql/value/io/PartiQLValueReader;
-	public final fun build (Ljava/io/InputStream;)Lorg/partiql/value/io/PartiQLValueReader;
-	public final fun ionReaderBuilder (Lcom/amazon/ion/system/IonReaderBuilder;)Lorg/partiql/value/io/PartiQLValueIonReaderBuilder;
-	public final fun sourceDataFormat (Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat;)Lorg/partiql/value/io/PartiQLValueIonReaderBuilder;
-	public static final fun standard ()Lorg/partiql/value/io/PartiQLValueIonReaderBuilder;
-}
-
-public final class org/partiql/value/io/PartiQLValueIonReaderBuilder$Companion {
-	public final fun standard ()Lorg/partiql/value/io/PartiQLValueIonReaderBuilder;
-}
-
-public final class org/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat : java/lang/Enum {
-	public static final field IonForPartiQL Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat;
-	public static final field IonGeneric Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public static fun valueOf (Ljava/lang/String;)Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat;
-	public static fun values ()[Lorg/partiql/value/io/PartiQLValueIonReaderBuilder$SourceDataFormat;
-}
-
-public final class org/partiql/value/io/PartiQLValueIonWriter : org/partiql/value/io/PartiQLValueWriter {
-	public fun append (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/value/io/PartiQLValueWriter;
-	public fun close ()V
-}
-
-public final class org/partiql/value/io/PartiQLValueIonWriterBuilder {
-	public static final field Companion Lorg/partiql/value/io/PartiQLValueIonWriterBuilder$Companion;
-	public synthetic fun <init> (Lcom/amazon/ion/system/IonWriterBuilder;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public final fun build (Ljava/io/OutputStream;)Lorg/partiql/value/io/PartiQLValueWriter;
-	public final fun ionWriterBuilder (Lcom/amazon/ion/system/IonWriterBuilder;)Lorg/partiql/value/io/PartiQLValueIonWriterBuilder;
-	public static final fun standardIonBinaryBuilder ()Lorg/partiql/value/io/PartiQLValueIonWriterBuilder;
-	public static final fun standardIonTextBuilder ()Lorg/partiql/value/io/PartiQLValueIonWriterBuilder;
-}
-
-public final class org/partiql/value/io/PartiQLValueIonWriterBuilder$Companion {
-	public final fun standardIonBinaryBuilder ()Lorg/partiql/value/io/PartiQLValueIonWriterBuilder;
-	public final fun standardIonTextBuilder ()Lorg/partiql/value/io/PartiQLValueIonWriterBuilder;
-}
-
-public abstract interface class org/partiql/value/io/PartiQLValueReader : java/lang/AutoCloseable {
-	public abstract fun read ()Lorg/partiql/value/PartiQLValue;
-}
-
-public final class org/partiql/value/io/PartiQLValueTextWriter : org/partiql/value/io/PartiQLValueWriter {
-	public fun <init> (Ljava/io/PrintStream;ZLjava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/PrintStream;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun append (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/value/io/PartiQLValueWriter;
-	public fun close ()V
-}
-
-public abstract interface class org/partiql/value/io/PartiQLValueWriter : java/lang/AutoCloseable {
-	public abstract fun append (Lorg/partiql/value/PartiQLValue;)Lorg/partiql/value/io/PartiQLValueWriter;
-}
-
-public final class org/partiql/value/io/PartiQLValueWriterBuilder {
-	public static final field Companion Lorg/partiql/value/io/PartiQLValueWriterBuilder$Companion;
-	public final fun build (Ljava/io/OutputStream;)Lorg/partiql/value/io/PartiQLValueWriter;
-	public final fun formatted (Z)Lorg/partiql/value/io/PartiQLValueWriterBuilder;
-	public static synthetic fun formatted$default (Lorg/partiql/value/io/PartiQLValueWriterBuilder;ZILjava/lang/Object;)Lorg/partiql/value/io/PartiQLValueWriterBuilder;
-	public static final fun standard ()Lorg/partiql/value/io/PartiQLValueWriterBuilder;
-}
-
-public final class org/partiql/value/io/PartiQLValueWriterBuilder$Companion {
-	public final fun standard ()Lorg/partiql/value/io/PartiQLValueWriterBuilder;
-}
-
 public final class org/partiql/value/util/NumberExtensionsKt {
 	public static final fun coerceNumbers (Ljava/lang/Number;Ljava/lang/Number;)Lkotlin/Pair;
 }
 
-public abstract class org/partiql/value/util/PartiQLValueBaseVisitor : org/partiql/value/util/PartiQLValueVisitor {
-	public fun <init> ()V
-	public abstract fun defaultReturn (Lorg/partiql/value/PartiQLValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun defaultVisit (Lorg/partiql/value/PartiQLValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visit (Lorg/partiql/value/PartiQLValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitBag (Lorg/partiql/value/BagValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitBinary (Lorg/partiql/value/BinaryValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitBlob (Lorg/partiql/value/BlobValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitBool (Lorg/partiql/value/BoolValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitByte (Lorg/partiql/value/ByteValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitChar (Lorg/partiql/value/CharValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitClob (Lorg/partiql/value/ClobValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitCollection (Lorg/partiql/value/CollectionValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitDate (Lorg/partiql/value/DateValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitDecimal (Lorg/partiql/value/DecimalValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitFloat32 (Lorg/partiql/value/Float32Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitFloat64 (Lorg/partiql/value/Float64Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitInt (Lorg/partiql/value/IntValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitInt16 (Lorg/partiql/value/Int16Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitInt32 (Lorg/partiql/value/Int32Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitInt64 (Lorg/partiql/value/Int64Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitInt8 (Lorg/partiql/value/Int8Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitInterval (Lorg/partiql/value/IntervalValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitList (Lorg/partiql/value/ListValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitMissing (Lorg/partiql/value/MissingValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitNull (Lorg/partiql/value/NullValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitNumeric (Lorg/partiql/value/NumericValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitScalar (Lorg/partiql/value/ScalarValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitSexp (Lorg/partiql/value/SexpValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitString (Lorg/partiql/value/StringValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitStruct (Lorg/partiql/value/StructValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitSymbol (Lorg/partiql/value/SymbolValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitText (Lorg/partiql/value/TextValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitTime (Lorg/partiql/value/TimeValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public fun visitTimestamp (Lorg/partiql/value/TimestampValue;Ljava/lang/Object;)Ljava/lang/Object;
-}
-
-public abstract interface class org/partiql/value/util/PartiQLValueVisitor {
-	public abstract fun visit (Lorg/partiql/value/PartiQLValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitBag (Lorg/partiql/value/BagValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitBinary (Lorg/partiql/value/BinaryValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitBlob (Lorg/partiql/value/BlobValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitBool (Lorg/partiql/value/BoolValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitByte (Lorg/partiql/value/ByteValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitChar (Lorg/partiql/value/CharValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitClob (Lorg/partiql/value/ClobValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitCollection (Lorg/partiql/value/CollectionValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitDate (Lorg/partiql/value/DateValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitDecimal (Lorg/partiql/value/DecimalValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitFloat32 (Lorg/partiql/value/Float32Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitFloat64 (Lorg/partiql/value/Float64Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitInt (Lorg/partiql/value/IntValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitInt16 (Lorg/partiql/value/Int16Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitInt32 (Lorg/partiql/value/Int32Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitInt64 (Lorg/partiql/value/Int64Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitInt8 (Lorg/partiql/value/Int8Value;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitInterval (Lorg/partiql/value/IntervalValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitList (Lorg/partiql/value/ListValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitMissing (Lorg/partiql/value/MissingValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitNull (Lorg/partiql/value/NullValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitNumeric (Lorg/partiql/value/NumericValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitScalar (Lorg/partiql/value/ScalarValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitSexp (Lorg/partiql/value/SexpValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitString (Lorg/partiql/value/StringValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitStruct (Lorg/partiql/value/StructValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitSymbol (Lorg/partiql/value/SymbolValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitText (Lorg/partiql/value/TextValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitTime (Lorg/partiql/value/TimeValue;Ljava/lang/Object;)Ljava/lang/Object;
-	public abstract fun visitTimestamp (Lorg/partiql/value/TimestampValue;Ljava/lang/Object;)Ljava/lang/Object;
-}
-
diff --git a/partiql-spi/build.gradle.kts b/partiql-spi/build.gradle.kts
index 8564fb52e..78168f48f 100644
--- a/partiql-spi/build.gradle.kts
+++ b/partiql-spi/build.gradle.kts
@@ -16,6 +16,7 @@
 plugins {
     id(Plugins.conventions)
     id(Plugins.publish)
+    id(Plugins.testFixtures)
 }
 
 dependencies {
@@ -58,6 +59,12 @@ components.withType(AdhocComponentWithVariants::class.java).forEach { c ->
     }
 }
 
+tasks.compileTestFixturesKotlin {
+    kotlinOptions.jvmTarget = Versions.jvmTarget
+    kotlinOptions.apiVersion = Versions.kotlinApi
+    kotlinOptions.languageVersion = Versions.kotlinLanguage
+}
+
 publish {
     artifactId = "partiql-spi"
     name = "PartiQL SPI"
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java b/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
index 0f3647a8c..06e31786b 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
@@ -1,14 +1,9 @@
 package org.partiql.spi.value;
 
-import kotlin.NotImplementedError;
-import kotlin.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.errors.DataException;
 import org.partiql.types.PType;
-import org.partiql.value.PartiQL;
-import org.partiql.value.PartiQLValue;
-import org.partiql.value.PartiQLValueType;
 import org.partiql.value.datetime.Date;
 import org.partiql.value.datetime.Time;
 import org.partiql.value.datetime.Timestamp;
@@ -21,55 +16,13 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
-import java.util.Objects;
-
-import static org.partiql.types.PType.DYNAMIC;
-import static org.partiql.types.PType.BOOL;
-import static org.partiql.types.PType.TINYINT;
-import static org.partiql.types.PType.SMALLINT;
-import static org.partiql.types.PType.INTEGER;
-import static org.partiql.types.PType.BIGINT;
-import static org.partiql.types.PType.NUMERIC;
-import static org.partiql.types.PType.DECIMAL;
-import static org.partiql.types.PType.REAL;
-import static org.partiql.types.PType.DOUBLE;
-import static org.partiql.types.PType.CHAR;
-import static org.partiql.types.PType.STRING;
-import static org.partiql.types.PType.BLOB;
-import static org.partiql.types.PType.CLOB;
-import static org.partiql.types.PType.DATE;
-import static org.partiql.types.PType.TIME;
-import static org.partiql.types.PType.TIMEZ;
-import static org.partiql.types.PType.TIMESTAMP;
-import static org.partiql.types.PType.TIMESTAMPZ;
-import static org.partiql.types.PType.ARRAY;
-import static org.partiql.types.PType.BAG;
-import static org.partiql.types.PType.ROW;
-import static org.partiql.types.PType.STRUCT;
-import static org.partiql.types.PType.UNKNOWN;
 
 /**
- * This is an EXPERIMENTAL representation of a value in PartiQL's type system. The intention of this modeling is to
+ * This is a representation of a value in PartiQL's type system. The intention of this modeling is to
  * provide a layer of indirection between PartiQL's type semantics and Java's type semantics.
- * <p>
- * ! EXPERIMENTAL ! This API is experimental and may be removed/modified without prior notice.
- * </p>
- * <p></p>
- * INTERNAL DEVELOPER NOTES:
- * <p></p>
- * This is intended to completely replace {@link org.partiql.value.PartiQLValue} in the future (for evaluation). As it
- * stands, this implementation will initially be used solely for the evaluator. {@link org.partiql.value.PartiQLValue}
- * may be modified to be solely used for the plan representation (DOM).
- * <p></p>
- * Note that this is public, however, it will not be released until it replaces  {@link org.partiql.value.PartiQLValue}
- * for evaluation.
- * <p></p>
- * There are some pre-requisites to actually replacing {@link PartiQLValue} for evaluation including, but not limited to:
- * - The comparator for ordering and aggregations
- * - Equality
- * - Adding support for annotations
  */
 public interface Datum extends Iterable<Datum> {
+    // TODO: Annotations?
 
     /**
      * Determines whether the current value is a null value of any type (for example, null or null.int). It should be
@@ -393,168 +346,6 @@ default Datum lower() {
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * Converts a {@link Datum} into a {@link PartiQLValue}.
-     *
-     * @return the equivalent {@link PartiQLValue}
-     * @deprecated this is an experimental API and is designed for use by the internal PartiQL library. This may
-     * be modified/removed at any time.
-     */
-    @NotNull
-    @Deprecated
-    default PartiQLValue toPartiQLValue() {
-        PType type = this.getType();
-        if (this.isMissing()) {
-            return PartiQL.missingValue();
-        }
-        switch (type.code()) {
-            case BOOL:
-                return this.isNull() ? PartiQL.boolValue(null) : PartiQL.boolValue(this.getBoolean());
-            case TINYINT:
-                return this.isNull() ? PartiQL.int8Value(null) : PartiQL.int8Value(this.getByte());
-            case SMALLINT:
-                return this.isNull() ? PartiQL.int16Value(null) : PartiQL.int16Value(this.getShort());
-            case INTEGER:
-                return this.isNull() ? PartiQL.int32Value(null) : PartiQL.int32Value(this.getInt());
-            case BIGINT:
-                return this.isNull() ? PartiQL.int64Value(null) : PartiQL.int64Value(this.getLong());
-            case NUMERIC:
-                return this.isNull() ? PartiQL.intValue(null) : PartiQL.intValue(this.getBigInteger());
-            case DECIMAL:
-                return this.isNull() ? PartiQL.decimalValue(null) : PartiQL.decimalValue(this.getBigDecimal());
-            case REAL:
-                return this.isNull() ? PartiQL.float32Value(null) : PartiQL.float32Value(this.getFloat());
-            case DOUBLE:
-                return this.isNull() ? PartiQL.float64Value(null) : PartiQL.float64Value(this.getDouble());
-            case CHAR:
-                return this.isNull() ? PartiQL.charValue(null) : PartiQL.charValue(this.getString().charAt(0));
-            case STRING:
-                return this.isNull() ? PartiQL.stringValue(null) : PartiQL.stringValue(this.getString());
-            case BLOB:
-                return this.isNull() ? PartiQL.blobValue(null) : PartiQL.blobValue(this.getBytes());
-            case CLOB:
-                return this.isNull() ? PartiQL.clobValue(null) : PartiQL.clobValue(this.getBytes());
-            case DATE:
-                return this.isNull() ? PartiQL.dateValue(null) : PartiQL.dateValue(this.getDate());
-            case TIMEZ:
-            case TIME: // TODO
-                return this.isNull() ? PartiQL.timeValue(null) : PartiQL.timeValue(this.getTime());
-            case TIMESTAMPZ:
-            case TIMESTAMP:
-                return this.isNull() ? PartiQL.timestampValue(null) : PartiQL.timestampValue(this.getTimestamp());
-            case BAG:
-                return this.isNull() ? PartiQL.bagValue((Iterable<? extends PartiQLValue>) null) : PartiQL.bagValue(new PQLToPartiQLIterable(this));
-            case ARRAY:
-                return this.isNull() ? PartiQL.listValue((Iterable<? extends PartiQLValue>) null) : PartiQL.listValue(new PQLToPartiQLIterable(this));
-            case STRUCT:
-            case ROW:
-                return this.isNull() ? PartiQL.structValue((Iterable<? extends Pair<String, ? extends PartiQLValue>>) null) : PartiQL.structValue(new PQLToPartiQLStruct(this));
-            case DYNAMIC:
-            case UNKNOWN:
-                if (this.isNull()) {
-                    return PartiQL.nullValue();
-                } else if (this.isMissing()) {
-                    return PartiQL.missingValue();
-                }
-            default:
-                throw new UnsupportedOperationException("Unsupported datum type: " + type);
-        }
-    }
-
-    /**
-     * Converts a {@link PartiQLValue} into {@link Datum}.
-     *
-     * @return the equivalent {@link Datum}
-     */
-    @NotNull
-    @Deprecated
-    static Datum of(PartiQLValue value) {
-        PartiQLValueType type = value.getType();
-        if (value.isNull()) {
-            return new DatumNull(type.toPType());
-        }
-        switch (type) {
-            case MISSING:
-                return new DatumMissing();
-            case NULL:
-                return new DatumNull();
-            case INT8:
-                org.partiql.value.Int8Value int8Value = (org.partiql.value.Int8Value) value;
-                return new DatumByte(Objects.requireNonNull(int8Value.getValue()), PType.tinyint());
-            case STRUCT:
-                @SuppressWarnings("unchecked") org.partiql.value.StructValue<PartiQLValue> STRUCTValue = (org.partiql.value.StructValue<PartiQLValue>) value;
-                return new DatumStruct(new PartiQLToPQLStruct(Objects.requireNonNull(STRUCTValue)));
-            case STRING:
-                org.partiql.value.StringValue STRINGValue = (org.partiql.value.StringValue) value;
-                return new DatumString(Objects.requireNonNull(STRINGValue.getValue()), PType.string());
-            case INT64:
-                org.partiql.value.Int64Value INT64Value = (org.partiql.value.Int64Value) value;
-                return new DatumLong(Objects.requireNonNull(INT64Value.getValue()));
-            case INT32:
-                org.partiql.value.Int32Value INT32Value = (org.partiql.value.Int32Value) value;
-                return new DatumInt(Objects.requireNonNull(INT32Value.getValue()));
-            case INT16:
-                org.partiql.value.Int16Value INT16Value = (org.partiql.value.Int16Value) value;
-                return new DatumShort(Objects.requireNonNull(INT16Value.getValue()));
-            case SEXP:
-                throw new IllegalStateException("SEXP is not supported.");
-            case LIST:
-                @SuppressWarnings("unchecked") org.partiql.value.ListValue<PartiQLValue> LISTValue = (org.partiql.value.ListValue<PartiQLValue>) value;
-                return new DatumCollection(new PartiQLToPQLIterable(Objects.requireNonNull(LISTValue)), PType.array());
-            case BOOL:
-                org.partiql.value.BoolValue BOOLValue = (org.partiql.value.BoolValue) value;
-                return new DatumBoolean(Objects.requireNonNull(BOOLValue.getValue()));
-            case INT:
-                org.partiql.value.IntValue INTValue = (org.partiql.value.IntValue) value;
-                return new DatumBigInteger(Objects.requireNonNull(INTValue.getValue()));
-            case BAG:
-                @SuppressWarnings("unchecked") org.partiql.value.BagValue<PartiQLValue> BAGValue = (org.partiql.value.BagValue<PartiQLValue>) value;
-                return new DatumCollection(new PartiQLToPQLIterable(Objects.requireNonNull(BAGValue)), PType.bag());
-            case BINARY:
-                throw new UnsupportedOperationException();
-            case DATE:
-                org.partiql.value.DateValue DATEValue = (org.partiql.value.DateValue) value;
-                return new DatumDate(Objects.requireNonNull(DATEValue.getValue()));
-            case INTERVAL:
-                org.partiql.value.IntervalValue INTERVALValue = (org.partiql.value.IntervalValue) value;
-                return new DatumInterval(Objects.requireNonNull(INTERVALValue.getValue()));
-            case TIMESTAMP:
-                org.partiql.value.TimestampValue TIMESTAMPValue = (org.partiql.value.TimestampValue) value;
-                return new DatumTimestamp(Objects.requireNonNull(TIMESTAMPValue.getValue()));
-            case TIME:
-                org.partiql.value.TimeValue TIMEValue = (org.partiql.value.TimeValue) value;
-                return new DatumTime(Objects.requireNonNull(TIMEValue.getValue()));
-            case FLOAT32:
-                org.partiql.value.Float32Value FLOAT32Value = (org.partiql.value.Float32Value) value;
-                return new DatumFloat(Objects.requireNonNull(FLOAT32Value.getValue()));
-            case FLOAT64:
-                org.partiql.value.Float64Value FLOAT64Value = (org.partiql.value.Float64Value) value;
-                return new DatumDouble(Objects.requireNonNull(FLOAT64Value.getValue()));
-            case DECIMAL:
-            case DECIMAL_ARBITRARY:
-                org.partiql.value.DecimalValue DECIMALValue = (org.partiql.value.DecimalValue) value;
-                BigDecimal d = Objects.requireNonNull(DECIMALValue.getValue());
-                return Datum.decimal(d, d.precision(), d.scale());
-            case CHAR:
-                org.partiql.value.CharValue CHARValue = (org.partiql.value.CharValue) value;
-                String charString = Objects.requireNonNull(CHARValue.getValue()).toString();
-                return new DatumChars(charString, charString.length());
-            case SYMBOL:
-                throw new IllegalStateException("SYMBOL not supported.");
-            case CLOB:
-                org.partiql.value.ClobValue CLOBValue = (org.partiql.value.ClobValue) value;
-                return new DatumBytes(Objects.requireNonNull(CLOBValue.getValue()), PType.clob(Integer.MAX_VALUE)); // TODO
-            case BLOB:
-                org.partiql.value.BlobValue BLOBValue = (org.partiql.value.BlobValue) value;
-                return new DatumBytes(Objects.requireNonNull(BLOBValue.getValue()), PType.blob(Integer.MAX_VALUE)); // TODO
-            case BYTE:
-                throw new UnsupportedOperationException();
-            case ANY:
-            default:
-                throw new NotImplementedError();
-        }
-    }
-
     @NotNull
     static Datum nullValue() {
         return new DatumNull();
@@ -572,12 +363,9 @@ static Datum nullValue(@NotNull PType type) {
 
     /**
      * Returns a typed missing value
-     * ! EXPERIMENTAL ! This is subject to breaking changes and/or removal without prior notice.
      * @param type the type of the value
      * @return a typed missing value
-     * @deprecated this may not be required. This is subject to removal.
      */
-    @Deprecated
     @NotNull
     static Datum missing(@NotNull PType type) {
         return new DatumMissing(type);
@@ -745,11 +533,21 @@ static Datum time(@NotNull Time value) {
         return new DatumTime(value);
     }
 
+    @NotNull
+    static Datum time(@NotNull Time value, int precision) {
+        return new DatumTime(value, precision);
+    }
+
     @NotNull
     static Datum timestamp(@NotNull Timestamp value) {
         return new DatumTimestamp(value);
     }
 
+    @NotNull
+    static Datum timestamp(@NotNull Timestamp value, int precision) {
+        return new DatumTimestamp(value, precision);
+    }
+
     // COLLECTIONS
 
     @NotNull
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java
index 1a2391e66..77519937b 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java
@@ -12,12 +12,17 @@ class DatumTime implements Datum {
     @NotNull
     private final Time _value;
 
-    // TODO: Pass precision to constructor.
     // TODO: Create a variant specifically for without TZ
-    private final static PType _type = PType.timez(6);
+    private final PType _type;
 
     DatumTime(@NotNull Time value) {
         _value = value;
+        _type = PType.timez(6);
+    }
+
+    DatumTime(@NotNull Time value, int precision) {
+        _value = value;
+        _type = PType.timez(precision);
     }
 
     @Override
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java
index bc72fa684..77079577b 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java
@@ -12,12 +12,17 @@ class DatumTimestamp implements Datum {
     @NotNull
     private final Timestamp _value;
 
-    // TODO: Pass precision to constructor.
     // TODO: Create a variant specifically for without TZ
-    private final static PType _type = PType.timestampz(6);
+    private final PType _type;
 
     DatumTimestamp(@NotNull Timestamp value) {
         _value = value;
+        _type = PType.timestampz(6);
+    }
+
+    DatumTimestamp(@NotNull Timestamp value, int precision) {
+        _value = value;
+        _type = PType.timestampz(precision);
     }
 
     @Override
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/Field.java b/partiql-spi/src/main/java/org/partiql/spi/value/Field.java
index 8c6ea2802..b7b833359 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/Field.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/Field.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Represents a field within a PartiQL {@link org.partiql.value.PartiQLValueType#STRUCT}.
+ * Represents a field within a PartiQL {@link org.partiql.types.PType#STRUCT}.
  */
 public interface Field {
 
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt
index 085be8d3e..61f3e00d5 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt
@@ -10,6 +10,7 @@ import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
 import org.partiql.spi.value.Encoding
 import org.partiql.spi.value.Field
+import org.partiql.types.PType
 import org.partiql.value.datetime.DateTimeUtil.toBigDecimal
 import java.io.IOException
 import java.io.InputStream
@@ -66,36 +67,64 @@ internal class IonDatumReader internal constructor(
     /**
      * Read without any explicit PartiQL type information.
      */
-    private fun read(): Datum = when (reader.type) {
-        IonType.NULL -> Datum.nullValue()
-        IonType.BOOL -> bool()
-        IonType.INT -> bigint()
-        IonType.FLOAT -> double()
-        IonType.DECIMAL -> decimal0()
-        IonType.TIMESTAMP -> TODO("timestamp without annotation")
-        IonType.STRING -> varchar0()
-        IonType.CLOB -> clob0()
-        IonType.BLOB -> clob0()
-        IonType.LIST -> array()
-        IonType.STRUCT -> struct()
-        IonType.SYMBOL -> missing()
-        IonType.SEXP -> {
-            reader.stepIn()
-            if (reader.next() == null) {
-                throw IonDatumException("expected type, was null", null, span())
-            }
-            val method = method()
-            if (reader.next() == null) {
-                throw IonDatumException("expected value, was null", null, span())
-            }
-            val value = method()
-            if (reader.next() != null) {
-                throw IonDatumException("expected end of s-expression pair", null, span())
+    private fun read(): Datum {
+        if (reader.isNullValue) {
+            return Datum.nullValue(reader.type.toPTypeDefault())
+        }
+        return when (reader.type) {
+            IonType.NULL -> Datum.nullValue()
+            IonType.BOOL -> bool()
+            IonType.INT -> bigint()
+            IonType.FLOAT -> double()
+            IonType.DECIMAL -> decimal0()
+            IonType.TIMESTAMP -> TODO("timestamp without annotation")
+            IonType.STRING -> varchar0()
+            IonType.CLOB -> clob0()
+            IonType.BLOB -> clob0()
+            IonType.LIST -> array()
+            IonType.STRUCT -> struct()
+            IonType.SYMBOL -> missing()
+            IonType.SEXP -> {
+                reader.stepIn()
+                if (reader.next() == null) {
+                    throw IonDatumException("expected type, was null", null, span())
+                }
+                val method = method()
+                if (reader.next() == null) {
+                    throw IonDatumException("expected value, was null", null, span())
+                }
+                val value = method()
+                if (reader.next() != null) {
+                    throw IonDatumException("expected end of s-expression pair", null, span())
+                }
+                reader.stepOut()
+                value
             }
-            reader.stepOut()
-            value
+            else -> throw IonDatumException("unknown type", null, span())
+        }
+    }
+
+    /**
+     * Returns the default [PType] for the given [IonType].
+     */
+    private fun IonType.toPTypeDefault(): PType {
+        val code = when (this) {
+            IonType.NULL -> PType.UNKNOWN
+            IonType.BOOL -> PType.BOOL
+            IonType.INT -> PType.BIGINT
+            IonType.FLOAT -> PType.DOUBLE
+            IonType.DECIMAL -> PType.DECIMAL
+            IonType.TIMESTAMP -> PType.TIMESTAMP
+            IonType.STRING -> PType.STRING
+            IonType.CLOB -> PType.CLOB
+            IonType.BLOB -> PType.BLOB
+            IonType.LIST -> PType.ARRAY
+            IonType.STRUCT -> PType.STRUCT
+            IonType.SYMBOL -> PType.STRING
+            IonType.SEXP -> PType.ARRAY
+            else -> throw IonDatumException("Unknown type", null, span())
         }
-        else -> throw IonDatumException("unknown type", null, span())
+        return PType.of(code)
     }
 
     /**
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueExperimental.kt b/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueExperimental.kt
deleted file mode 100644
index 175e27e2a..000000000
--- a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueExperimental.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Amazon.com, Inc. or its affiliates.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *      http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package org.partiql.value
-
-@RequiresOptIn(
-    message = "PartiQL Value requires explicit opt-in",
-    level = RequiresOptIn.Level.ERROR,
-)
-public annotation class PartiQLValueExperimental
diff --git a/partiql-spi/src/test/kotlin/org/partiql/value/PartiQLValueComparatorTest.kt b/partiql-spi/src/test/kotlin/org/partiql/value/PartiQLValueComparatorTest.kt
index b0a23be17..8bb163586 100644
--- a/partiql-spi/src/test/kotlin/org/partiql/value/PartiQLValueComparatorTest.kt
+++ b/partiql-spi/src/test/kotlin/org/partiql/value/PartiQLValueComparatorTest.kt
@@ -10,7 +10,6 @@ import java.math.BigDecimal
 import java.util.Base64
 import java.util.Random
 
-@OptIn(PartiQLValueExperimental::class)
 class PartiQLValueComparatorTest {
     class EquivValues(vararg val values: PartiQLValue)
 
diff --git a/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueIonSerdeTest.kt b/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueIonSerdeTest.kt
index 3b4437fe0..39e9fb615 100644
--- a/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueIonSerdeTest.kt
+++ b/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueIonSerdeTest.kt
@@ -11,9 +11,10 @@ import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
+import org.partiql.spi.value.io.PartiQLValueIonReaderBuilder
+import org.partiql.spi.value.io.PartiQLValueIonWriterBuilder
 import org.partiql.value.Annotations
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.bagValue
 import org.partiql.value.blobValue
 import org.partiql.value.boolValue
@@ -44,7 +45,6 @@ import java.math.BigDecimal
 import java.math.BigInteger
 import kotlin.test.assertEquals
 
-@OptIn(PartiQLValueExperimental::class)
 class PartiQLValueIonSerdeTest {
 
     @ParameterizedTest
diff --git a/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueTextWriterTest.kt b/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueTextWriterTest.kt
index 6d0783f1f..8b7d471ab 100644
--- a/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueTextWriterTest.kt
+++ b/partiql-spi/src/test/kotlin/org/partiql/value/io/PartiQLValueTextWriterTest.kt
@@ -1,5 +1,3 @@
-@file:OptIn(PartiQLValueExperimental::class)
-
 package org.partiql.value.io
 
 import org.junit.jupiter.api.Assertions
@@ -7,9 +5,9 @@ import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
+import org.partiql.spi.value.io.PartiQLValueTextWriter
 import org.partiql.value.Annotations
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.bagValue
 import org.partiql.value.boolValue
 import org.partiql.value.charValue
@@ -86,7 +84,6 @@ class PartiQLValueTextWriterTest {
     @Execution(ExecutionMode.CONCURRENT)
     fun testAnnotations(case: Case) = case.assert()
 
-    @OptIn(PartiQLValueExperimental::class)
     companion object {
 
         private val annotations: Annotations = listOf("x", "y")
@@ -759,7 +756,6 @@ class PartiQLValueTextWriterTest {
         )
     }
 
-    @OptIn(PartiQLValueExperimental::class)
     class Case(
         private val value: PartiQLValue,
         private val expected: String,
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
new file mode 100644
index 000000000..54beeb963
--- /dev/null
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
@@ -0,0 +1,195 @@
+package org.partiql.spi.value;
+
+import kotlin.NotImplementedError;
+import kotlin.Pair;
+import org.jetbrains.annotations.NotNull;
+import org.partiql.types.PType;
+import org.partiql.value.PartiQL;
+import org.partiql.value.PartiQLValue;
+import org.partiql.value.PartiQLValueType;
+import java.math.BigDecimal;
+import java.util.Objects;
+import static org.partiql.types.PType.ARRAY;
+import static org.partiql.types.PType.BAG;
+import static org.partiql.types.PType.BIGINT;
+import static org.partiql.types.PType.BLOB;
+import static org.partiql.types.PType.BOOL;
+import static org.partiql.types.PType.CHAR;
+import static org.partiql.types.PType.CLOB;
+import static org.partiql.types.PType.DATE;
+import static org.partiql.types.PType.DECIMAL;
+import static org.partiql.types.PType.DOUBLE;
+import static org.partiql.types.PType.DYNAMIC;
+import static org.partiql.types.PType.INTEGER;
+import static org.partiql.types.PType.NUMERIC;
+import static org.partiql.types.PType.REAL;
+import static org.partiql.types.PType.ROW;
+import static org.partiql.types.PType.SMALLINT;
+import static org.partiql.types.PType.STRING;
+import static org.partiql.types.PType.STRUCT;
+import static org.partiql.types.PType.TIME;
+import static org.partiql.types.PType.TIMESTAMP;
+import static org.partiql.types.PType.TIMESTAMPZ;
+import static org.partiql.types.PType.TIMEZ;
+import static org.partiql.types.PType.TINYINT;
+import static org.partiql.types.PType.UNKNOWN;
+
+public class DatumUtils {
+
+    /**
+     * Converts a {@link Datum} into a {@link PartiQLValue}.
+     * @return the equivalent {@link PartiQLValue}
+     */
+    @NotNull
+    public static PartiQLValue toPartiQLValue(@NotNull Datum datum) {
+        PType type = datum.getType();
+        if (datum.isMissing()) {
+            return PartiQL.missingValue();
+        }
+        switch (type.code()) {
+            case BOOL:
+                return datum.isNull() ? PartiQL.boolValue(null) : PartiQL.boolValue(datum.getBoolean());
+            case TINYINT:
+                return datum.isNull() ? PartiQL.int8Value(null) : PartiQL.int8Value(datum.getByte());
+            case SMALLINT:
+                return datum.isNull() ? PartiQL.int16Value(null) : PartiQL.int16Value(datum.getShort());
+            case INTEGER:
+                return datum.isNull() ? PartiQL.int32Value(null) : PartiQL.int32Value(datum.getInt());
+            case BIGINT:
+                return datum.isNull() ? PartiQL.int64Value(null) : PartiQL.int64Value(datum.getLong());
+            case NUMERIC:
+                return datum.isNull() ? PartiQL.intValue(null) : PartiQL.intValue(datum.getBigInteger());
+            case DECIMAL:
+                return datum.isNull() ? PartiQL.decimalValue(null) : PartiQL.decimalValue(datum.getBigDecimal());
+            case REAL:
+                return datum.isNull() ? PartiQL.float32Value(null) : PartiQL.float32Value(datum.getFloat());
+            case DOUBLE:
+                return datum.isNull() ? PartiQL.float64Value(null) : PartiQL.float64Value(datum.getDouble());
+            case CHAR:
+                return datum.isNull() ? PartiQL.charValue(null) : PartiQL.charValue(datum.getString().charAt(0));
+            case STRING:
+                return datum.isNull() ? PartiQL.stringValue(null) : PartiQL.stringValue(datum.getString());
+            case BLOB:
+                return datum.isNull() ? PartiQL.blobValue(null) : PartiQL.blobValue(datum.getBytes());
+            case CLOB:
+                return datum.isNull() ? PartiQL.clobValue(null) : PartiQL.clobValue(datum.getBytes());
+            case DATE:
+                return datum.isNull() ? PartiQL.dateValue(null) : PartiQL.dateValue(datum.getDate());
+            case TIMEZ:
+            case TIME: // TODO
+                return datum.isNull() ? PartiQL.timeValue(null) : PartiQL.timeValue(datum.getTime());
+            case TIMESTAMPZ:
+            case TIMESTAMP:
+                return datum.isNull() ? PartiQL.timestampValue(null) : PartiQL.timestampValue(datum.getTimestamp());
+            case BAG:
+                return datum.isNull() ? PartiQL.bagValue((Iterable<? extends PartiQLValue>) null) : PartiQL.bagValue(new PQLToPartiQLIterable(datum));
+            case ARRAY:
+                return datum.isNull() ? PartiQL.listValue((Iterable<? extends PartiQLValue>) null) : PartiQL.listValue(new PQLToPartiQLIterable(datum));
+            case STRUCT:
+            case ROW:
+                return datum.isNull() ? PartiQL.structValue((Iterable<? extends Pair<String, ? extends PartiQLValue>>) null) : PartiQL.structValue(new PQLToPartiQLStruct(datum));
+            case DYNAMIC:
+            case UNKNOWN:
+                if (datum.isNull()) {
+                    return PartiQL.nullValue();
+                } else if (datum.isMissing()) {
+                    return PartiQL.missingValue();
+                }
+            default:
+                throw new UnsupportedOperationException("Unsupported datum type: " + type);
+        }
+    }
+
+    /**
+     * Converts a {@link PartiQLValue} into {@link Datum}.
+     *
+     * @return the equivalent {@link Datum}
+     */
+    @NotNull
+    public static Datum toDatum(PartiQLValue value) {
+        PartiQLValueType type = value.getType();
+        if (value.isNull()) {
+            return new DatumNull(type.toPType());
+        }
+        switch (type) {
+            case MISSING:
+                return new DatumMissing();
+            case NULL:
+                return new DatumNull();
+            case INT8:
+                org.partiql.value.Int8Value int8Value = (org.partiql.value.Int8Value) value;
+                return new DatumByte(Objects.requireNonNull(int8Value.getValue()), PType.tinyint());
+            case STRUCT:
+                @SuppressWarnings("unchecked") org.partiql.value.StructValue<PartiQLValue> STRUCTValue = (org.partiql.value.StructValue<PartiQLValue>) value;
+                return new DatumStruct(new PartiQLToPQLStruct(Objects.requireNonNull(STRUCTValue)));
+            case STRING:
+                org.partiql.value.StringValue STRINGValue = (org.partiql.value.StringValue) value;
+                return new DatumString(Objects.requireNonNull(STRINGValue.getValue()), PType.string());
+            case INT64:
+                org.partiql.value.Int64Value INT64Value = (org.partiql.value.Int64Value) value;
+                return new DatumLong(Objects.requireNonNull(INT64Value.getValue()));
+            case INT32:
+                org.partiql.value.Int32Value INT32Value = (org.partiql.value.Int32Value) value;
+                return new DatumInt(Objects.requireNonNull(INT32Value.getValue()));
+            case INT16:
+                org.partiql.value.Int16Value INT16Value = (org.partiql.value.Int16Value) value;
+                return new DatumShort(Objects.requireNonNull(INT16Value.getValue()));
+            case SEXP:
+                throw new IllegalStateException("SEXP is not supported.");
+            case LIST:
+                @SuppressWarnings("unchecked") org.partiql.value.ListValue<PartiQLValue> LISTValue = (org.partiql.value.ListValue<PartiQLValue>) value;
+                return new DatumCollection(new PartiQLToPQLIterable(Objects.requireNonNull(LISTValue)), PType.array());
+            case BOOL:
+                org.partiql.value.BoolValue BOOLValue = (org.partiql.value.BoolValue) value;
+                return new DatumBoolean(Objects.requireNonNull(BOOLValue.getValue()));
+            case INT:
+                org.partiql.value.IntValue INTValue = (org.partiql.value.IntValue) value;
+                return new DatumBigInteger(Objects.requireNonNull(INTValue.getValue()));
+            case BAG:
+                @SuppressWarnings("unchecked") org.partiql.value.BagValue<PartiQLValue> BAGValue = (org.partiql.value.BagValue<PartiQLValue>) value;
+                return new DatumCollection(new PartiQLToPQLIterable(Objects.requireNonNull(BAGValue)), PType.bag());
+            case BINARY:
+                throw new UnsupportedOperationException();
+            case DATE:
+                org.partiql.value.DateValue DATEValue = (org.partiql.value.DateValue) value;
+                return new DatumDate(Objects.requireNonNull(DATEValue.getValue()));
+            case INTERVAL:
+                org.partiql.value.IntervalValue INTERVALValue = (org.partiql.value.IntervalValue) value;
+                return new DatumInterval(Objects.requireNonNull(INTERVALValue.getValue()));
+            case TIMESTAMP:
+                org.partiql.value.TimestampValue TIMESTAMPValue = (org.partiql.value.TimestampValue) value;
+                return new DatumTimestamp(Objects.requireNonNull(TIMESTAMPValue.getValue()));
+            case TIME:
+                org.partiql.value.TimeValue TIMEValue = (org.partiql.value.TimeValue) value;
+                return new DatumTime(Objects.requireNonNull(TIMEValue.getValue()));
+            case FLOAT32:
+                org.partiql.value.Float32Value FLOAT32Value = (org.partiql.value.Float32Value) value;
+                return new DatumFloat(Objects.requireNonNull(FLOAT32Value.getValue()));
+            case FLOAT64:
+                org.partiql.value.Float64Value FLOAT64Value = (org.partiql.value.Float64Value) value;
+                return new DatumDouble(Objects.requireNonNull(FLOAT64Value.getValue()));
+            case DECIMAL:
+            case DECIMAL_ARBITRARY:
+                org.partiql.value.DecimalValue DECIMALValue = (org.partiql.value.DecimalValue) value;
+                BigDecimal d = Objects.requireNonNull(DECIMALValue.getValue());
+                return Datum.decimal(d, d.precision(), d.scale());
+            case CHAR:
+                org.partiql.value.CharValue CHARValue = (org.partiql.value.CharValue) value;
+                String charString = Objects.requireNonNull(CHARValue.getValue()).toString();
+                return new DatumChars(charString, charString.length());
+            case SYMBOL:
+                throw new IllegalStateException("SYMBOL not supported.");
+            case CLOB:
+                org.partiql.value.ClobValue CLOBValue = (org.partiql.value.ClobValue) value;
+                return new DatumBytes(Objects.requireNonNull(CLOBValue.getValue()), PType.clob(Integer.MAX_VALUE)); // TODO
+            case BLOB:
+                org.partiql.value.BlobValue BLOBValue = (org.partiql.value.BlobValue) value;
+                return new DatumBytes(Objects.requireNonNull(BLOBValue.getValue()), PType.blob(Integer.MAX_VALUE)); // TODO
+            case BYTE:
+                throw new UnsupportedOperationException();
+            case ANY:
+            default:
+                throw new NotImplementedError();
+        }
+    }
+}
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/PQLToPartiQLIterable.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java
similarity index 91%
rename from partiql-spi/src/main/java/org/partiql/spi/value/PQLToPartiQLIterable.java
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java
index 16224d111..9a7355cf8 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/PQLToPartiQLIterable.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java
@@ -2,7 +2,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.partiql.value.PartiQLValue;
-
 import java.util.Iterator;
 
 class PQLToPartiQLIterable implements Iterable<PartiQLValue> {
@@ -26,7 +25,7 @@ public boolean hasNext() {
 
             @Override
             public PartiQLValue next() {
-                return iter.next().toPartiQLValue();
+                return DatumUtils.toPartiQLValue(iter.next());
             }
         };
     }
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/PQLToPartiQLStruct.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java
similarity index 89%
rename from partiql-spi/src/main/java/org/partiql/spi/value/PQLToPartiQLStruct.java
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java
index 18801eb7d..ea29f2d24 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/PQLToPartiQLStruct.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java
@@ -3,7 +3,6 @@
 import kotlin.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.partiql.value.PartiQLValue;
-
 import java.util.Iterator;
 
 class PQLToPartiQLStruct implements Iterable<Pair<String, PartiQLValue>> {
@@ -28,7 +27,7 @@ public boolean hasNext() {
             @Override
             public Pair<String, PartiQLValue> next() {
                 Field field = _fields.next();
-                return new Pair<>(field.getName(), field.getValue().toPartiQLValue());
+                return new Pair<>(field.getName(), DatumUtils.toPartiQLValue(field.getValue()));
             }
         };
     }
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/PartiQLToPQLIterable.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java
similarity index 95%
rename from partiql-spi/src/main/java/org/partiql/spi/value/PartiQLToPQLIterable.java
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java
index eb3d7cbfd..d835e9b4d 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/PartiQLToPQLIterable.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java
@@ -31,7 +31,7 @@ public boolean hasNext() {
         @Override
         public Datum next() {
             PartiQLValue value = _value.next();
-            return Datum.of(value);
+            return DatumUtils.toDatum(value);
         }
     }
 }
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/PartiQLToPQLStruct.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java
similarity index 95%
rename from partiql-spi/src/main/java/org/partiql/spi/value/PartiQLToPQLStruct.java
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java
index 6d7bcbff0..06613f8c8 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/PartiQLToPQLStruct.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java
@@ -42,7 +42,7 @@ public String getName() {
                 @NotNull
                 @Override
                 public Datum getValue() {
-                    return Datum.of(value.getSecond());
+                    return DatumUtils.toDatum(value.getSecond());
                 }
             };
         }
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonReader.kt b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueIonReader.kt
similarity index 99%
rename from partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonReader.kt
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueIonReader.kt
index 7c49b096c..cfc2b6a36 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonReader.kt
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueIonReader.kt
@@ -1,4 +1,4 @@
-package org.partiql.value.io
+package org.partiql.spi.value.io
 
 import com.amazon.ion.IonReader
 import com.amazon.ion.IonType
@@ -8,7 +8,6 @@ import com.amazon.ionelement.api.IonElement
 import org.partiql.value.DecimalValue
 import org.partiql.value.IntValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.PartiQLValueType
 import org.partiql.value.bagValue
 import org.partiql.value.blobValue
@@ -42,7 +41,6 @@ import java.math.BigDecimal
  * The reader will attempt to create a time value
  *
  */
-@OptIn(PartiQLValueExperimental::class)
 internal class PartiQLValueIonReader(
     private val ionReader: IonReader,
     private val sourceDataFormat: PartiQLValueIonReaderBuilder.SourceDataFormat
@@ -544,7 +542,6 @@ internal class PartiQLValueIonReader(
     }
 }
 
-@OptIn(PartiQLValueExperimental::class)
 public class PartiQLValueIonReaderBuilder private constructor(
     private var sourceDataFormat: SourceDataFormat = SourceDataFormat.IonForPartiQL,
     private var ionReaderBuilder: IonReaderBuilder,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonWriter.kt b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueIonWriter.kt
similarity index 90%
rename from partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonWriter.kt
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueIonWriter.kt
index b30900c4c..1a4fe4db7 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueIonWriter.kt
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueIonWriter.kt
@@ -1,15 +1,13 @@
-package org.partiql.value.io
+package org.partiql.spi.value.io
 
 import com.amazon.ion.IonWriter
 import com.amazon.ion.system.IonBinaryWriterBuilder
 import com.amazon.ion.system.IonTextWriterBuilder
 import com.amazon.ion.system.IonWriterBuilder
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.toIon
 import java.io.OutputStream
 
-@OptIn(PartiQLValueExperimental::class)
 public class PartiQLValueIonWriter internal constructor(
     private val ionWriter: IonWriter,
 ) : PartiQLValueWriter {
@@ -24,7 +22,6 @@ public class PartiQLValueIonWriter internal constructor(
     }
 }
 
-@OptIn(PartiQLValueExperimental::class)
 public class PartiQLValueIonWriterBuilder private constructor(
     private var ionWriterBuilder: IonWriterBuilder,
 ) {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueReader.kt b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueReader.kt
similarity index 88%
rename from partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueReader.kt
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueReader.kt
index 50eae0757..18d41e0e7 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueReader.kt
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueReader.kt
@@ -12,15 +12,13 @@
  * language governing permissions and limitations under the License.
  */
 
-package org.partiql.value.io
+package org.partiql.spi.value.io
 
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 
 /**
  * Basic PartiQLValueReader akin to java.io.Reader.
  */
-@PartiQLValueExperimental
 public interface PartiQLValueReader : AutoCloseable {
 
     /**
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueTextWriter.kt b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueTextWriter.kt
similarity index 98%
rename from partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueTextWriter.kt
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueTextWriter.kt
index 9ae8e49d0..3516e8d4d 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueTextWriter.kt
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueTextWriter.kt
@@ -12,7 +12,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package org.partiql.value.io
+package org.partiql.spi.value.io
 
 import org.partiql.value.BagValue
 import org.partiql.value.BoolValue
@@ -31,7 +31,6 @@ import org.partiql.value.ListValue
 import org.partiql.value.MissingValue
 import org.partiql.value.NullValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.SexpValue
 import org.partiql.value.StringValue
 import org.partiql.value.StructValue
@@ -55,7 +54,6 @@ import kotlin.math.abs
  * @property formatted  Print with newlines and indents
  * @property indent     Indent prefix, default is 2-spaces
  */
-@PartiQLValueExperimental
 public class PartiQLValueTextWriter(
     private val out: PrintStream,
     private val formatted: Boolean = true,
@@ -350,7 +348,6 @@ public class PartiQLValueTextWriter(
     }
 }
 
-@OptIn(PartiQLValueExperimental::class)
 public class PartiQLValueWriterBuilder private constructor() {
 
     private var formatted: Boolean = true
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueWriter.kt b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueWriter.kt
similarity index 89%
rename from partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueWriter.kt
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueWriter.kt
index 9d14e4d1f..7416f41d5 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/io/PartiQLValueWriter.kt
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/io/PartiQLValueWriter.kt
@@ -12,15 +12,13 @@
  * language governing permissions and limitations under the License.
  */
 
-package org.partiql.value.io
+package org.partiql.spi.value.io
 
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 
 /**
  * Basic PartiQLValue Writer akin to java.io.Writer.
  */
-@PartiQLValueExperimental
 public interface PartiQLValueWriter : AutoCloseable {
 
     /**
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQL.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQL.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/PartiQL.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQL.kt
index 2f951db0f..aac067829 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQL.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQL.kt
@@ -61,7 +61,6 @@ import java.util.BitSet
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun boolValue(
     value: Boolean?,
     annotations: Annotations = emptyList(),
@@ -75,7 +74,6 @@ public fun boolValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun int8Value(
     value: Byte?,
     annotations: Annotations = emptyList(),
@@ -89,7 +87,6 @@ public fun int8Value(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun int16Value(
     value: Short?,
     annotations: Annotations = emptyList(),
@@ -103,7 +100,6 @@ public fun int16Value(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun int32Value(
     value: Int?,
     annotations: Annotations = emptyList(),
@@ -117,7 +113,6 @@ public fun int32Value(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun int64Value(
     value: Long?,
     annotations: Annotations = emptyList(),
@@ -131,7 +126,6 @@ public fun int64Value(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun intValue(
     value: BigInteger?,
     annotations: Annotations = emptyList(),
@@ -145,7 +139,6 @@ public fun intValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun decimalValue(
     value: BigDecimal?,
     annotations: Annotations = emptyList(),
@@ -159,7 +152,6 @@ public fun decimalValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun float32Value(
     value: Float?,
     annotations: Annotations = emptyList(),
@@ -173,7 +165,6 @@ public fun float32Value(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun float64Value(
     value: Double?,
     annotations: Annotations = emptyList(),
@@ -187,7 +178,6 @@ public fun float64Value(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun charValue(
     value: Char?,
     annotations: Annotations = emptyList(),
@@ -201,7 +191,6 @@ public fun charValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun stringValue(
     value: String?,
     annotations: Annotations = emptyList(),
@@ -215,7 +204,6 @@ public fun stringValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun symbolValue(
     value: String?,
     annotations: Annotations = emptyList(),
@@ -229,7 +217,6 @@ public fun symbolValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun clobValue(
     value: ByteArray?,
     annotations: Annotations = emptyList(),
@@ -243,7 +230,6 @@ public fun clobValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun binaryValue(
     value: BitSet?,
     annotations: Annotations = emptyList(),
@@ -257,7 +243,6 @@ public fun binaryValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun byteValue(
     value: Byte?,
     annotations: Annotations = emptyList(),
@@ -271,7 +256,6 @@ public fun byteValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun blobValue(
     value: ByteArray?,
     annotations: Annotations = emptyList(),
@@ -285,7 +269,6 @@ public fun blobValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun dateValue(
     value: Date?,
     annotations: Annotations = emptyList(),
@@ -299,7 +282,6 @@ public fun dateValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun timeValue(
     value: Time?,
     annotations: Annotations = emptyList(),
@@ -313,7 +295,6 @@ public fun timeValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun timestampValue(
     value: Timestamp?,
     annotations: Annotations = emptyList(),
@@ -327,7 +308,6 @@ public fun timestampValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun intervalValue(
     value: Long?,
     annotations: Annotations = emptyList(),
@@ -342,7 +322,6 @@ public fun intervalValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> bagValue(
     elements: Iterable<T>?,
     annotations: Annotations = emptyList(),
@@ -357,7 +336,6 @@ public fun <T : PartiQLValue> bagValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> bagValue(
     vararg elements: T,
     annotations: Annotations = emptyList(),
@@ -372,7 +350,6 @@ public fun <T : PartiQLValue> bagValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> listValue(
     elements: Iterable<T>?,
     annotations: Annotations = emptyList(),
@@ -387,7 +364,6 @@ public fun <T : PartiQLValue> listValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> listValue(
     vararg elements: T,
     annotations: Annotations = emptyList(),
@@ -402,7 +378,6 @@ public fun <T : PartiQLValue> listValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> sexpValue(
     elements: Iterable<T>?,
     annotations: Annotations = emptyList(),
@@ -417,7 +392,6 @@ public fun <T : PartiQLValue> sexpValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> sexpValue(
     vararg elements: T,
     annotations: Annotations = emptyList(),
@@ -432,7 +406,6 @@ public fun <T : PartiQLValue> sexpValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> structValue(
     fields: Iterable<Pair<String, T>>?,
     annotations: Annotations = emptyList(),
@@ -447,7 +420,6 @@ public fun <T : PartiQLValue> structValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> structValue(
     vararg fields: Pair<String, T>,
     annotations: Annotations = emptyList(),
@@ -463,7 +435,6 @@ public fun <T : PartiQLValue> structValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> structValueMultiMap(
     fields: Map<String, Iterable<T>>?,
     annotations: Annotations = emptyList(),
@@ -479,7 +450,6 @@ public fun <T : PartiQLValue> structValueMultiMap(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun <T : PartiQLValue> structValueMap(
     fields: Map<String, T>?,
     annotations: Annotations = emptyList(),
@@ -492,7 +462,6 @@ public fun <T : PartiQLValue> structValueMap(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun nullValue(
     annotations: Annotations = emptyList(),
 ): NullValue = NullValueImpl(annotations.toPersistentList())
@@ -504,7 +473,6 @@ public fun nullValue(
  * @return
  */
 @JvmOverloads
-@PartiQLValueExperimental
 public fun missingValue(
     annotations: Annotations = emptyList(),
 ): MissingValue = MissingValueImpl(annotations.toPersistentList())
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValue.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValue.kt
similarity index 95%
rename from partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValue.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValue.kt
index 6be7e8fbe..dccb3e9dd 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValue.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValue.kt
@@ -25,14 +25,13 @@ import java.math.BigDecimal
 import java.math.BigInteger
 import java.util.BitSet
 
-internal typealias Annotations = List<String>
+public typealias Annotations = List<String>
 
 /**
  * TODO
  *  - Implement ANY
  *  - Implement comparators
  */
-@PartiQLValueExperimental
 public sealed interface PartiQLValue {
 
     public val type: PartiQLValueType
@@ -90,7 +89,6 @@ public sealed interface PartiQLValue {
     }
 }
 
-@PartiQLValueExperimental
 public sealed interface ScalarValue<T> : PartiQLValue {
 
     public val value: T?
@@ -105,7 +103,6 @@ public sealed interface ScalarValue<T> : PartiQLValue {
     override fun withoutAnnotations(): ScalarValue<T>
 }
 
-@PartiQLValueExperimental
 public sealed interface CollectionValue<T : PartiQLValue> : PartiQLValue, Iterable<T> {
 
     override val isNull: Boolean
@@ -119,7 +116,6 @@ public sealed interface CollectionValue<T : PartiQLValue> : PartiQLValue, Iterab
     override fun withoutAnnotations(): CollectionValue<T>
 }
 
-@PartiQLValueExperimental
 public abstract class BoolValue : ScalarValue<Boolean?> {
 
     override val type: PartiQLValueType = PartiQLValueType.BOOL
@@ -131,7 +127,6 @@ public abstract class BoolValue : ScalarValue<Boolean?> {
     abstract override fun withoutAnnotations(): BoolValue
 }
 
-@PartiQLValueExperimental
 public sealed class NumericValue<T : Number> : ScalarValue<T> {
 
     public abstract fun toInt8(): Int8Value
@@ -157,7 +152,6 @@ public sealed class NumericValue<T : Number> : ScalarValue<T> {
     abstract override fun withoutAnnotations(): NumericValue<T>
 }
 
-@PartiQLValueExperimental
 public abstract class Int8Value : NumericValue<Byte>() {
 
     override val type: PartiQLValueType = PartiQLValueType.INT8
@@ -169,7 +163,6 @@ public abstract class Int8Value : NumericValue<Byte>() {
     abstract override fun withoutAnnotations(): Int8Value
 }
 
-@PartiQLValueExperimental
 public abstract class Int16Value : NumericValue<Short>() {
 
     override val type: PartiQLValueType = PartiQLValueType.INT16
@@ -181,7 +174,6 @@ public abstract class Int16Value : NumericValue<Short>() {
     abstract override fun withoutAnnotations(): Int16Value
 }
 
-@PartiQLValueExperimental
 public abstract class Int32Value : NumericValue<Int>() {
 
     override val type: PartiQLValueType = PartiQLValueType.INT32
@@ -193,7 +185,6 @@ public abstract class Int32Value : NumericValue<Int>() {
     abstract override fun withoutAnnotations(): Int32Value
 }
 
-@PartiQLValueExperimental
 public abstract class Int64Value : NumericValue<Long>() {
 
     override val type: PartiQLValueType = PartiQLValueType.INT64
@@ -205,7 +196,6 @@ public abstract class Int64Value : NumericValue<Long>() {
     abstract override fun withoutAnnotations(): Int64Value
 }
 
-@PartiQLValueExperimental
 public abstract class IntValue : NumericValue<BigInteger>() {
 
     override val type: PartiQLValueType = PartiQLValueType.INT
@@ -217,7 +207,6 @@ public abstract class IntValue : NumericValue<BigInteger>() {
     abstract override fun withoutAnnotations(): IntValue
 }
 
-@PartiQLValueExperimental
 public abstract class DecimalValue : NumericValue<BigDecimal>() {
 
     override val type: PartiQLValueType = PartiQLValueType.DECIMAL
@@ -229,7 +218,6 @@ public abstract class DecimalValue : NumericValue<BigDecimal>() {
     abstract override fun withoutAnnotations(): DecimalValue
 }
 
-@PartiQLValueExperimental
 public abstract class Float32Value : NumericValue<Float>() {
 
     override val type: PartiQLValueType = PartiQLValueType.FLOAT32
@@ -241,7 +229,6 @@ public abstract class Float32Value : NumericValue<Float>() {
     abstract override fun withoutAnnotations(): Float32Value
 }
 
-@PartiQLValueExperimental
 public abstract class Float64Value : NumericValue<Double>() {
 
     override val type: PartiQLValueType = PartiQLValueType.FLOAT64
@@ -253,7 +240,6 @@ public abstract class Float64Value : NumericValue<Double>() {
     abstract override fun withoutAnnotations(): Float64Value
 }
 
-@PartiQLValueExperimental
 public sealed class TextValue<T> : ScalarValue<T> {
 
     public abstract val string: String?
@@ -265,7 +251,6 @@ public sealed class TextValue<T> : ScalarValue<T> {
     abstract override fun withoutAnnotations(): TextValue<T>
 }
 
-@PartiQLValueExperimental
 public abstract class CharValue : TextValue<Char>() {
 
     override val type: PartiQLValueType = PartiQLValueType.CHAR
@@ -280,7 +265,6 @@ public abstract class CharValue : TextValue<Char>() {
     abstract override fun withoutAnnotations(): CharValue
 }
 
-@PartiQLValueExperimental
 public abstract class StringValue : TextValue<String>() {
 
     override val type: PartiQLValueType = PartiQLValueType.STRING
@@ -295,7 +279,6 @@ public abstract class StringValue : TextValue<String>() {
     abstract override fun withoutAnnotations(): StringValue
 }
 
-@PartiQLValueExperimental
 public abstract class SymbolValue : TextValue<String>() {
 
     override val type: PartiQLValueType = PartiQLValueType.SYMBOL
@@ -310,7 +293,6 @@ public abstract class SymbolValue : TextValue<String>() {
     abstract override fun withoutAnnotations(): SymbolValue
 }
 
-@PartiQLValueExperimental
 public abstract class ClobValue : ScalarValue<ByteArray> {
 
     override val type: PartiQLValueType = PartiQLValueType.CLOB
@@ -322,7 +304,6 @@ public abstract class ClobValue : ScalarValue<ByteArray> {
     abstract override fun withoutAnnotations(): ClobValue
 }
 
-@PartiQLValueExperimental
 public abstract class BinaryValue : ScalarValue<BitSet> {
 
     override val type: PartiQLValueType = PartiQLValueType.BINARY
@@ -334,7 +315,6 @@ public abstract class BinaryValue : ScalarValue<BitSet> {
     abstract override fun withoutAnnotations(): BinaryValue
 }
 
-@PartiQLValueExperimental
 public abstract class ByteValue : ScalarValue<Byte> {
 
     override val type: PartiQLValueType = PartiQLValueType.BYTE
@@ -346,7 +326,6 @@ public abstract class ByteValue : ScalarValue<Byte> {
     abstract override fun withoutAnnotations(): ByteValue
 }
 
-@PartiQLValueExperimental
 public abstract class BlobValue : ScalarValue<ByteArray> {
 
     override val type: PartiQLValueType = PartiQLValueType.BLOB
@@ -358,7 +337,6 @@ public abstract class BlobValue : ScalarValue<ByteArray> {
     abstract override fun withoutAnnotations(): BlobValue
 }
 
-@PartiQLValueExperimental
 public abstract class DateValue : ScalarValue<Date> {
 
     override val type: PartiQLValueType = PartiQLValueType.DATE
@@ -370,7 +348,6 @@ public abstract class DateValue : ScalarValue<Date> {
     abstract override fun withoutAnnotations(): DateValue
 }
 
-@PartiQLValueExperimental
 public abstract class TimeValue : ScalarValue<Time> {
 
     override val type: PartiQLValueType = PartiQLValueType.TIME
@@ -382,7 +359,6 @@ public abstract class TimeValue : ScalarValue<Time> {
     abstract override fun withoutAnnotations(): TimeValue
 }
 
-@PartiQLValueExperimental
 public abstract class TimestampValue : ScalarValue<Timestamp> {
 
     override val type: PartiQLValueType = PartiQLValueType.TIMESTAMP
@@ -394,7 +370,6 @@ public abstract class TimestampValue : ScalarValue<Timestamp> {
     abstract override fun withoutAnnotations(): TimestampValue
 }
 
-@PartiQLValueExperimental
 public abstract class IntervalValue : ScalarValue<Long> {
 
     override val type: PartiQLValueType = PartiQLValueType.INTERVAL
@@ -406,7 +381,6 @@ public abstract class IntervalValue : ScalarValue<Long> {
     abstract override fun withoutAnnotations(): IntervalValue
 }
 
-@PartiQLValueExperimental
 public abstract class BagValue<T : PartiQLValue> : CollectionValue<T> {
 
     override val type: PartiQLValueType = PartiQLValueType.BAG
@@ -440,7 +414,6 @@ public abstract class BagValue<T : PartiQLValue> : CollectionValue<T> {
     }
 }
 
-@PartiQLValueExperimental
 public abstract class ListValue<T : PartiQLValue> : CollectionValue<T> {
 
     override val type: PartiQLValueType = PartiQLValueType.LIST
@@ -472,7 +445,6 @@ public abstract class ListValue<T : PartiQLValue> : CollectionValue<T> {
     }
 }
 
-@PartiQLValueExperimental
 public abstract class SexpValue<T : PartiQLValue> : CollectionValue<T> {
 
     override val type: PartiQLValueType = PartiQLValueType.SEXP
@@ -503,7 +475,6 @@ public abstract class SexpValue<T : PartiQLValue> : CollectionValue<T> {
     }
 }
 
-@PartiQLValueExperimental
 public abstract class StructValue<T : PartiQLValue> : PartiQLValue {
 
     override val type: PartiQLValueType = PartiQLValueType.STRUCT
@@ -571,7 +542,6 @@ public abstract class StructValue<T : PartiQLValue> : PartiQLValue {
     }
 }
 
-@PartiQLValueExperimental
 public abstract class NullValue : PartiQLValue {
 
     override val type: PartiQLValueType = PartiQLValueType.NULL
@@ -587,7 +557,6 @@ public abstract class NullValue : PartiQLValue {
     abstract override fun withoutAnnotations(): NullValue
 }
 
-@PartiQLValueExperimental
 public abstract class MissingValue : PartiQLValue {
 
     override val type: PartiQLValueType = PartiQLValueType.MISSING
@@ -601,10 +570,8 @@ public abstract class MissingValue : PartiQLValue {
     abstract override fun withoutAnnotations(): MissingValue
 }
 
-@PartiQLValueExperimental
 public fun PartiQLValue.toIon(): IonElement = accept(ToIon, Unit)
 
-@PartiQLValueExperimental
 @Throws(TypeCheckException::class)
 public inline fun <reified T : PartiQLValue> PartiQLValue.check(): T {
     if (this is T) return this else throw TypeCheckException("Expected ${T::class.java} but received $this.")
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt
similarity index 99%
rename from partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt
index 474c0d4ce..9b6a2e85a 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValueComparatorInternal.kt
@@ -6,7 +6,6 @@ import org.partiql.value.util.isNegInf
 import org.partiql.value.util.isPosInf
 import org.partiql.value.util.isZero
 
-@OptIn(PartiQLValueExperimental::class)
 internal class PartiQLValueComparatorInternal(private val nullsFirst: Boolean) : Comparator<PartiQLValue> {
     companion object {
         private const val EQUAL = 0
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueType.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValueType.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueType.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValueType.kt
index 770712958..1d1823dd1 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/PartiQLValueType.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/PartiQLValueType.kt
@@ -18,7 +18,6 @@ import org.partiql.types.PType
 /**
  * PartiQL Type Names
  */
-@PartiQLValueExperimental
 public enum class PartiQLValueType {
     ANY,
     BOOL,
@@ -62,7 +61,7 @@ public enum class PartiQLValueType {
     MISSING;
 
     /**
-     * @return a corresponding PType from a [PartiQLValueType]
+     * @return a corresponding PType.
      */
     @Deprecated(
         """this API is experimental and is subject to modification/deletion without prior notice. This is
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/helpers/ToIon.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/helpers/ToIon.kt
similarity index 99%
rename from partiql-spi/src/main/kotlin/org/partiql/value/helpers/ToIon.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/helpers/ToIon.kt
index e46330a1e..00cf9678d 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/helpers/ToIon.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/helpers/ToIon.kt
@@ -38,7 +38,6 @@ import org.partiql.value.ListValue
 import org.partiql.value.MissingValue
 import org.partiql.value.NullValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.SexpValue
 import org.partiql.value.StringValue
 import org.partiql.value.StructValue
@@ -50,7 +49,6 @@ import org.partiql.value.datetime.TimestampWithTimeZone
 import org.partiql.value.datetime.TimestampWithoutTimeZone
 import org.partiql.value.util.PartiQLValueBaseVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal object ToIon : PartiQLValueBaseVisitor<IonElement, Unit>() {
 
     const val MISSING_ANNOTATION = "\$missing"
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Annotations.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Annotations.kt
similarity index 86%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Annotations.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Annotations.kt
index 218b0bdd5..ba74351dd 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Annotations.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Annotations.kt
@@ -1,5 +1,3 @@
-@file:OptIn(PartiQLValueExperimental::class)
-
 /*
  * Copyright Amazon.com, Inc. or its affiliates.  All rights reserved.
  *
@@ -18,9 +16,7 @@ package org.partiql.value.impl
 
 import org.partiql.value.Annotations
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 
-@OptIn(PartiQLValueExperimental::class)
 @Suppress("FunctionName")
 internal inline fun <reified T : PartiQLValue> T._withAnnotations(annotations: Annotations): T =
     when {
@@ -28,7 +24,6 @@ internal inline fun <reified T : PartiQLValue> T._withAnnotations(annotations: A
         else -> copy(annotations = this.annotations.plus(annotations)) as T
     }
 
-@OptIn(PartiQLValueExperimental::class)
 @Suppress("FunctionName")
 internal inline fun <reified T : PartiQLValue> T._withoutAnnotations(): T =
     when {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BagValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BagValueImpl.kt
similarity index 95%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/BagValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BagValueImpl.kt
index f76f66506..5f21c90bc 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BagValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BagValueImpl.kt
@@ -19,10 +19,8 @@ import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.BagValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal class BagValueImpl<T : PartiQLValue>(
     private val delegate: Iterable<T>?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BinaryValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BinaryValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/BinaryValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BinaryValueImpl.kt
index ac8a5e668..52085e01a 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BinaryValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BinaryValueImpl.kt
@@ -18,11 +18,9 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.BinaryValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 import java.util.BitSet
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class BinaryValueImpl(
     override val value: BitSet?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BlobValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BlobValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/BlobValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BlobValueImpl.kt
index e8acd1a43..617b8a662 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BlobValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BlobValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.BlobValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class BlobValueImpl(
     override val value: ByteArray?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BoolValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BoolValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/BoolValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BoolValueImpl.kt
index 183622157..0369c1395 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/BoolValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/BoolValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.BoolValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class BoolValueImpl(
     override val value: Boolean?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/ByteValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ByteValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/ByteValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ByteValueImpl.kt
index d481d3a9b..a83a40f5e 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/ByteValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ByteValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.ByteValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class ByteValueImpl(
     override val value: Byte?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/CharValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/CharValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/CharValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/CharValueImpl.kt
index a1842df7c..9338d2fbd 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/CharValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/CharValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.CharValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class CharValueImpl(
     override val value: Char?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/ClobValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ClobValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/ClobValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ClobValueImpl.kt
index 0a99270e8..5f2a93ab5 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/ClobValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ClobValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.ClobValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class ClobValueImpl(
     override val value: ByteArray?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/DateValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/DateValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/DateValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/DateValueImpl.kt
index 00bbd284c..cd4bd85fd 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/DateValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/DateValueImpl.kt
@@ -18,11 +18,9 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.DateValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.datetime.Date
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class DateValueImpl(
     override val value: Date?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/DecimalValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/DecimalValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/DecimalValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/DecimalValueImpl.kt
index 62784fb43..c2e634e47 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/DecimalValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/DecimalValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.float32Value
 import org.partiql.value.float64Value
 import org.partiql.value.int16Value
@@ -38,7 +37,6 @@ import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigDecimal
 import java.math.RoundingMode
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class DecimalValueImpl(
     override val value: BigDecimal?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Float32ValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Float32ValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Float32ValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Float32ValueImpl.kt
index 250222303..d8e280fe7 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Float32ValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Float32ValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.decimalValue
 import org.partiql.value.float64Value
 import org.partiql.value.int16Value
@@ -37,7 +36,6 @@ import org.partiql.value.intValue
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigDecimal
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class Float32ValueImpl(
     override val value: Float?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Float64ValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Float64ValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Float64ValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Float64ValueImpl.kt
index 6d40fd213..c13e2f24b 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Float64ValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Float64ValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.decimalValue
 import org.partiql.value.float32Value
 import org.partiql.value.int16Value
@@ -37,7 +36,6 @@ import org.partiql.value.intValue
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigDecimal
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class Float64ValueImpl(
     override val value: Double?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int16ValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int16ValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Int16ValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int16ValueImpl.kt
index 56e4510d0..73abcb979 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int16ValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int16ValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.datetime.DateTimeUtil.toBigDecimal
 import org.partiql.value.decimalValue
 import org.partiql.value.float32Value
@@ -38,7 +37,6 @@ import org.partiql.value.intValue
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigInteger
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class Int16ValueImpl(
     override val value: Short?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int32ValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int32ValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Int32ValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int32ValueImpl.kt
index c6fce319f..f917dfabf 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int32ValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int32ValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.datetime.DateTimeUtil.toBigDecimal
 import org.partiql.value.decimalValue
 import org.partiql.value.float32Value
@@ -38,7 +37,6 @@ import org.partiql.value.intValue
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigInteger
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class Int32ValueImpl(
     override val value: Int?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int64ValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int64ValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Int64ValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int64ValueImpl.kt
index 63a4c8458..a0a33615a 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int64ValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int64ValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.datetime.DateTimeUtil.toBigDecimal
 import org.partiql.value.decimalValue
 import org.partiql.value.float32Value
@@ -38,7 +37,6 @@ import org.partiql.value.intValue
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigInteger
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class Int64ValueImpl(
     override val value: Long?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int8ValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int8ValueImpl.kt
similarity index 96%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/Int8ValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int8ValueImpl.kt
index 04baf8df4..533f24723 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/Int8ValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/Int8ValueImpl.kt
@@ -25,7 +25,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.datetime.DateTimeUtil.toBigDecimal
 import org.partiql.value.decimalValue
 import org.partiql.value.float32Value
@@ -37,7 +36,6 @@ import org.partiql.value.intValue
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigInteger
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class Int8ValueImpl(
     override val value: Byte?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/IntValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/IntValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/IntValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/IntValueImpl.kt
index 326569501..572f43361 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/IntValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/IntValueImpl.kt
@@ -26,7 +26,6 @@ import org.partiql.value.Int32Value
 import org.partiql.value.Int64Value
 import org.partiql.value.Int8Value
 import org.partiql.value.IntValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.decimalValue
 import org.partiql.value.float32Value
 import org.partiql.value.float64Value
@@ -37,7 +36,6 @@ import org.partiql.value.int8Value
 import org.partiql.value.util.PartiQLValueVisitor
 import java.math.BigInteger
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class IntValueImpl(
     override val value: BigInteger?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/IntervalValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/IntervalValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/IntervalValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/IntervalValueImpl.kt
index 998da276a..543c24162 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/IntervalValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/IntervalValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.IntervalValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class IntervalValueImpl(
     override val value: Long?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/ListValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ListValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/ListValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ListValueImpl.kt
index 304dadae3..8a3b1eca6 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/ListValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/ListValueImpl.kt
@@ -19,10 +19,8 @@ import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.ListValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal class ListValueImpl<T : PartiQLValue>(
     private val delegate: Iterable<T>?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/MissingValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/MissingValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/MissingValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/MissingValueImpl.kt
index 75c293cce..35edf362d 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/MissingValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/MissingValueImpl.kt
@@ -18,10 +18,8 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.MissingValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class MissingValueImpl(
     override val annotations: PersistentList<String>,
 ) : MissingValue() {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/NullValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/NullValueImpl.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/NullValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/NullValueImpl.kt
index eb83eafe1..e54e96420 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/NullValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/NullValueImpl.kt
@@ -19,7 +19,6 @@ import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.NullValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.PartiQLValueType
 import org.partiql.value.bagValue
 import org.partiql.value.binaryValue
@@ -47,7 +46,6 @@ import org.partiql.value.timeValue
 import org.partiql.value.timestampValue
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class NullValueImpl(
     override val annotations: PersistentList<String>,
 ) : NullValue() {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/SexpValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/SexpValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/SexpValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/SexpValueImpl.kt
index c477dca3f..4170cbc3f 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/SexpValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/SexpValueImpl.kt
@@ -18,11 +18,9 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.SexpValue
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal class SexpValueImpl<T : PartiQLValue>(
     private val delegate: Iterable<T>?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/StringValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/StringValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/StringValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/StringValueImpl.kt
index 884ad85e9..0d0d9e0cd 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/StringValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/StringValueImpl.kt
@@ -17,11 +17,9 @@ package org.partiql.value.impl
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.StringValue
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class StringValueImpl(
     override val value: String?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/StructValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/StructValueImpl.kt
similarity index 96%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/StructValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/StructValueImpl.kt
index 4605dbba6..8c39383ff 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/StructValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/StructValueImpl.kt
@@ -18,7 +18,6 @@ import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.StructValue
 import org.partiql.value.util.PartiQLValueVisitor
 
@@ -29,7 +28,6 @@ import org.partiql.value.util.PartiQLValueVisitor
  * @property delegate
  * @property annotations
  */
-@OptIn(PartiQLValueExperimental::class)
 internal class IterableStructValueImpl<T : PartiQLValue>(
     private val delegate: Iterable<Pair<String, T>>?,
     override val annotations: PersistentList<String>,
@@ -82,7 +80,6 @@ internal class IterableStructValueImpl<T : PartiQLValue>(
  * @property delegate
  * @property annotations
  */
-@OptIn(PartiQLValueExperimental::class)
 internal class MultiMapStructValueImpl<T : PartiQLValue>(
     private val delegate: Map<String, Iterable<T>>?,
     override val annotations: PersistentList<String>,
@@ -122,7 +119,6 @@ internal class MultiMapStructValueImpl<T : PartiQLValue>(
  * @property delegate
  * @property annotations
  */
-@OptIn(PartiQLValueExperimental::class)
 internal class MapStructValueImpl<T : PartiQLValue>(
     private val delegate: Map<String, T>?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/SymbolValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/SymbolValueImpl.kt
similarity index 93%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/SymbolValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/SymbolValueImpl.kt
index 13519f9a0..bbc450090 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/SymbolValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/SymbolValueImpl.kt
@@ -17,11 +17,9 @@ package org.partiql.value.impl
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.SymbolValue
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class SymbolValueImpl(
     override val value: String?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/TimeValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/TimeValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/TimeValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/TimeValueImpl.kt
index deea06c85..c80e27168 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/TimeValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/TimeValueImpl.kt
@@ -17,12 +17,10 @@ package org.partiql.value.impl
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.TimeValue
 import org.partiql.value.datetime.Time
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class TimeValueImpl(
     override val value: Time?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/impl/TimestampValueImpl.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/TimestampValueImpl.kt
similarity index 94%
rename from partiql-spi/src/main/kotlin/org/partiql/value/impl/TimestampValueImpl.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/TimestampValueImpl.kt
index f85968c97..70b1328d4 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/impl/TimestampValueImpl.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/impl/TimestampValueImpl.kt
@@ -17,12 +17,10 @@ package org.partiql.value.impl
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 import org.partiql.value.Annotations
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.TimestampValue
 import org.partiql.value.datetime.Timestamp
 import org.partiql.value.util.PartiQLValueVisitor
 
-@OptIn(PartiQLValueExperimental::class)
 internal data class TimestampValueImpl(
     override val value: Timestamp?,
     override val annotations: PersistentList<String>,
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt
similarity index 98%
rename from partiql-spi/src/main/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt
index 41e4bdba1..b8e3ef114 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/util/PartiQLValueBaseVisitor.kt
@@ -37,7 +37,6 @@ import org.partiql.value.MissingValue
 import org.partiql.value.NullValue
 import org.partiql.value.NumericValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.ScalarValue
 import org.partiql.value.SexpValue
 import org.partiql.value.StringValue
@@ -47,7 +46,6 @@ import org.partiql.value.TextValue
 import org.partiql.value.TimeValue
 import org.partiql.value.TimestampValue
 
-@PartiQLValueExperimental
 public abstract class PartiQLValueBaseVisitor<R, C> : PartiQLValueVisitor<R, C> {
 
     public open fun defaultVisit(v: PartiQLValue, ctx: C): R {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt
similarity index 97%
rename from partiql-spi/src/main/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt
rename to partiql-spi/src/testFixtures/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt
index da408e4cb..0cf19121d 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt
+++ b/partiql-spi/src/testFixtures/kotlin/org/partiql/value/util/PartiQLValueVisitor.kt
@@ -37,7 +37,6 @@ import org.partiql.value.MissingValue
 import org.partiql.value.NullValue
 import org.partiql.value.NumericValue
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.ScalarValue
 import org.partiql.value.SexpValue
 import org.partiql.value.StringValue
@@ -47,7 +46,6 @@ import org.partiql.value.TextValue
 import org.partiql.value.TimeValue
 import org.partiql.value.TimestampValue
 
-@PartiQLValueExperimental
 public interface PartiQLValueVisitor<R, C> {
 
     public fun visit(v: PartiQLValue, ctx: C): R
diff --git a/partiql-types/api/partiql-types.api b/partiql-types/api/partiql-types.api
index 27e71076c..cc285661a 100644
--- a/partiql-types/api/partiql-types.api
+++ b/partiql-types/api/partiql-types.api
@@ -62,6 +62,7 @@ public abstract class org/partiql/types/PType : org/partiql/types/Enum {
 	public static fun integer ()Lorg/partiql/types/PType;
 	public fun name ()Ljava/lang/String;
 	public static fun numeric (II)Lorg/partiql/types/PType;
+	public static fun of (I)Lorg/partiql/types/PType;
 	public static fun real ()Lorg/partiql/types/PType;
 	public static fun row (Ljava/util/Collection;)Lorg/partiql/types/PType;
 	public static fun row ([Lorg/partiql/types/Field;)Lorg/partiql/types/PType;
diff --git a/partiql-types/src/main/java/org/partiql/types/PType.java b/partiql-types/src/main/java/org/partiql/types/PType.java
index afc74138a..e786441f4 100644
--- a/partiql-types/src/main/java/org/partiql/types/PType.java
+++ b/partiql-types/src/main/java/org/partiql/types/PType.java
@@ -722,4 +722,70 @@ public static PType unknown() {
     public static PType variant(String encoding) {
         return new PTypeVariant(encoding);
     }
+
+    /**
+     * @param code PartiQL type code
+     * @return the PartiQL type corresponding with the code; if the type is parameterized, then the returned type will
+     * contain the default parameters
+     * @throws IllegalArgumentException if the code is not recognized
+     */
+    @NotNull
+    public static PType of(int code) throws IllegalArgumentException {
+        switch (code) {
+            case DYNAMIC:
+                return dynamic();
+            case BOOL:
+                return bool();
+            case TINYINT:
+                return tinyint();
+            case SMALLINT:
+                return smallint();
+            case INTEGER:
+                return integer();
+            case BIGINT:
+                return bigint();
+            case NUMERIC:
+                return numeric(38, 0);
+            case DECIMAL:
+                return decimal(38, 0);
+            case REAL:
+                return real();
+            case DOUBLE:
+                return doublePrecision();
+            case CHAR:
+                return character(1);
+            case VARCHAR:
+                return varchar(1);
+            case STRING:
+                return string();
+            case CLOB:
+                return clob(Integer.MAX_VALUE);
+            case BLOB:
+                return blob(Integer.MAX_VALUE);
+            case DATE:
+                return date();
+            case TIME:
+                return time(6);
+            case TIMEZ:
+                return timez(6);
+            case TIMESTAMP:
+                return timestamp(6);
+            case TIMESTAMPZ:
+                return timestampz(6);
+            case ARRAY:
+                return array();
+            case BAG:
+                return bag();
+            case ROW:
+                return row();
+            case STRUCT:
+                return struct();
+            case UNKNOWN:
+                return unknown();
+            case VARIANT:
+                return variant("ion");
+            default:
+                throw new IllegalArgumentException("Unknown type code: " + code);
+        }
+    }
 }
diff --git a/test/partiql-randomized-tests/build.gradle b/test/partiql-randomized-tests/build.gradle
index dba6bb42c..1dad9f0af 100644
--- a/test/partiql-randomized-tests/build.gradle
+++ b/test/partiql-randomized-tests/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     testImplementation project(':partiql-parser')
     testImplementation project(':partiql-plan')
     testImplementation project(':partiql-planner')
+    testImplementation testFixtures(project(":partiql-spi"))
 
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
     testImplementation 'pl.pragmatists:JUnitParams:[1.0.0,1.1.0)'
diff --git a/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt b/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt
index 432b7531a..4eda2b944 100644
--- a/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt
+++ b/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt
@@ -6,11 +6,10 @@ import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Session
 import org.partiql.spi.value.Datum
+import org.partiql.spi.value.DatumUtils
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import kotlin.test.assertEquals
 
-@OptIn(PartiQLValueExperimental::class)
 fun runEvaluatorTestCase(
     query: String,
     expectedResult: String
@@ -20,7 +19,6 @@ fun runEvaluatorTestCase(
     assertEquals(expected, result)
 }
 
-@OptIn(PartiQLValueExperimental::class)
 private fun execute(query: String): PartiQLValue {
     val parser = PartiQLParser.builder().build()
     val planner = PartiQLPlanner.builder().build()
@@ -39,9 +37,8 @@ private fun execute(query: String): PartiQLValue {
     // return (compiled.execute(session) as PartiQLResult.Value).value
 }
 
-@OptIn(PartiQLValueExperimental::class)
 fun assertExpression(query: String, value: () -> Datum) {
-    val expected = value.invoke().toPartiQLValue() // TODO: Make the PartiQL Engine return a Datum, not PartiQL Value
+    val expected = DatumUtils.toPartiQLValue(value.invoke()) // TODO: Make the PartiQL Engine return a Datum, not PartiQL Value
     val result = execute(query)
     assertEquals(expected, result)
 }
diff --git a/test/partiql-tests-runner/build.gradle.kts b/test/partiql-tests-runner/build.gradle.kts
index 0755f4ccc..f9b89eed5 100644
--- a/test/partiql-tests-runner/build.gradle.kts
+++ b/test/partiql-tests-runner/build.gradle.kts
@@ -29,6 +29,7 @@ dependencies {
     testImplementation(project(":partiql-eval"))
     testImplementation(project(":partiql-parser", configuration = "shadow"))
     testImplementation(project(":partiql-planner"))
+    testImplementation(testFixtures(project(":partiql-spi")))
 }
 
 val tests = System.getenv()["PARTIQL_TESTS_DATA"] ?: "../partiql-tests/partiql-tests-data"
diff --git a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
index b28415ec0..768ca7298 100644
--- a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
+++ b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
@@ -26,9 +26,9 @@ import org.partiql.spi.errors.PErrorException
 import org.partiql.spi.errors.PErrorListener
 import org.partiql.spi.errors.Severity
 import org.partiql.spi.value.Datum
+import org.partiql.spi.value.DatumUtils
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.io.DatumIonReaderBuilder
 import org.partiql.value.toIon
 import kotlin.test.assertEquals
@@ -37,7 +37,6 @@ import kotlin.test.assertEquals
  * @property session
  * @property mode
  */
-@OptIn(PartiQLValueExperimental::class)
 class EvalExecutor(
     private val session: Session,
     private val mode: Mode,
@@ -94,13 +93,13 @@ class EvalExecutor(
     }
 
     override fun toIon(value: Datum): IonValue {
-        val partiql = value.toPartiQLValue()
+        val partiql = DatumUtils.toPartiQLValue(value)
         return partiql.toIon().toIonValue(ION)
     }
 
     // TODO: Use DATUM
     override fun compare(actual: Datum, expect: Datum): Boolean {
-        return valueComparison(actual.toPartiQLValue(), expect.toPartiQLValue())
+        return valueComparison(DatumUtils.toPartiQLValue(actual), DatumUtils.toPartiQLValue(expect))
     }
 
     // Value comparison of PartiQL Value that utilized Ion Hashcode.
diff --git a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/util/ValueEquals.kt b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/util/ValueEquals.kt
index cb644abeb..2277d95c2 100644
--- a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/util/ValueEquals.kt
+++ b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/util/ValueEquals.kt
@@ -1,7 +1,6 @@
 package org.partiql.runner.util
 
 import org.partiql.value.PartiQLValue
-import org.partiql.value.PartiQLValueExperimental
 
 /**
  * Different methods for asserting value equality. The legacy comparator needed to compared on lowered IonValue but
@@ -15,7 +14,6 @@ interface ValueEquals<T> {
 
     companion object {
 
-        @OptIn(PartiQLValueExperimental::class)
         @JvmStatic
         val partiql: ValueEquals<PartiQLValue> = PartiQLValueEquals
     }
@@ -24,7 +22,6 @@ interface ValueEquals<T> {
 /**
  * Value equality using the [PartiQLValue] equality implementation.
  */
-@OptIn(PartiQLValueExperimental::class)
 private object PartiQLValueEquals : ValueEquals<PartiQLValue> {
     override fun equals(left: PartiQLValue, right: PartiQLValue) = left.equals(right)
 }

From f70aa7a9169346183c511047d7f5ea368a39f960 Mon Sep 17 00:00:00 2001
From: John Ed Quinn <johqunn@amazon.com>
Date: Wed, 11 Dec 2024 10:51:26 -0800
Subject: [PATCH 2/4] Adds full support for the VARIANT type

Fixes conformance tests related to the lack of a VARIANT type.
---
 .../eval/internal/helpers/ValueUtility.kt     |  35 +++-
 .../internal/operator/rel/RelOpIterate.kt     |   7 +-
 .../operator/rel/RelOpIteratePermissive.kt    |   7 +-
 .../eval/internal/operator/rel/RelOpScan.kt   |  12 +-
 .../operator/rel/RelOpScanPermissive.kt       |   9 +-
 .../internal/operator/rel/RelOpUnpivot.kt     |  16 +-
 .../eval/internal/operator/rex/CastTable.kt   |   4 +
 .../internal/operator/rex/ExprCallDynamic.kt  |   9 +-
 .../operator/rex/ExprStructPermissive.kt      |   1 +
 .../partiql/planner/internal/FnResolver.kt    |   2 +-
 .../planner/internal/casts/CastTable.kt       |   5 +
 .../internal/transforms/RexConverter.kt       |   6 +-
 .../planner/internal/typer/PlanTyper.kt       |  14 +-
 .../partiql/planner/internal/typer/Scope.kt   |   1 +
 partiql-spi/api/partiql-spi.api               |   1 +
 .../java/org/partiql/spi/value/Datum.java     |  14 +-
 .../partiql/spi/value/DatumComparator.java    |  37 +++-
 .../java/org/partiql/spi/value/DatumTime.java |   4 +-
 .../org/partiql/spi/value/DatumTimestamp.java |   4 +-
 .../spi/function/builtins/DiadicOperator.kt   |   4 +-
 .../function/builtins/internal/Accumulator.kt |   8 +
 .../org/partiql/spi/value/ion/IonVariant.kt   | 158 +++++-------------
 .../org/partiql/spi/value/DatumUtils.java     |   3 +
 .../test/resources/config/eval/skip-eval.txt  |  16 --
 24 files changed, 203 insertions(+), 174 deletions(-)

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
index 7418616c0..48923c5e3 100644
--- 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
@@ -15,7 +15,13 @@ internal object ValueUtility {
      */
     @JvmStatic
     fun Datum.isTrue(): Boolean {
-        return this.type.code() == PType.BOOL && !this.isNull && !this.isMissing && this.boolean
+        if (this.isNull || this.isMissing) {
+            return false
+        }
+        if (this.type.code() == PType.VARIANT) {
+            return this.lower().isTrue()
+        }
+        return this.type.code() == PType.BOOL && this.boolean
     }
 
     /**
@@ -29,6 +35,9 @@ internal object ValueUtility {
         if (this.type == type) {
             return this
         }
+        if (this.type.code() == PType.VARIANT) {
+            return this.lower().check(type)
+        }
         if (!this.isNull) {
             throw TypeCheckException("Expected type $type but received ${this.type}.")
         }
@@ -43,29 +52,42 @@ internal object ValueUtility {
      */
     fun Datum.getText(): String {
         return when (this.type.code()) {
+            PType.VARIANT -> this.lower().getText()
             PType.STRING, PType.CHAR -> this.string
             else -> throw TypeCheckException("Expected text, but received ${this.type}.")
         }
     }
 
     /**
-     * Takes in a [Datum] that is any integer type ([PartiQLValueType.INT8], [PartiQLValueType.INT8],
-     * [PartiQLValueType.INT8], [PartiQLValueType.INT8], [PartiQLValueType.INT8]) and returns the [BigInteger] (potentially
-     * coerced) that represents the integer.
+     * Converts all number values to [BigInteger]. If the number is [PType.DECIMAL] or [PType.NUMERIC], this asserts that
+     * the scale is zero.
      *
      * INTERNAL NOTE: The PLANNER should be handling the coercion. This function should not be necessary.
      *
+     * TODO: This is used specifically for LIMIT and OFFSET. This makes the conformance tests pass by coercing values
+     *  of type [PType.NUMERIC] and [PType.DECIMAL], but this is unspecified. Do we allow for LIMIT 2.0? Or of
+     *  a value that is greater than [PType.BIGINT]'s MAX value by using a [PType.DECIMAL] with a high precision and scale
+     *  of zero? This hasn't been decided, however, as the conformance tests allow for this, this function coerces
+     *  the value to a [BigInteger] regardless of the number's type.
+     *
      * @throws NullPointerException if the value is null
      * @throws TypeCheckException if type is not an integer type
      */
     fun Datum.getBigIntCoerced(): BigInteger {
         return when (this.type.code()) {
+            PType.VARIANT -> this.lower().getBigIntCoerced()
             PType.TINYINT -> this.byte.toInt().toBigInteger()
             PType.SMALLINT -> this.short.toInt().toBigInteger()
             PType.INTEGER -> this.int.toBigInteger()
             PType.BIGINT -> this.long.toBigInteger()
-            PType.NUMERIC -> this.bigInteger
-            else -> throw TypeCheckException()
+            PType.NUMERIC, PType.DECIMAL -> {
+                val decimal = this.bigDecimal
+                if (decimal.scale() != 0) {
+                    throw TypeCheckException("Expected integer, but received decimal.")
+                }
+                return decimal.toBigInteger()
+            }
+            else -> throw TypeCheckException("Type: ${this.type}")
         }
     }
 
@@ -82,6 +104,7 @@ internal object ValueUtility {
      */
     fun Datum.getInt32Coerced(): Int {
         return when (this.type.code()) {
+            PType.VARIANT -> this.lower().getInt32Coerced()
             PType.TINYINT -> this.byte.toInt()
             PType.SMALLINT -> this.short.toInt()
             PType.INTEGER -> this.int
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
index d72e3fe87..b99aecb3d 100644
--- 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
@@ -18,7 +18,12 @@ internal class RelOpIterate(
     override fun open(env: Environment) {
         val r = expr.eval(env.push(Row()))
         index = 0
-        iterator = when (r.type.code()) {
+        iterator = records(r)
+    }
+
+    private fun records(r: Datum): Iterator<Datum> {
+        return when (r.type.code()) {
+            PType.VARIANT -> records(r.lower())
             PType.BAG -> {
                 close()
                 throw TypeCheckException()
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
index ef4d7998f..1f5b5d32b 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
@@ -18,7 +18,12 @@ internal class RelOpIteratePermissive(
     override fun open(env: Environment) {
         val r = expr.eval(env.push(Row()))
         index = 0
-        iterator = when (r.type.code()) {
+        iterator = records(r)
+    }
+
+    private fun records(r: Datum): Iterator<Datum> {
+        return when (r.type.code()) {
+            PType.VARIANT -> records(r.lower())
             PType.BAG -> {
                 isIndexable = false
                 r.iterator()
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt
index 1ac7e74b6..dce1faf77 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt
@@ -6,6 +6,7 @@ import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
 import org.partiql.eval.internal.helpers.RecordValueIterator
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class RelOpScan(
@@ -16,11 +17,16 @@ internal class RelOpScan(
 
     override fun open(env: Environment) {
         val r = expr.eval(env.push(Row()))
-        records = when (r.type.code()) {
-            PType.ARRAY, PType.BAG -> RecordValueIterator(r.iterator())
+        records = r.records()
+    }
+
+    private fun Datum.records(): RecordValueIterator {
+        return when (this.type.code()) {
+            PType.VARIANT -> this.lower().records()
+            PType.ARRAY, PType.BAG -> RecordValueIterator(this.iterator())
             else -> {
                 close()
-                throw TypeCheckException("Unexpected type for scan: ${r.type}")
+                throw TypeCheckException("Unexpected type for scan: ${this.type}")
             }
         }
     }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt
index dfc9f7110..5a0597369 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt
@@ -5,6 +5,7 @@ import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
 import org.partiql.eval.internal.helpers.RecordValueIterator
+import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class RelOpScanPermissive(
@@ -15,7 +16,13 @@ internal class RelOpScanPermissive(
 
     override fun open(env: Environment) {
         val r = expr.eval(env.push(Row()))
-        records = when (r.type.code()) {
+        records = r.records()
+    }
+
+    private fun Datum.records(): Iterator<Row> {
+        val r = this
+        return when (type.code()) {
+            PType.VARIANT -> r.lower().records()
             PType.BAG, PType.ARRAY -> RecordValueIterator(r.iterator())
             else -> iterator { yield(Row(arrayOf(r))) }
         }
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
index 6c9c5b657..68cecaf48 100644
--- 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
@@ -58,7 +58,13 @@ internal sealed class RelOpUnpivot : ExprRelation {
     class Strict(private val expr: ExprValue) : RelOpUnpivot() {
 
         override fun struct(): Datum {
-            val v = expr.eval(env.push(Row()))
+            val v = expr.eval(env.push(Row())).let {
+                if (it.type.code() == PType.VARIANT) {
+                    it.lower()
+                } else {
+                    it
+                }
+            }
             if (v.type.code() != PType.STRUCT && v.type.code() != PType.ROW) {
                 throw TypeCheckException()
             }
@@ -78,7 +84,13 @@ internal sealed class RelOpUnpivot : ExprRelation {
     class Permissive(private val expr: ExprValue) : RelOpUnpivot() {
 
         override fun struct(): Datum {
-            val v = expr.eval(env.push(Row()))
+            val v = expr.eval(env.push(Row())).let {
+                if (it.type.code() == PType.VARIANT) {
+                    it.lower()
+                } else {
+                    it
+                }
+            }
             if (v.isMissing) {
                 return Datum.struct(emptyList())
             }
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
index a173d7ad9..76da4603a 100644
--- 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
@@ -29,6 +29,7 @@ import org.partiql.types.PType.TIMESTAMPZ
 import org.partiql.types.PType.TIMEZ
 import org.partiql.types.PType.TINYINT
 import org.partiql.types.PType.VARCHAR
+import org.partiql.types.PType.VARIANT
 import org.partiql.value.datetime.DateTimeValue
 import java.math.BigDecimal
 import java.math.BigInteger
@@ -70,6 +71,9 @@ internal object CastTable {
         if (target.code() == DYNAMIC) {
             return source
         }
+        if (source.type.code() == VARIANT) {
+            return cast(source.lower(), target)
+        }
         val cast = _table[source.type.code()][target.code()]
             ?: throw TypeCheckException("CAST(${source.type} AS $target) is not supported.")
         return try {
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
index a8abb07bb..236bf457b 100644
--- 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
@@ -45,7 +45,14 @@ internal class ExprCallDynamic(
     private val candidates: MutableMap<List<PType>, Candidate> = mutableMapOf()
 
     override fun eval(env: Environment): Datum {
-        val actualArgs = args.map { it.eval(env) }.toTypedArray()
+        val actualArgs = args.map {
+            val arg = it.eval(env)
+            if (arg.type.code() == PType.VARIANT) {
+                arg.lower()
+            } else {
+                arg
+            }
+        }.toTypedArray()
         val actualTypes = actualArgs.map { it.type }
         var candidate = candidates[actualTypes]
         if (candidate == null) {
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt
index 8d5326863..abe9711bf 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt
@@ -32,6 +32,7 @@ internal class ExprStructPermissive(private val fields: List<ExprStructField>) :
                 return null
             }
             return when (this.type.code()) {
+                PType.VARIANT -> this.lower().getTextOrNull()
                 PType.STRING, PType.CHAR -> this.string
                 else -> null
             }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt
index c881a8dd7..5a9272901 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt
@@ -47,7 +47,7 @@ internal object FnResolver {
         }
 
         // 2. If there are DYNAMIC arguments, return all candidates
-        val isDynamic = args.any { it.code() == PType.DYNAMIC }
+        val isDynamic = args.any { it.code() == PType.DYNAMIC || it.code() == PType.VARIANT }
         if (isDynamic) {
             val orderedMatches = candidates.sortedWith(FnComparator)
             return FnMatch.Dynamic(orderedMatches)
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt
index b72500060..4e50761cf 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt
@@ -63,6 +63,11 @@ internal class CastTable private constructor(
                     cast(it)
                 }
             }
+            graph[PType.VARIANT] = relationships {
+                PType.codes().map {
+                    cast(it)
+                }
+            }
             graph[PType.DYNAMIC] = relationships {
                 cast(PType.DYNAMIC)
                 PType.codes().filterNot { it == PType.DYNAMIC }.forEach {
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
index 6938b9f75..6c4f3033e 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/transforms/RexConverter.kt
@@ -89,7 +89,6 @@ import org.partiql.planner.internal.typer.PlanTyper.Companion.toCType
 import org.partiql.planner.internal.utils.DateTimeUtils
 import org.partiql.spi.catalog.Identifier
 import org.partiql.spi.value.Datum
-import org.partiql.spi.value.DatumReader
 import org.partiql.types.PType
 import org.partiql.value.datetime.DateTimeValue
 import java.math.BigDecimal
@@ -216,10 +215,7 @@ internal object RexConverter {
             if (node.encoding != "ion") {
                 throw IllegalArgumentException("unsupported encoding ${node.encoding}")
             }
-            // TODO: Does this result in a Datum of type variant?
-            val v = DatumReader.ion(node.value.byteInputStream())
-            val datum = v.next() ?: error("Expected a single value")
-            v.next()?.let { throw TypeCheckException("Expected a single value") }
+            val datum = Datum.ion(node.value)
             val type = CompilerType(datum.type)
             return rex(type, rexOpLit(datum))
         }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt
index c054d5a93..ff6d4144f 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/PlanTyper.kt
@@ -224,7 +224,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             val kType = PType.string()
 
             // Check Root (Dynamic)
-            if (rex.type.code() == PType.DYNAMIC) {
+            if (rex.type.code() == PType.DYNAMIC || rex.type.code() == PType.VARIANT) {
                 val type = ctx!!.copyWithSchema(listOf(kType, PType.dynamic()).toCType())
                 return rel(type, op)
             }
@@ -624,7 +624,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             }
 
             // Check if Root is DYNAMIC
-            if (root.type.code() == PType.DYNAMIC) {
+            if (root.type.code() == PType.DYNAMIC || root.type.code() == PType.VARIANT) {
                 return Rex(CompilerType(PType.dynamic()), Rex.Op.Path.Index(root, key))
             }
 
@@ -653,7 +653,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             }
 
             // Check if Root is DYNAMIC
-            if (root.type.code() == PType.DYNAMIC) {
+            if (root.type.code() == PType.DYNAMIC || root.type.code() == PType.VARIANT) {
                 return Rex(CompilerType(PType.dynamic()), Rex.Op.Path.Key(root, key))
             }
 
@@ -685,7 +685,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
             val root = visitRex(node.root, node.root.type)
 
             // Check if Root is DYNAMIC
-            if (root.type.code() == PType.DYNAMIC) {
+            if (root.type.code() == PType.DYNAMIC || root.type.code() == PType.VARIANT) {
                 return Rex(CompilerType(PType.dynamic()), Rex.Op.Path.Symbol(root, node.key))
             }
 
@@ -923,7 +923,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
          * Hence, we permit Static Type BOOL, Static Type NULL, Static Type Missing here.
          */
         private fun canBeBoolean(type: CompilerType): Boolean {
-            return type.code() == PType.DYNAMIC || type.code() == PType.BOOL
+            return type.code() == PType.DYNAMIC || type.code() == PType.VARIANT || type.code() == PType.BOOL
         }
 
         /**
@@ -1040,7 +1040,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
          * Calculate output type of a scalar subquery.
          */
         private fun visitRexOpSubqueryScalar(subquery: Rex.Op.Subquery, cons: CompilerType): Rex {
-            if (cons.code() == PType.DYNAMIC) {
+            if (cons.code() == PType.DYNAMIC || cons.code() == PType.VARIANT) {
                 return Rex(PType.dynamic().toCType(), subquery)
             }
             if (cons.code() != PType.ROW) {
@@ -1186,7 +1186,7 @@ internal class PlanTyper(private val env: Env, config: Context) {
                 when (arg.code()) {
                     PType.ROW -> fields.addAll(arg.fields!!)
                     PType.STRUCT -> structIsOpen = true
-                    PType.DYNAMIC -> containsDynamic = true
+                    PType.DYNAMIC, PType.VARIANT -> containsDynamic = true
                     PType.UNKNOWN -> structIsOpen = true
                     else -> containsNonStruct = true
                 }
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt
index 153efac74..fba88c235 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/typer/Scope.kt
@@ -144,6 +144,7 @@ internal data class Scope(
             PType.ROW -> this.fields.any { name.matches(it.name) }
             PType.STRUCT -> null
             PType.DYNAMIC -> null
+            PType.VARIANT -> null
             else -> false
         }
     }
diff --git a/partiql-spi/api/partiql-spi.api b/partiql-spi/api/partiql-spi.api
index cec1f2fd7..c7465f14c 100644
--- a/partiql-spi/api/partiql-spi.api
+++ b/partiql-spi/api/partiql-spi.api
@@ -501,6 +501,7 @@ public abstract interface class org/partiql/spi/value/Datum : java/lang/Iterable
 	public fun getTimestamp ()Lorg/partiql/value/datetime/Timestamp;
 	public abstract fun getType ()Lorg/partiql/types/PType;
 	public static fun integer (I)Lorg/partiql/spi/value/Datum;
+	public static fun ion (Ljava/lang/String;)Lorg/partiql/spi/value/Datum;
 	public fun isMissing ()Z
 	public fun isNull ()Z
 	public fun iterator ()Ljava/util/Iterator;
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java b/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
index 06e31786b..d754ac85f 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
@@ -1,13 +1,18 @@
 package org.partiql.spi.value;
 
+import com.amazon.ionelement.api.AnyElement;
+import com.amazon.ionelement.api.ElementLoader;
+import com.amazon.ionelement.api.IonElementLoader;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.partiql.errors.DataException;
+import org.partiql.spi.value.ion.IonVariant;
 import org.partiql.types.PType;
 import org.partiql.value.datetime.Date;
 import org.partiql.value.datetime.Time;
 import org.partiql.value.datetime.Timestamp;
 
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
@@ -198,7 +203,7 @@ default short getShort() {
      *                                       {@link #isNull()} returns false before attempting to invoke this method.
      */
     default int getInt() {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException("Has type: " + getType() + " and class " + this.getClass().getName());
     }
 
     /**
@@ -572,6 +577,13 @@ static Datum struct(@NotNull Iterable<Field> values) {
         return new DatumStruct(values);
     }
 
+    @NotNull
+    static Datum ion(@NotNull String value) {
+        IonElementLoader loader = ElementLoader.createIonElementLoader();
+        AnyElement element = loader.loadSingleElement(value);
+        return new IonVariant(element);
+    }
+
     /**
      * Comparator for PartiQL values.
      * <p>
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/DatumComparator.java b/partiql-spi/src/main/java/org/partiql/spi/value/DatumComparator.java
index 29f781ec9..69fc85884 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/DatumComparator.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/DatumComparator.java
@@ -100,7 +100,36 @@ abstract class DatumComparator implements Comparator<Datum> {
 
     @Override
     public int compare(Datum lhs, Datum rhs) {
-        // Check for NULL/MISSING
+        // Check if  NULL/MISSING
+        Integer result = checkUnknown(lhs, rhs);
+        if (result != null) {
+            return result;
+        }
+
+        // Check for VARIANT & if NULL/MISSING
+        boolean lhsIsVariant = lhs.getType().code() == PType.VARIANT;
+        boolean rhsIsVariant = rhs.getType().code() == PType.VARIANT;
+        Datum lhsActual = lhsIsVariant ? lhs.lower() : lhs;
+        Datum rhsActual = rhsIsVariant ? rhs.lower() : rhs;
+        if (lhsIsVariant || rhsIsVariant) {
+            result = checkUnknown(lhsActual, rhsActual);
+            if (result != null) {
+                return result;
+            }
+        }
+
+        // Invoke the Comparison Table
+        int lhsKind = lhsActual.getType().code();
+        int rhsKind = rhsActual.getType().code();
+        return COMPARISON_TABLE[lhsKind][rhsKind].apply(lhsActual, rhsActual, this);
+    }
+
+    /**
+     * @param lhs the left side
+     * @param rhs the right side
+     * @return null if both are NOT unknown (AKA, they are both concrete); the result if one or more is unknown.
+     */
+    private Integer checkUnknown(Datum lhs, Datum rhs) {
         boolean lhsIsUnknown = lhs.isNull() || lhs.isMissing();
         boolean rhsIsUnknown = rhs.isNull() || rhs.isMissing();
         if (lhsIsUnknown && rhsIsUnknown) {
@@ -112,11 +141,7 @@ public int compare(Datum lhs, Datum rhs) {
         if (rhsIsUnknown) {
             return rhsUnknown();
         }
-
-        // Invoke the Comparison Table
-        int lhsKind = lhs.getType().code();
-        int rhsKind = rhs.getType().code();
-        return COMPARISON_TABLE[lhsKind][rhsKind].apply(lhs, rhs, this);
+        return null;
     }
 
     /**
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java
index 77519937b..803440bfc 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTime.java
@@ -16,12 +16,12 @@ class DatumTime implements Datum {
     private final PType _type;
 
     DatumTime(@NotNull Time value) {
-        _value = value;
+        _value = value.toPrecision(6);
         _type = PType.timez(6);
     }
 
     DatumTime(@NotNull Time value, int precision) {
-        _value = value;
+        _value = value.toPrecision(precision);
         _type = PType.timez(precision);
     }
 
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java
index 77079577b..75bda7a27 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/DatumTimestamp.java
@@ -16,12 +16,12 @@ class DatumTimestamp implements Datum {
     private final PType _type;
 
     DatumTimestamp(@NotNull Timestamp value) {
-        _value = value;
+        _value = value.toPrecision(6);
         _type = PType.timestampz(6);
     }
 
     DatumTimestamp(@NotNull Timestamp value, int precision) {
-        _value = value;
+        _value = value.toPrecision(precision);
         _type = PType.timestampz(precision);
     }
 
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/DiadicOperator.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/DiadicOperator.kt
index bd233083c..779742227 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/DiadicOperator.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/DiadicOperator.kt
@@ -36,8 +36,8 @@ internal abstract class DiadicOperator(
     override fun getInstance(args: Array<PType>): Function.Instance? {
         val lhs = args[0]
         val rhs = args[1]
-        val lhsPrecedence = TYPE_PRECEDENCE[lhs.code()] ?: throw IllegalArgumentException("Type not supported -- LHS = $lhs")
-        val rhsPrecedence = TYPE_PRECEDENCE[rhs.code()] ?: throw IllegalArgumentException("Type not supported -- RHS = $rhs")
+        val lhsPrecedence = TYPE_PRECEDENCE[lhs.code()] ?: return null
+        val rhsPrecedence = TYPE_PRECEDENCE[rhs.code()] ?: return null
         val (newLhs, newRhs) = when (lhsPrecedence.compareTo(rhsPrecedence)) {
             -1 -> (rhs to rhs)
             0 -> (lhs to rhs)
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
index 6e8ae0082..70ced293f 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
@@ -45,6 +45,9 @@ internal fun comparisonAccumulator(comparator: Comparator<Datum>): (Datum?, Datu
     }
 
 internal fun checkIsNumberType(funcName: String, value: Datum) {
+    if (value.type.code() == PType.VARIANT) {
+        return checkIsNumberType(funcName, value.lower())
+    }
     if (!value.type.isNumber()) {
         throw TypeCheckException("Expected NUMBER but received ${value.type}.")
     }
@@ -97,12 +100,16 @@ private fun Long.checkOverflowPlus(other: Long): Number {
 }
 
 internal fun checkIsBooleanType(funcName: String, value: Datum) {
+    if (value.type.code() == PType.VARIANT) {
+        return checkIsBooleanType(funcName, value.lower())
+    }
     if (value.type.code() != PType.BOOL) {
         throw TypeCheckException("Expected ${PType.BOOL} but received ${value.type}.")
     }
 }
 
 internal fun Datum.numberValue(): Number = when (this.type.code()) {
+    PType.VARIANT -> this.lower().numberValue()
     PType.TINYINT -> this.byte
     PType.SMALLINT -> this.short
     PType.INTEGER -> this.int
@@ -115,6 +122,7 @@ internal fun Datum.numberValue(): Number = when (this.type.code()) {
 }
 
 internal fun Datum.booleanValue(): Boolean = when (this.type.code()) {
+    PType.VARIANT -> this.lower().booleanValue()
     PType.BOOL -> this.boolean
     else -> error("Cannot convert PartiQLValue ($this) to boolean.")
 }
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
index 6dabff6ae..6183e76f8 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
@@ -3,7 +3,10 @@ package org.partiql.spi.value.ion
 import com.amazon.ion.system.IonBinaryWriterBuilder
 import com.amazon.ion.system.IonTextWriterBuilder
 import com.amazon.ionelement.api.AnyElement
+import com.amazon.ionelement.api.ElementType
+import com.amazon.ionelement.api.ElementType.BLOB
 import com.amazon.ionelement.api.ElementType.BOOL
+import com.amazon.ionelement.api.ElementType.CLOB
 import com.amazon.ionelement.api.ElementType.DECIMAL
 import com.amazon.ionelement.api.ElementType.FLOAT
 import com.amazon.ionelement.api.ElementType.INT
@@ -16,14 +19,8 @@ import com.amazon.ionelement.api.ElementType.TIMESTAMP
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.Field
 import org.partiql.types.PType
-import org.partiql.value.datetime.Date
 import org.partiql.value.datetime.DateTimeValue
-import org.partiql.value.datetime.Time
-import org.partiql.value.datetime.TimeZone
-import org.partiql.value.datetime.Timestamp
 import java.io.ByteArrayOutputStream
-import java.math.BigDecimal
-import java.math.BigInteger
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
 
@@ -54,127 +51,54 @@ internal class IonVariant(private var value: AnyElement) : Datum {
         return buffer.toByteArray()
     }
 
-    /**
-     * TODO!
-     */
     override fun lower(): Datum {
-        throw UnsupportedOperationException("VARIANT<ION> lower")
-    }
-
-    override fun getType(): PType = type
-
-    override fun isNull(): Boolean = value.isNull
-
-    override fun isMissing(): Boolean = false
-
-    override fun getString(): String = when (value.type) {
-        SYMBOL -> value.stringValue
-        STRING -> value.stringValue
-        else -> super.getString()
-    }
-
-    override fun getBoolean(): Boolean = when (value.type) {
-        BOOL -> value.booleanValue
-        else -> super.getBoolean()
-    }
-
-    // override fun getBytes(): ByteArray =  when (value.type) {
-    //     CLOB -> value.clobValue.copyOfBytes()
-    //     BLOB -> value.blobValue.copyOfBytes()
-    //     else -> super.getBytes()
-    // }
-    //
-    // override fun getByte(): Byte {
-    //     return super.getByte()
-    // }
-
-    override fun getDate(): Date {
-        return when (value.type) {
-            TIMESTAMP -> {
-                val ts = value.timestampValue
-                DateTimeValue.date(ts.year, ts.month, ts.day)
-            }
-            else -> super.getDate()
+        if (value.isNull) {
+            return Datum.nullValue(value.type.toPType())
         }
-    }
-
-    override fun getTime(): Time {
         return when (value.type) {
-            TIMESTAMP -> {
-                val ts = value.timestampValue
-                val tz = when (ts.localOffset) {
-                    null -> TimeZone.UnknownTimeZone
-                    else -> TimeZone.UtcOffset.of(ts.zHour, ts.zMinute)
-                }
-                DateTimeValue.time(ts.hour, ts.minute, ts.second, tz)
+            STRING -> Datum.string(value.stringValue)
+            SYMBOL -> Datum.string(value.symbolValue)
+            BOOL -> Datum.bool(value.booleanValue)
+            CLOB -> Datum.clob(value.clobValue.copyOfBytes())
+            BLOB -> Datum.blob(value.blobValue.copyOfBytes())
+            TIMESTAMP -> Datum.timestamp(DateTimeValue.timestamp(value.timestampValue))
+            INT -> {
+                val bigInteger = value.bigIntegerValue
+                Datum.bigint(bigInteger.longValueExact())
+                // Datum.decimal(value.bigIntegerValue.toBigDecimal(), 38, 0)
             }
-            else -> super.getTime()
+            FLOAT -> Datum.doublePrecision(value.doubleValue)
+            DECIMAL -> {
+                val decimal = value.decimalValue.bigDecimalValue()
+                Datum.decimal(decimal, decimal.precision(), decimal.scale())
+            }
+            LIST -> Datum.array(value.listValues.map { IonVariant(it) })
+            SEXP -> Datum.array(value.sexpValues.map { IonVariant(it) })
+            STRUCT -> Datum.struct(value.structFields.map { Field.of(it.name, IonVariant(it.value)) })
+            ElementType.NULL -> error("The NULL type is impossible to be received.")
         }
     }
 
-    // TODO: Handle struct notation
-    override fun getTimestamp(): Timestamp {
-        return when (value.type) {
-            TIMESTAMP -> DateTimeValue.timestamp(value.timestampValue)
-            else -> super.getTimestamp()
+    private fun ElementType.toPType(): PType {
+        val code = when (this) {
+            SYMBOL, STRING -> PType.STRING
+            BOOL -> PType.BOOL
+            CLOB -> PType.CLOB
+            BLOB -> PType.BLOB
+            TIMESTAMP -> PType.TIMESTAMP
+            INT -> PType.DECIMAL
+            FLOAT -> PType.DOUBLE
+            DECIMAL -> PType.DECIMAL
+            LIST, SEXP -> PType.ARRAY
+            STRUCT -> PType.STRUCT
+            ElementType.NULL -> PType.UNKNOWN
         }
+        return PType.of(code)
     }
 
-    override fun getBigInteger(): BigInteger = when (value.type) {
-        INT -> value.bigIntegerValue
-        else -> super.getBigInteger()
-    }
-
-    override fun getDouble(): Double = when (value.type) {
-        FLOAT -> value.doubleValue
-        else -> super.getDouble()
-    }
-
-    override fun getBigDecimal(): BigDecimal = when (value.type) {
-        DECIMAL -> value.decimalValue.bigDecimalValue()
-        else -> super.getBigDecimal()
-    }
-
-    override fun iterator(): MutableIterator<Datum> = when (value.type) {
-        LIST -> value.listValues.map { IonVariant(it) }.toMutableList().iterator()
-        SEXP -> value.sexpValues.map { IonVariant(it) }.toMutableList().iterator()
-        else -> super.iterator()
-    }
-
-    override fun getFields(): MutableIterator<Field> {
-        if (value.type != STRUCT) {
-            return super.getFields()
-        }
-        return value.structFields
-            .map { Field.of(it.name, IonVariant(it.value)) }
-            .toMutableList()
-            .iterator()
-    }
+    override fun getType(): PType = type
 
-    override fun get(name: String): Datum {
-        if (value.type != STRUCT) {
-            return super.get(name)
-        }
-        // TODO handle multiple/ambiguous field names?
-        val v = value.asStruct().getOptional(name)
-        return if (v == null) {
-            Datum.missing()
-        } else {
-            IonVariant(v)
-        }
-    }
+    override fun isNull(): Boolean = false
 
-    override fun getInsensitive(name: String): Datum {
-        if (value.type != STRUCT) {
-            return super.get(name)
-        }
-        // TODO handle multiple/ambiguous field names?
-        val struct = value.asStruct()
-        for (field in struct.fields) {
-            if (field.name.equals(name, ignoreCase = true)) {
-                return IonVariant(field.value)
-            }
-        }
-        return Datum.missing()
-    }
+    override fun isMissing(): Boolean = false
 }
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
index 54beeb963..0ab496959 100644
--- a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
@@ -33,6 +33,7 @@
 import static org.partiql.types.PType.TIMEZ;
 import static org.partiql.types.PType.TINYINT;
 import static org.partiql.types.PType.UNKNOWN;
+import static org.partiql.types.PType.VARIANT;
 
 public class DatumUtils {
 
@@ -95,6 +96,8 @@ public static PartiQLValue toPartiQLValue(@NotNull Datum datum) {
                 } else if (datum.isMissing()) {
                     return PartiQL.missingValue();
                 }
+            case VARIANT:
+                return datum.isNull() ? PartiQL.nullValue() : toPartiQLValue(datum.lower());
             default:
                 throw new UnsupportedOperationException("Unsupported datum type: " + type);
         }
diff --git a/test/partiql-tests-runner/src/test/resources/config/eval/skip-eval.txt b/test/partiql-tests-runner/src/test/resources/config/eval/skip-eval.txt
index 043d99fcd..52d32e5db 100644
--- a/test/partiql-tests-runner/src/test/resources/config/eval/skip-eval.txt
+++ b/test/partiql-tests-runner/src/test/resources/config/eval/skip-eval.txt
@@ -35,9 +35,6 @@ PERMISSIVE:::SELECT VALUE { 'col1': col1, 'g': g } FROM simple_1_col_1_group, di
 STRICT:::SELECT VALUE { 'col1': col1, 'g': g } FROM simple_1_col_1_group, different_types_per_row GROUP BY col1 GROUP AS g
 PERMISSIVE:::select fld3,period from t1,t2 where fld1 = 011401
 PERMISSIVE:::select fld3,period from t2,t1 where companynr*10 = 37*10
-PERMISSIVE:::undefinedUnqualifiedVariableWithUndefinedVariableBehaviorMissing
-PERMISSIVE:::undefinedUnqualifiedVariableIsNullExprWithUndefinedVariableBehaviorMissing
-PERMISSIVE:::undefinedUnqualifiedVariableIsMissingExprWithUndefinedVariableBehaviorMissing
 PERMISSIVE:::MYSQL_SELECT_20
 STRICT:::MYSQL_SELECT_20
 PERMISSIVE:::MYSQL_SELECT_21
@@ -74,16 +71,9 @@ STRICT:::POSITION string in invalid type
 STRICT:::BIT_LENGTH invalid type
 
 // TODO: Invalid casts. Needed for V1 release.
-STRICT:::cast to int invalid target type{value:"`2017T`",target:"TIMESTAMP"}
-STRICT:::cast to int invalid target type{value:" `{{\"\"}}` ",target:"CLOB"}
-STRICT:::cast to int invalid target type{value:" `{{\"1\"}}` ",target:"CLOB"}
-STRICT:::cast to int invalid target type{value:"`{{}}`",target:"BLOB"}
 STRICT:::cast to int invalid target type{value:"[1, 2]",target:"LIST"}
 STRICT:::cast to int invalid target type{value:"[1]",target:"LIST"}
 STRICT:::cast to int invalid target type{value:"[]",target:"LIST"}
-STRICT:::cast to int invalid target type{value:"`(1 2)`",target:"SEXP"}
-STRICT:::cast to int invalid target type{value:"`(1)`",target:"SEXP"}
-STRICT:::cast to int invalid target type{value:"`()`",target:"SEXP"}
 STRICT:::cast to int invalid target type{value:"{'a': 1}",target:"STRUCT"}
 STRICT:::cast to int invalid target type{value:"{'a': '12'}",target:"STRUCT"}
 STRICT:::cast to int invalid target type{value:"{}",target:"STRUCT"}
@@ -102,19 +92,13 @@ PERMISSIVE:::Example 6 - Value Coercion not union-compatible
 STRICT:::Example 6 - Value Coercion not union-compatible
 
 // TODO: Operators. Needed for V1 release.
-STRICT:::array navigation with wrongly typed array index
 STRICT:::data type mismatch in comparison expression
-STRICT:::data type mismatch in logical expression
 
 // TODO: Sexp tests. Needed for V1 release.
 PERMISSIVE:::projectOfSexp
 STRICT:::projectOfSexp
 
 // TODO: Miscellaneous. Needed for V1 release.
-STRICT:::subscript with non-existent variable in lowercase
-STRICT:::subscript with non-existent variable in uppercase
-STRICT:::repeated field on struct is ambiguous{identifier:"REPEATED",cn:9,bn:"REPEATED"}
-STRICT:::repeated field on struct is ambiguous{identifier:" \"repeated\" ",cn:10,bn:"repeated"}
 STRICT:::invalid extract year from time
 STRICT:::invalid extract month from time
 STRICT:::invalid extract day from time

From 0f565af4e7623c179be11f0103dfd11e90acffc9 Mon Sep 17 00:00:00 2001
From: John Ed Quinn <johqunn@amazon.com>
Date: Fri, 20 Dec 2024 08:25:04 -0800
Subject: [PATCH 3/4] Addresses PR comments

Adds PType static factory methods with default parameters

Renames factory methods for creating Datum and PartiQLValue

Adds AST-to-Plan typing logic of integers to the Ion Variant

Reverts the IonDatumReader changes to focus on limited scope

Adds a lowerSafe() internal utility method for reducing code size

Updates some Javadocs & comments
---
 .../src/main/kotlin/org/partiql/cli/Main.kt   |   4 +-
 .../kotlin/org/partiql/cli/shell/Shell.kt     |   4 +-
 .../eval/internal/helpers/DatumUtils.kt       |  20 ++++
 .../eval/internal/helpers/ValueUtility.kt     |   7 +-
 .../internal/operator/rel/RelOpIterate.kt     |  10 +-
 .../operator/rel/RelOpIteratePermissive.kt    |  10 +-
 .../eval/internal/operator/rel/RelOpScan.kt   |  15 +--
 .../operator/rel/RelOpScanPermissive.kt       |  12 +-
 .../internal/operator/rel/RelOpUnpivot.kt     |  17 +--
 .../eval/internal/operator/rex/CastTable.kt   |  11 +-
 .../internal/operator/rex/ExprCallDynamic.kt  |  10 +-
 .../operator/rex/ExprStructPermissive.kt      |   4 +-
 .../partiql/eval/internal/SuccessTestCase.kt  |   4 +-
 .../partiql/eval/internal/TypingTestCase.kt   |   4 +-
 .../partiql/planner/internal/FnResolver.kt    |   4 +-
 .../planner/internal/casts/CastTable.kt       |   1 +
 .../java/org/partiql/spi/value/Datum.java     |   2 +-
 .../function/builtins/internal/Accumulator.kt |   3 -
 .../partiql/spi/value/ion/IonDatumReader.kt   |  85 +++++---------
 .../org/partiql/spi/value/ion/IonVariant.kt   |  15 ++-
 .../spi/value/PQLToPartiQLIterable.java       |   2 +-
 .../partiql/spi/value/PQLToPartiQLStruct.java |   2 +-
 .../spi/value/PartiQLToPQLIterable.java       |   2 +-
 .../partiql/spi/value/PartiQLToPQLStruct.java |   2 +-
 .../{DatumUtils.java => ValueUtils.java}      |  11 +-
 partiql-types/api/partiql-types.api           |  10 ++
 .../main/java/org/partiql/types/PType.java    | 106 ++++++++++++++++--
 .../org/partiql/lang/randomized/eval/Utils.kt |   9 +-
 .../partiql/runner/executor/EvalExecutor.kt   |   6 +-
 29 files changed, 227 insertions(+), 165 deletions(-)
 create mode 100644 partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt
 rename partiql-spi/src/testFixtures/java/org/partiql/spi/value/{DatumUtils.java => ValueUtils.java} (96%)

diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
index bd57d7f7f..cea88193d 100644
--- a/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
+++ b/partiql-cli/src/main/kotlin/org/partiql/cli/Main.kt
@@ -24,7 +24,7 @@ import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
-import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.ValueUtils
 import org.partiql.spi.value.io.PartiQLValueTextWriter
 import picocli.CommandLine
 import java.io.File
@@ -205,7 +205,7 @@ internal class MainCommand : Runnable {
         // TODO add format support
         checkFormat(format)
         val writer = PartiQLValueTextWriter(System.out)
-        val p = DatumUtils.toPartiQLValue(result)
+        val p = ValueUtils.newPartiQLValue(result)
         writer.append(p) // TODO: Create a Datum writer
         println()
     }
diff --git a/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt b/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt
index d696d714a..69443dc68 100644
--- a/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt
+++ b/partiql-cli/src/main/kotlin/org/partiql/cli/shell/Shell.kt
@@ -31,7 +31,7 @@ import org.jline.utils.InfoCmp
 import org.joda.time.Duration
 import org.partiql.cli.pipeline.Pipeline
 import org.partiql.spi.catalog.Session
-import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.ValueUtils
 import org.partiql.spi.value.io.PartiQLValueTextWriter
 import java.io.Closeable
 import java.io.PrintStream
@@ -275,7 +275,7 @@ internal class Shell(
                         out.appendLine()
                         out.info("=== RESULT ===")
                         val writer = PartiQLValueTextWriter(out)
-                        val p = DatumUtils.toPartiQLValue(result)
+                        val p = ValueUtils.newPartiQLValue(result)
                         writer.append(p) // TODO: Create a Datum writer
                         out.appendLine()
                         out.appendLine()
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt
new file mode 100644
index 000000000..3e3cf110d
--- /dev/null
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt
@@ -0,0 +1,20 @@
+package org.partiql.eval.internal.helpers
+
+import org.partiql.spi.value.Datum
+import org.partiql.types.PType
+
+internal object DatumUtils {
+
+    /**
+     * Calls [Datum.lower] if the datum is a variant, otherwise returns the datum. If you don't know whether the value
+     * is of type [PType.VARIANT], you should use [Datum.lowerSafe] before invoking whatever methods you intend to use.
+     * This is essentially a workaround for the fact that we currently don't know whether a particular expression will be
+     * [PType.VARIANT] or not. This can eventually be optimized to accommodate this.
+     */
+    internal fun Datum.lowerSafe(): Datum {
+        return when (this.type.code()) {
+            PType.VARIANT -> this.lower()
+            else -> this
+        }
+    }
+}
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
index 48923c5e3..031392577 100644
--- 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
@@ -18,10 +18,11 @@ internal object ValueUtility {
         if (this.isNull || this.isMissing) {
             return false
         }
-        if (this.type.code() == PType.VARIANT) {
-            return this.lower().isTrue()
+        return when (this.type.code()) {
+            PType.VARIANT -> this.lower().isTrue()
+            PType.BOOL -> this.boolean
+            else -> false
         }
-        return this.type.code() == PType.BOOL && this.boolean
     }
 
     /**
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
index b99aecb3d..ad9b2ac37 100644
--- 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
@@ -5,6 +5,7 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
@@ -16,14 +17,9 @@ internal class RelOpIterate(
     private var index: Long = 0
 
     override fun open(env: Environment) {
-        val r = expr.eval(env.push(Row()))
+        val r = expr.eval(env.push(Row())).lowerSafe()
         index = 0
-        iterator = records(r)
-    }
-
-    private fun records(r: Datum): Iterator<Datum> {
-        return when (r.type.code()) {
-            PType.VARIANT -> records(r.lower())
+        iterator = when (r.type.code()) {
             PType.BAG -> {
                 close()
                 throw TypeCheckException()
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
index 1f5b5d32b..fbc6a9435 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
@@ -4,6 +4,7 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
@@ -16,14 +17,9 @@ internal class RelOpIteratePermissive(
     private var isIndexable: Boolean = true
 
     override fun open(env: Environment) {
-        val r = expr.eval(env.push(Row()))
+        val r = expr.eval(env.push(Row())).lowerSafe()
         index = 0
-        iterator = records(r)
-    }
-
-    private fun records(r: Datum): Iterator<Datum> {
-        return when (r.type.code()) {
-            PType.VARIANT -> records(r.lower())
+        iterator = when (r.type.code()) {
             PType.BAG -> {
                 isIndexable = false
                 r.iterator()
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt
index dce1faf77..d91e885a1 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScan.kt
@@ -5,8 +5,8 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.eval.internal.helpers.RecordValueIterator
-import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class RelOpScan(
@@ -16,17 +16,12 @@ internal class RelOpScan(
     private lateinit var records: Iterator<Row>
 
     override fun open(env: Environment) {
-        val r = expr.eval(env.push(Row()))
-        records = r.records()
-    }
-
-    private fun Datum.records(): RecordValueIterator {
-        return when (this.type.code()) {
-            PType.VARIANT -> this.lower().records()
-            PType.ARRAY, PType.BAG -> RecordValueIterator(this.iterator())
+        val r = expr.eval(env.push(Row())).lowerSafe()
+        records = when (r.type.code()) {
+            PType.ARRAY, PType.BAG -> RecordValueIterator(r.iterator())
             else -> {
                 close()
-                throw TypeCheckException("Unexpected type for scan: ${this.type}")
+                throw TypeCheckException("Unexpected type for scan: ${r.type}")
             }
         }
     }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt
index 5a0597369..126e64c66 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpScanPermissive.kt
@@ -4,8 +4,8 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.eval.internal.helpers.RecordValueIterator
-import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 
 internal class RelOpScanPermissive(
@@ -15,14 +15,8 @@ internal class RelOpScanPermissive(
     private lateinit var records: Iterator<Row>
 
     override fun open(env: Environment) {
-        val r = expr.eval(env.push(Row()))
-        records = r.records()
-    }
-
-    private fun Datum.records(): Iterator<Row> {
-        val r = this
-        return when (type.code()) {
-            PType.VARIANT -> r.lower().records()
+        val r = expr.eval(env.push(Row())).lowerSafe()
+        records = when (r.type.code()) {
             PType.BAG, PType.ARRAY -> RecordValueIterator(r.iterator())
             else -> iterator { yield(Row(arrayOf(r))) }
         }
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
index 68cecaf48..1356a2ac4 100644
--- 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
@@ -5,6 +5,7 @@ import org.partiql.eval.Environment
 import org.partiql.eval.ExprRelation
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.Field
 import org.partiql.types.PType
@@ -58,13 +59,7 @@ internal sealed class RelOpUnpivot : ExprRelation {
     class Strict(private val expr: ExprValue) : RelOpUnpivot() {
 
         override fun struct(): Datum {
-            val v = expr.eval(env.push(Row())).let {
-                if (it.type.code() == PType.VARIANT) {
-                    it.lower()
-                } else {
-                    it
-                }
-            }
+            val v = expr.eval(env.push(Row())).lowerSafe()
             if (v.type.code() != PType.STRUCT && v.type.code() != PType.ROW) {
                 throw TypeCheckException()
             }
@@ -84,13 +79,7 @@ internal sealed class RelOpUnpivot : ExprRelation {
     class Permissive(private val expr: ExprValue) : RelOpUnpivot() {
 
         override fun struct(): Datum {
-            val v = expr.eval(env.push(Row())).let {
-                if (it.type.code() == PType.VARIANT) {
-                    it.lower()
-                } else {
-                    it
-                }
-            }
+            val v = expr.eval(env.push(Row())).lowerSafe()
             if (v.isMissing) {
                 return Datum.struct(emptyList())
             }
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
index 76da4603a..8f994fa1c 100644
--- 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
@@ -71,9 +71,6 @@ internal object CastTable {
         if (target.code() == DYNAMIC) {
             return source
         }
-        if (source.type.code() == VARIANT) {
-            return cast(source.lower(), target)
-        }
         val cast = _table[source.type.code()][target.code()]
             ?: throw TypeCheckException("CAST(${source.type} AS $target) is not supported.")
         return try {
@@ -109,6 +106,7 @@ internal object CastTable {
         registerTimestamp()
         registerDate()
         registerTime()
+        registerVariant()
     }
 
     private fun String.pad(): String {
@@ -497,6 +495,13 @@ internal object CastTable {
         register(TIMEZ, TIMESTAMPZ) { x, _ -> Datum.timestamp(DateTimeValue.timestamp(DateTimeValue.date(1970, 1, 1), x.time)) }
     }
 
+    private fun registerVariant() {
+        PType.codes().forEach { pType ->
+            register(VARIANT, pType) { x, t -> cast(x.lower(), t) }
+        }
+        register(VARIANT, VARIANT) { x, _ -> x }
+    }
+
     private fun register(source: Int, target: Int, cast: (Datum, PType) -> Datum) {
         _table[source][target] = cast
     }
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
index 236bf457b..7c799a5b7 100644
--- 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
@@ -4,6 +4,7 @@ import org.partiql.errors.TypeCheckException
 import org.partiql.eval.Environment
 import org.partiql.eval.ExprValue
 import org.partiql.eval.Row
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.eval.internal.operator.rex.ExprCallDynamic.Candidate
 import org.partiql.eval.internal.operator.rex.ExprCallDynamic.CoercionFamily.DYNAMIC
 import org.partiql.eval.internal.operator.rex.ExprCallDynamic.CoercionFamily.UNKNOWN
@@ -45,14 +46,7 @@ internal class ExprCallDynamic(
     private val candidates: MutableMap<List<PType>, Candidate> = mutableMapOf()
 
     override fun eval(env: Environment): Datum {
-        val actualArgs = args.map {
-            val arg = it.eval(env)
-            if (arg.type.code() == PType.VARIANT) {
-                arg.lower()
-            } else {
-                arg
-            }
-        }.toTypedArray()
+        val actualArgs = args.map { it.eval(env).lowerSafe() }.toTypedArray()
         val actualTypes = actualArgs.map { it.type }
         var candidate = candidates[actualTypes]
         if (candidate == null) {
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt
index abe9711bf..e1b589d18 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprStructPermissive.kt
@@ -2,6 +2,7 @@ package org.partiql.eval.internal.operator.rex
 
 import org.partiql.eval.Environment
 import org.partiql.eval.ExprValue
+import org.partiql.eval.internal.helpers.DatumUtils.lowerSafe
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.Field
 import org.partiql.types.PType
@@ -10,7 +11,7 @@ internal class ExprStructPermissive(private val fields: List<ExprStructField>) :
     ExprValue {
     override fun eval(env: Environment): Datum {
         val fields = fields.mapNotNull {
-            val key = it.key.eval(env)
+            val key = it.key.eval(env).lowerSafe()
             val keyString = key.getTextOrNull() ?: return@mapNotNull null
             val value = it.value.eval(env)
             when (value.isMissing) {
@@ -32,7 +33,6 @@ internal class ExprStructPermissive(private val fields: List<ExprStructField>) :
                 return null
             }
             return when (this.type.code()) {
-                PType.VARIANT -> this.lower().getTextOrNull()
                 PType.STRING, PType.CHAR -> this.string
                 else -> null
             }
diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
index fcfeb8986..7ca4245b0 100644
--- a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
+++ b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/SuccessTestCase.kt
@@ -12,7 +12,7 @@ import org.partiql.spi.catalog.Session
 import org.partiql.spi.catalog.Table
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
-import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.ValueUtils
 import org.partiql.types.StaticType
 import org.partiql.types.fromStaticType
 import org.partiql.value.PartiQLValue
@@ -31,7 +31,7 @@ public class SuccessTestCase(
         expected: PartiQLValue,
         mode: Mode = Mode.PERMISSIVE(),
         globals: List<Global> = emptyList(),
-    ) : this(input, DatumUtils.toDatum(expected), mode, globals)
+    ) : this(input, ValueUtils.newDatum(expected), mode, globals)
 
     private val compiler = PartiQLCompiler.standard()
     private val parser = PartiQLParser.standard()
diff --git a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
index 4810731e5..3a09d7342 100644
--- a/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
+++ b/partiql-eval/src/test/kotlin/org/partiql/eval/internal/TypingTestCase.kt
@@ -9,7 +9,7 @@ import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Session
 import org.partiql.spi.value.Datum
-import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.ValueUtils
 import org.partiql.spi.value.io.PartiQLValueIonWriterBuilder
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
@@ -29,7 +29,7 @@ public class TypingTestCase(
 
     override fun run() {
         val (permissiveResult, plan) = run(mode = Mode.PERMISSIVE())
-        val permissiveResultPValue = DatumUtils.toPartiQLValue(permissiveResult)
+        val permissiveResultPValue = ValueUtils.newPartiQLValue(permissiveResult)
         val assertionCondition = try {
             expectedPermissive == permissiveResultPValue // TODO: Assert using Datum
         } catch (t: Throwable) {
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt
index 5a9272901..044b2a539 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnResolver.kt
@@ -27,8 +27,6 @@ internal object FnResolver {
     /**
      * Resolution of either a static or dynamic function.
      *
-     * TODO: How do we handle DYNAMIC?
-     *
      * @param variants
      * @param args
      * @return
@@ -46,7 +44,7 @@ internal object FnResolver {
             }
         }
 
-        // 2. If there are DYNAMIC arguments, return all candidates
+        // 2. If there are DYNAMIC/VARIANT arguments, return all candidates
         val isDynamic = args.any { it.code() == PType.DYNAMIC || it.code() == PType.VARIANT }
         if (isDynamic) {
             val orderedMatches = candidates.sortedWith(FnComparator)
diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt
index 4e50761cf..bc6a46a19 100644
--- a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt
+++ b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/casts/CastTable.kt
@@ -63,6 +63,7 @@ internal class CastTable private constructor(
                     cast(it)
                 }
             }
+            // A VARIANT can be cast to all other types.
             graph[PType.VARIANT] = relationships {
                 PType.codes().map {
                     cast(it)
diff --git a/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java b/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
index d754ac85f..9db896e65 100644
--- a/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
+++ b/partiql-spi/src/main/java/org/partiql/spi/value/Datum.java
@@ -203,7 +203,7 @@ default short getShort() {
      *                                       {@link #isNull()} returns false before attempting to invoke this method.
      */
     default int getInt() {
-        throw new UnsupportedOperationException("Has type: " + getType() + " and class " + this.getClass().getName());
+        throw new UnsupportedOperationException();
     }
 
     /**
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
index 70ced293f..9e3ca87d3 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
@@ -45,9 +45,6 @@ internal fun comparisonAccumulator(comparator: Comparator<Datum>): (Datum?, Datu
     }
 
 internal fun checkIsNumberType(funcName: String, value: Datum) {
-    if (value.type.code() == PType.VARIANT) {
-        return checkIsNumberType(funcName, value.lower())
-    }
     if (!value.type.isNumber()) {
         throw TypeCheckException("Expected NUMBER but received ${value.type}.")
     }
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt
index 61f3e00d5..085be8d3e 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonDatumReader.kt
@@ -10,7 +10,6 @@ import org.partiql.spi.value.Datum
 import org.partiql.spi.value.DatumReader
 import org.partiql.spi.value.Encoding
 import org.partiql.spi.value.Field
-import org.partiql.types.PType
 import org.partiql.value.datetime.DateTimeUtil.toBigDecimal
 import java.io.IOException
 import java.io.InputStream
@@ -67,64 +66,36 @@ internal class IonDatumReader internal constructor(
     /**
      * Read without any explicit PartiQL type information.
      */
-    private fun read(): Datum {
-        if (reader.isNullValue) {
-            return Datum.nullValue(reader.type.toPTypeDefault())
-        }
-        return when (reader.type) {
-            IonType.NULL -> Datum.nullValue()
-            IonType.BOOL -> bool()
-            IonType.INT -> bigint()
-            IonType.FLOAT -> double()
-            IonType.DECIMAL -> decimal0()
-            IonType.TIMESTAMP -> TODO("timestamp without annotation")
-            IonType.STRING -> varchar0()
-            IonType.CLOB -> clob0()
-            IonType.BLOB -> clob0()
-            IonType.LIST -> array()
-            IonType.STRUCT -> struct()
-            IonType.SYMBOL -> missing()
-            IonType.SEXP -> {
-                reader.stepIn()
-                if (reader.next() == null) {
-                    throw IonDatumException("expected type, was null", null, span())
-                }
-                val method = method()
-                if (reader.next() == null) {
-                    throw IonDatumException("expected value, was null", null, span())
-                }
-                val value = method()
-                if (reader.next() != null) {
-                    throw IonDatumException("expected end of s-expression pair", null, span())
-                }
-                reader.stepOut()
-                value
+    private fun read(): Datum = when (reader.type) {
+        IonType.NULL -> Datum.nullValue()
+        IonType.BOOL -> bool()
+        IonType.INT -> bigint()
+        IonType.FLOAT -> double()
+        IonType.DECIMAL -> decimal0()
+        IonType.TIMESTAMP -> TODO("timestamp without annotation")
+        IonType.STRING -> varchar0()
+        IonType.CLOB -> clob0()
+        IonType.BLOB -> clob0()
+        IonType.LIST -> array()
+        IonType.STRUCT -> struct()
+        IonType.SYMBOL -> missing()
+        IonType.SEXP -> {
+            reader.stepIn()
+            if (reader.next() == null) {
+                throw IonDatumException("expected type, was null", null, span())
             }
-            else -> throw IonDatumException("unknown type", null, span())
-        }
-    }
-
-    /**
-     * Returns the default [PType] for the given [IonType].
-     */
-    private fun IonType.toPTypeDefault(): PType {
-        val code = when (this) {
-            IonType.NULL -> PType.UNKNOWN
-            IonType.BOOL -> PType.BOOL
-            IonType.INT -> PType.BIGINT
-            IonType.FLOAT -> PType.DOUBLE
-            IonType.DECIMAL -> PType.DECIMAL
-            IonType.TIMESTAMP -> PType.TIMESTAMP
-            IonType.STRING -> PType.STRING
-            IonType.CLOB -> PType.CLOB
-            IonType.BLOB -> PType.BLOB
-            IonType.LIST -> PType.ARRAY
-            IonType.STRUCT -> PType.STRUCT
-            IonType.SYMBOL -> PType.STRING
-            IonType.SEXP -> PType.ARRAY
-            else -> throw IonDatumException("Unknown type", null, span())
+            val method = method()
+            if (reader.next() == null) {
+                throw IonDatumException("expected value, was null", null, span())
+            }
+            val value = method()
+            if (reader.next() != null) {
+                throw IonDatumException("expected end of s-expression pair", null, span())
+            }
+            reader.stepOut()
+            value
         }
-        return PType.of(code)
+        else -> throw IonDatumException("unknown type", null, span())
     }
 
     /**
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
index 6183e76f8..23ee66330 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
@@ -64,8 +64,14 @@ internal class IonVariant(private var value: AnyElement) : Datum {
             TIMESTAMP -> Datum.timestamp(DateTimeValue.timestamp(value.timestampValue))
             INT -> {
                 val bigInteger = value.bigIntegerValue
-                Datum.bigint(bigInteger.longValueExact())
-                // Datum.decimal(value.bigIntegerValue.toBigDecimal(), 38, 0)
+                when {
+                    bigInteger < Int.MAX_VALUE.toBigInteger() && bigInteger > Int.MIN_VALUE.toBigInteger() -> Datum.integer(bigInteger.toInt())
+                    bigInteger < Long.MAX_VALUE.toBigInteger() && bigInteger > Long.MIN_VALUE.toBigInteger() -> Datum.bigint(bigInteger.toLong())
+                    else -> {
+                        val dec = bigInteger.toBigDecimal()
+                        Datum.decimal(dec, dec.precision(), 0)
+                    }
+                }
             }
             FLOAT -> Datum.doublePrecision(value.doubleValue)
             DECIMAL -> {
@@ -79,6 +85,9 @@ internal class IonVariant(private var value: AnyElement) : Datum {
         }
     }
 
+    /**
+     * This returns the [PType] of a null Ion value, given its [ElementType].
+     */
     private fun ElementType.toPType(): PType {
         val code = when (this) {
             SYMBOL, STRING -> PType.STRING
@@ -86,7 +95,7 @@ internal class IonVariant(private var value: AnyElement) : Datum {
             CLOB -> PType.CLOB
             BLOB -> PType.BLOB
             TIMESTAMP -> PType.TIMESTAMP
-            INT -> PType.DECIMAL
+            INT -> PType.INTEGER
             FLOAT -> PType.DOUBLE
             DECIMAL -> PType.DECIMAL
             LIST, SEXP -> PType.ARRAY
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java
index 9a7355cf8..d86aec9eb 100644
--- a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLIterable.java
@@ -25,7 +25,7 @@ public boolean hasNext() {
 
             @Override
             public PartiQLValue next() {
-                return DatumUtils.toPartiQLValue(iter.next());
+                return ValueUtils.newPartiQLValue(iter.next());
             }
         };
     }
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java
index ea29f2d24..f4ad38340 100644
--- a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PQLToPartiQLStruct.java
@@ -27,7 +27,7 @@ public boolean hasNext() {
             @Override
             public Pair<String, PartiQLValue> next() {
                 Field field = _fields.next();
-                return new Pair<>(field.getName(), DatumUtils.toPartiQLValue(field.getValue()));
+                return new Pair<>(field.getName(), ValueUtils.newPartiQLValue(field.getValue()));
             }
         };
     }
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java
index d835e9b4d..a9f0fd586 100644
--- a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLIterable.java
@@ -31,7 +31,7 @@ public boolean hasNext() {
         @Override
         public Datum next() {
             PartiQLValue value = _value.next();
-            return DatumUtils.toDatum(value);
+            return ValueUtils.newDatum(value);
         }
     }
 }
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java
index 06613f8c8..58cd79f5d 100644
--- a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/PartiQLToPQLStruct.java
@@ -42,7 +42,7 @@ public String getName() {
                 @NotNull
                 @Override
                 public Datum getValue() {
-                    return DatumUtils.toDatum(value.getSecond());
+                    return ValueUtils.newDatum(value.getSecond());
                 }
             };
         }
diff --git a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/ValueUtils.java
similarity index 96%
rename from partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
rename to partiql-spi/src/testFixtures/java/org/partiql/spi/value/ValueUtils.java
index 0ab496959..32d40b7b3 100644
--- a/partiql-spi/src/testFixtures/java/org/partiql/spi/value/DatumUtils.java
+++ b/partiql-spi/src/testFixtures/java/org/partiql/spi/value/ValueUtils.java
@@ -35,14 +35,17 @@
 import static org.partiql.types.PType.UNKNOWN;
 import static org.partiql.types.PType.VARIANT;
 
-public class DatumUtils {
+/**
+ * This internal class contains utility methods pertaining to {@link PartiQLValue} and {@link Datum}.
+ */
+public class ValueUtils {
 
     /**
      * Converts a {@link Datum} into a {@link PartiQLValue}.
      * @return the equivalent {@link PartiQLValue}
      */
     @NotNull
-    public static PartiQLValue toPartiQLValue(@NotNull Datum datum) {
+    public static PartiQLValue newPartiQLValue(@NotNull Datum datum) {
         PType type = datum.getType();
         if (datum.isMissing()) {
             return PartiQL.missingValue();
@@ -97,7 +100,7 @@ public static PartiQLValue toPartiQLValue(@NotNull Datum datum) {
                     return PartiQL.missingValue();
                 }
             case VARIANT:
-                return datum.isNull() ? PartiQL.nullValue() : toPartiQLValue(datum.lower());
+                return datum.isNull() ? PartiQL.nullValue() : newPartiQLValue(datum.lower());
             default:
                 throw new UnsupportedOperationException("Unsupported datum type: " + type);
         }
@@ -109,7 +112,7 @@ public static PartiQLValue toPartiQLValue(@NotNull Datum datum) {
      * @return the equivalent {@link Datum}
      */
     @NotNull
-    public static Datum toDatum(PartiQLValue value) {
+    public static Datum newDatum(PartiQLValue value) {
         PartiQLValueType type = value.getType();
         if (value.isNull()) {
             return new DatumNull(type.toPType());
diff --git a/partiql-types/api/partiql-types.api b/partiql-types/api/partiql-types.api
index cc285661a..1ef003b6d 100644
--- a/partiql-types/api/partiql-types.api
+++ b/partiql-types/api/partiql-types.api
@@ -45,12 +45,16 @@ public abstract class org/partiql/types/PType : org/partiql/types/Enum {
 	public static fun bag ()Lorg/partiql/types/PType;
 	public static fun bag (Lorg/partiql/types/PType;)Lorg/partiql/types/PType;
 	public static fun bigint ()Lorg/partiql/types/PType;
+	public static fun blob ()Lorg/partiql/types/PType;
 	public static fun blob (I)Lorg/partiql/types/PType;
 	public static fun bool ()Lorg/partiql/types/PType;
+	public static fun character ()Lorg/partiql/types/PType;
 	public static fun character (I)Lorg/partiql/types/PType;
+	public static fun clob ()Lorg/partiql/types/PType;
 	public static fun clob (I)Lorg/partiql/types/PType;
 	public static fun codes ()[I
 	public static fun date ()Lorg/partiql/types/PType;
+	public static fun decimal ()Lorg/partiql/types/PType;
 	public static fun decimal (II)Lorg/partiql/types/PType;
 	public static fun doublePrecision ()Lorg/partiql/types/PType;
 	public static fun dynamic ()Lorg/partiql/types/PType;
@@ -61,6 +65,7 @@ public abstract class org/partiql/types/PType : org/partiql/types/Enum {
 	public fun getTypeParameter ()Lorg/partiql/types/PType;
 	public static fun integer ()Lorg/partiql/types/PType;
 	public fun name ()Ljava/lang/String;
+	public static fun numeric ()Lorg/partiql/types/PType;
 	public static fun numeric (II)Lorg/partiql/types/PType;
 	public static fun of (I)Lorg/partiql/types/PType;
 	public static fun real ()Lorg/partiql/types/PType;
@@ -69,12 +74,17 @@ public abstract class org/partiql/types/PType : org/partiql/types/Enum {
 	public static fun smallint ()Lorg/partiql/types/PType;
 	public static fun string ()Lorg/partiql/types/PType;
 	public static fun struct ()Lorg/partiql/types/PType;
+	public static fun time ()Lorg/partiql/types/PType;
 	public static fun time (I)Lorg/partiql/types/PType;
+	public static fun timestamp ()Lorg/partiql/types/PType;
 	public static fun timestamp (I)Lorg/partiql/types/PType;
+	public static fun timestampz ()Lorg/partiql/types/PType;
 	public static fun timestampz (I)Lorg/partiql/types/PType;
+	public static fun timez ()Lorg/partiql/types/PType;
 	public static fun timez (I)Lorg/partiql/types/PType;
 	public static fun tinyint ()Lorg/partiql/types/PType;
 	public static fun unknown ()Lorg/partiql/types/PType;
+	public static fun varchar ()Lorg/partiql/types/PType;
 	public static fun varchar (I)Lorg/partiql/types/PType;
 	public static fun variant (Ljava/lang/String;)Lorg/partiql/types/PType;
 }
diff --git a/partiql-types/src/main/java/org/partiql/types/PType.java b/partiql-types/src/main/java/org/partiql/types/PType.java
index e786441f4..89e351b4c 100644
--- a/partiql-types/src/main/java/org/partiql/types/PType.java
+++ b/partiql-types/src/main/java/org/partiql/types/PType.java
@@ -534,6 +534,14 @@ public static PType numeric(int precision, int scale) {
         return new PTypeDecimal(NUMERIC, precision, scale);
     }
 
+    /**
+     * @return a SQL:1999 NUMERIC type with default precision (38) and scale (0).
+     */
+    @NotNull
+    public static PType numeric() {
+        return new PTypeDecimal(NUMERIC, 38, 0);
+    }
+
     /**
      * @return a PartiQL decimal type
      */
@@ -542,6 +550,14 @@ public static PType decimal(int precision, int scale) {
         return new PTypeDecimal(PType.DECIMAL, precision, scale);
     }
 
+    /**
+     * @return a PartiQL decimal type with default precision (38) and scale (0).
+     */
+    @NotNull
+    public static PType decimal() {
+        return new PTypeDecimal(PType.DECIMAL, 38, 0);
+    }
+
     /**
      * @return a PartiQL real type.
      */
@@ -569,7 +585,16 @@ public static PType character(int length) {
     }
 
     /**
-     * @return a PartiQL char type
+     * @return a PartiQL char type with a default length of 1
+     */
+    @NotNull
+    @SuppressWarnings("unused")
+    public static PType character() {
+        return new PTypeWithMaxLength(CHAR, 1);
+    }
+
+    /**
+     * @return a PartiQL varchar type
      */
     @NotNull
     @SuppressWarnings("unused")
@@ -577,6 +602,15 @@ public static PType varchar(int length) {
         return new PTypeWithMaxLength(VARCHAR, length);
     }
 
+    /**
+     * @return a PartiQL varchar type with a default length of 1
+     */
+    @NotNull
+    @SuppressWarnings("unused")
+    public static PType varchar() {
+        return new PTypeWithMaxLength(VARCHAR, 1);
+    }
+
     /**
      * @return a PartiQL string type
      */
@@ -594,6 +628,14 @@ public static PType clob(int length) {
         return new PTypeWithMaxLength(CLOB, length);
     }
 
+    /**
+     * @return a PartiQL clob type with a default length of {@link Integer#MAX_VALUE}.
+     */
+    @NotNull
+    public static PType clob() {
+        return new PTypeWithMaxLength(CLOB, Integer.MAX_VALUE);
+    }
+
     /**
      * @return a PartiQL blob type
      */
@@ -603,6 +645,14 @@ public static PType blob(int length) {
         return new PTypeWithMaxLength(BLOB, length);
     }
 
+    /**
+     * @return a PartiQL blob type with a default length of {@link Integer#MAX_VALUE}.
+     */
+    @NotNull
+    public static PType blob() {
+        return new PTypeWithMaxLength(BLOB, Integer.MAX_VALUE);
+    }
+
     /**
      * @return a PartiQL date type
      */
@@ -619,6 +669,14 @@ public static PType time(int precision) {
         return new PTypeWithPrecisionOnly(TIME, precision);
     }
 
+    /**
+     * @return a PartiQL time without timezone type with a default precision of 6.
+     */
+    @NotNull
+    public static PType time() {
+        return new PTypeWithPrecisionOnly(TIME, 6);
+    }
+
     /**
      * @return a PartiQL time with timezone type
      */
@@ -628,6 +686,15 @@ public static PType timez(int precision) {
         return new PTypeWithPrecisionOnly(TIMEZ, precision);
     }
 
+    /**
+     * @return a PartiQL time with timezone type with a default precision of 6.
+     */
+    @NotNull
+    @SuppressWarnings("unused")
+    public static PType timez() {
+        return new PTypeWithPrecisionOnly(TIMEZ, 6);
+    }
+
     /**
      * @return a PartiQL timestamp without timezone type
      */
@@ -636,6 +703,14 @@ public static PType timestamp(int precision) {
         return new PTypeWithPrecisionOnly(TIMESTAMP, precision);
     }
 
+    /**
+     * @return a PartiQL timestamp without timezone type with a default precision of 6.
+     */
+    @NotNull
+    public static PType timestamp() {
+        return new PTypeWithPrecisionOnly(TIMESTAMP, 6);
+    }
+
     /**
      * @return a PartiQL timestamp with timezone type
      */
@@ -645,6 +720,15 @@ public static PType timestampz(int precision) {
         return new PTypeWithPrecisionOnly(TIMESTAMPZ, precision);
     }
 
+    /**
+     * @return a PartiQL timestamp with timezone type with a default precision of 6.
+     */
+    @NotNull
+    @SuppressWarnings("unused")
+    public static PType timestampz() {
+        return new PTypeWithPrecisionOnly(TIMESTAMPZ, 6);
+    }
+
     /**
      * @return a PartiQL list type with a component type of dynamic
      */
@@ -745,33 +829,33 @@ public static PType of(int code) throws IllegalArgumentException {
             case BIGINT:
                 return bigint();
             case NUMERIC:
-                return numeric(38, 0);
+                return numeric();
             case DECIMAL:
-                return decimal(38, 0);
+                return decimal();
             case REAL:
                 return real();
             case DOUBLE:
                 return doublePrecision();
             case CHAR:
-                return character(1);
+                return character();
             case VARCHAR:
-                return varchar(1);
+                return varchar();
             case STRING:
                 return string();
             case CLOB:
-                return clob(Integer.MAX_VALUE);
+                return clob();
             case BLOB:
-                return blob(Integer.MAX_VALUE);
+                return blob();
             case DATE:
                 return date();
             case TIME:
-                return time(6);
+                return time();
             case TIMEZ:
-                return timez(6);
+                return timez();
             case TIMESTAMP:
-                return timestamp(6);
+                return timestamp();
             case TIMESTAMPZ:
-                return timestampz(6);
+                return timestampz();
             case ARRAY:
                 return array();
             case BAG:
diff --git a/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt b/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt
index 4eda2b944..43241707d 100644
--- a/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt
+++ b/test/partiql-randomized-tests/src/test/kotlin/org/partiql/lang/randomized/eval/Utils.kt
@@ -6,8 +6,6 @@ import org.partiql.planner.PartiQLPlanner
 import org.partiql.spi.catalog.Catalog
 import org.partiql.spi.catalog.Session
 import org.partiql.spi.value.Datum
-import org.partiql.spi.value.DatumUtils
-import org.partiql.value.PartiQLValue
 import kotlin.test.assertEquals
 
 fun runEvaluatorTestCase(
@@ -19,7 +17,7 @@ fun runEvaluatorTestCase(
     assertEquals(expected, result)
 }
 
-private fun execute(query: String): PartiQLValue {
+private fun execute(query: String): Datum {
     val parser = PartiQLParser.builder().build()
     val planner = PartiQLPlanner.builder().build()
     val catalog = object : Catalog {
@@ -38,7 +36,8 @@ private fun execute(query: String): PartiQLValue {
 }
 
 fun assertExpression(query: String, value: () -> Datum) {
-    val expected = DatumUtils.toPartiQLValue(value.invoke()) // TODO: Make the PartiQL Engine return a Datum, not PartiQL Value
+    val expected = value.invoke()
     val result = execute(query)
-    assertEquals(expected, result)
+    val comparison = Datum.comparator().compare(expected, result)
+    assert(comparison == 0) { "Expected $expected, got $result" }
 }
diff --git a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
index 768ca7298..a70464bca 100644
--- a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
+++ b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/executor/EvalExecutor.kt
@@ -26,7 +26,7 @@ import org.partiql.spi.errors.PErrorException
 import org.partiql.spi.errors.PErrorListener
 import org.partiql.spi.errors.Severity
 import org.partiql.spi.value.Datum
-import org.partiql.spi.value.DatumUtils
+import org.partiql.spi.value.ValueUtils
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
 import org.partiql.value.io.DatumIonReaderBuilder
@@ -93,13 +93,13 @@ class EvalExecutor(
     }
 
     override fun toIon(value: Datum): IonValue {
-        val partiql = DatumUtils.toPartiQLValue(value)
+        val partiql = ValueUtils.newPartiQLValue(value)
         return partiql.toIon().toIonValue(ION)
     }
 
     // TODO: Use DATUM
     override fun compare(actual: Datum, expect: Datum): Boolean {
-        return valueComparison(DatumUtils.toPartiQLValue(actual), DatumUtils.toPartiQLValue(expect))
+        return valueComparison(ValueUtils.newPartiQLValue(actual), ValueUtils.newPartiQLValue(expect))
     }
 
     // Value comparison of PartiQL Value that utilized Ion Hashcode.

From 5a9b63dc9d317a74b2ab89d17534c8c2c36ccdc7 Mon Sep 17 00:00:00 2001
From: John Ed Quinn <johqunn@amazon.com>
Date: Fri, 27 Dec 2024 12:51:10 -0800
Subject: [PATCH 4/4] Addresses PR comments #2

Updates Accumulator to check for variant on number types

Updates internal docs for clarification

Simplifies IonVariant conversion for BigIntegers
---
 .../partiql/eval/internal/helpers/DatumUtils.kt |  2 +-
 .../function/builtins/internal/Accumulator.kt   |  3 +++
 .../org/partiql/spi/value/ion/IonVariant.kt     | 17 +++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt
index 3e3cf110d..369f255e7 100644
--- a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt
+++ b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/helpers/DatumUtils.kt
@@ -9,7 +9,7 @@ internal object DatumUtils {
      * Calls [Datum.lower] if the datum is a variant, otherwise returns the datum. If you don't know whether the value
      * is of type [PType.VARIANT], you should use [Datum.lowerSafe] before invoking whatever methods you intend to use.
      * This is essentially a workaround for the fact that we currently don't know whether a particular expression will be
-     * [PType.VARIANT] or not. This can eventually be optimized to accommodate this.
+     * [PType.VARIANT] or not. The planner/plan can eventually be optimized to accommodate this.
      */
     internal fun Datum.lowerSafe(): Datum {
         return when (this.type.code()) {
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
index 9e3ca87d3..70ced293f 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/internal/Accumulator.kt
@@ -45,6 +45,9 @@ internal fun comparisonAccumulator(comparator: Comparator<Datum>): (Datum?, Datu
     }
 
 internal fun checkIsNumberType(funcName: String, value: Datum) {
+    if (value.type.code() == PType.VARIANT) {
+        return checkIsNumberType(funcName, value.lower())
+    }
     if (!value.type.isNumber()) {
         throw TypeCheckException("Expected NUMBER but received ${value.type}.")
     }
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
index 23ee66330..90d3a586b 100644
--- a/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
+++ b/partiql-spi/src/main/kotlin/org/partiql/spi/value/ion/IonVariant.kt
@@ -16,6 +16,7 @@ import com.amazon.ionelement.api.ElementType.STRING
 import com.amazon.ionelement.api.ElementType.STRUCT
 import com.amazon.ionelement.api.ElementType.SYMBOL
 import com.amazon.ionelement.api.ElementType.TIMESTAMP
+import com.amazon.ionelement.api.IntElementSize
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.Field
 import org.partiql.types.PType
@@ -63,12 +64,16 @@ internal class IonVariant(private var value: AnyElement) : Datum {
             BLOB -> Datum.blob(value.blobValue.copyOfBytes())
             TIMESTAMP -> Datum.timestamp(DateTimeValue.timestamp(value.timestampValue))
             INT -> {
-                val bigInteger = value.bigIntegerValue
-                when {
-                    bigInteger < Int.MAX_VALUE.toBigInteger() && bigInteger > Int.MIN_VALUE.toBigInteger() -> Datum.integer(bigInteger.toInt())
-                    bigInteger < Long.MAX_VALUE.toBigInteger() && bigInteger > Long.MIN_VALUE.toBigInteger() -> Datum.bigint(bigInteger.toLong())
-                    else -> {
-                        val dec = bigInteger.toBigDecimal()
+                when (value.integerSize) {
+                    IntElementSize.LONG -> {
+                        val long = value.longValue
+                        when (long < Int.MAX_VALUE && long > Int.MIN_VALUE) {
+                            true -> Datum.integer(long.toInt())
+                            false -> Datum.bigint(long)
+                        }
+                    }
+                    IntElementSize.BIG_INTEGER -> {
+                        val dec = value.bigIntegerValue.toBigDecimal()
                         Datum.decimal(dec, dec.precision(), 0)
                     }
                 }