Removes sexp and symbol from PType and Datum

partiql · Nov 15, 2024 · a6b7dd8 · a6b7dd8
1 parent 894e443
commit a6b7dd8
Show file tree

Hide file tree

Showing 86 changed files with 748 additions and 3,019 deletions.
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/compiler/StandardCompiler.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/compiler/StandardCompiler.kt
@@ -350,7 +350,7 @@ internal class StandardCompiler(strategies: List<Strategy>) : PartiQLCompiler {
             // Compile the candidates
             val candidates = Array(functions.size) {
                 val fn = functions[it]
-                val fnArity = fn.parameters.size
+                val fnArity = fn.getParameters().size
                 if (arity == -1) {
                     // set first
                     arity = fnArity

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
@@ -51,7 +51,7 @@ internal object ValueUtility {
      */
     fun Datum.getText(): String {
         return when (this.type.kind) {
-            PType.Kind.STRING, PType.Kind.SYMBOL, PType.Kind.CHAR -> this.string
+            PType.Kind.STRING, PType.Kind.CHAR -> this.string
             else -> throw TypeCheckException("Expected text, but received ${this.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
@@ -81,7 +81,7 @@ internal class RelOpExclude(
      */
     private fun Datum.exclude(exclusions: List<Exclusion.Item>): Datum = when (this.type.kind) {
         PType.Kind.ROW, PType.Kind.STRUCT -> this.structExclude(exclusions)
-        PType.Kind.BAG, PType.Kind.ARRAY, PType.Kind.SEXP -> this.collExclude(exclusions)
+        PType.Kind.BAG, PType.Kind.ARRAY -> this.collExclude(exclusions)
         else -> this
     }
 
@@ -140,7 +140,6 @@ internal class RelOpExclude(
         return when (type.kind) {
             PType.Kind.ARRAY -> Datum.array(coll)
             PType.Kind.BAG -> Datum.bag(coll)
-            PType.Kind.SEXP -> Datum.sexp(coll)
             else -> error("Collection type required")
         }
     }
@@ -173,7 +172,7 @@ internal class RelOpExclude(
             // apply exclusions to subtree
             var value = element
             // apply collection index exclusions at deeper levels for lists and sexps
-            if (type.kind == PType.Kind.ARRAY || type.kind == PType.Kind.SEXP) {
+            if (type.kind == PType.Kind.ARRAY) {
                 branches.getCollIndex(i)?.let {
                     value = value.exclude(it.getItems())
                 }

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
@@ -23,7 +23,7 @@ internal class RelOpIterate(
                 close()
                 throw TypeCheckException()
             }
-            PType.Kind.ARRAY, PType.Kind.SEXP -> r.iterator()
+            PType.Kind.ARRAY -> r.iterator()
             else -> {
                 close()
                 throw TypeCheckException()

diff --git a/...iql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt b/...iql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rel/RelOpIteratePermissive.kt
@@ -23,7 +23,7 @@ internal class RelOpIteratePermissive(
                 isIndexable = false
                 r.iterator()
             }
-            PType.Kind.ARRAY, PType.Kind.SEXP -> r.iterator()
+            PType.Kind.ARRAY -> r.iterator()
             else -> {
                 isIndexable = false
                 iterator { yield(r) }

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
@@ -17,7 +17,7 @@ internal class RelOpScan(
     override fun open(env: Environment) {
         val r = expr.eval(env.push(Row()))
         records = when (r.type.kind) {
-            PType.Kind.ARRAY, PType.Kind.BAG, PType.Kind.SEXP -> RecordValueIterator(r.iterator())
+            PType.Kind.ARRAY, PType.Kind.BAG -> RecordValueIterator(r.iterator())
             else -> {
                 close()
                 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
@@ -16,7 +16,7 @@ internal class RelOpScanPermissive(
     override fun open(env: Environment) {
         val r = expr.eval(env.push(Row()))
         records = when (r.type.kind) {
-            PType.Kind.BAG, PType.Kind.ARRAY, PType.Kind.SEXP -> RecordValueIterator(r.iterator())
+            PType.Kind.BAG, PType.Kind.ARRAY -> RecordValueIterator(r.iterator())
             else -> iterator { yield(Row(arrayOf(r))) }
         }
     }

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
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
@@ -8,6 +8,7 @@ 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
 import org.partiql.spi.function.Function
+import org.partiql.spi.function.Parameter
 import org.partiql.spi.value.Datum
 import org.partiql.types.PType
 import org.partiql.value.PartiQLValue
@@ -31,7 +32,7 @@ import org.partiql.value.PartiQLValue
  */
 internal class ExprCallDynamic(
     private val name: String,
-    private val functions: Array<Function.Instance>,
+    private val functions: Array<Function>,
     private val args: Array<ExprValue>
 ) : ExprValue {
 
@@ -48,7 +49,7 @@ internal class ExprCallDynamic(
      *
      * TODO actually make this an array instead of lists.
      */
-    private val paramTypes: List<List<PType>> = functions.map { c -> c.parameters.toList() }
+    private val paramTypes: List<List<Parameter>> = functions.map { c -> c.getParameters().toList() }
 
     /**
      * @property paramFamilies is a two-dimensional array.
@@ -58,7 +59,7 @@ internal class ExprCallDynamic(
      *
      * TODO actually make this an array instead of lists.
      */
-    private val paramFamilies: List<List<CoercionFamily>> = functions.map { c -> c.parameters.map { p -> family(p.kind) } }
+    private val paramFamilies: List<List<CoercionFamily>> = functions.map { c -> c.getParameters().map { p -> family(p.getType().kind) } }
 
     /**
      * A memoization cache for the [match] function.
@@ -92,7 +93,7 @@ internal class ExprCallDynamic(
             for (paramIndex in paramIndices) {
                 val argType = args[paramIndex]
                 val paramType = paramTypes[candidateIndex][paramIndex]
-                if (paramType == argType) { currentExactMatches++ }
+                if (paramType.getMatch(argType) == argType) { currentExactMatches++ }
                 val argFamily = argFamilies[paramIndex]
                 val paramFamily = paramFamilies[candidateIndex][paramIndex]
                 if (paramFamily != argFamily && argFamily != CoercionFamily.UNKNOWN && paramFamily != CoercionFamily.DYNAMIC) { return@forEach }
@@ -102,7 +103,7 @@ internal class ExprCallDynamic(
                 exactMatches = currentExactMatches
             }
         }
-        return if (currentMatch == null) null else Candidate(functions[currentMatch!!])
+        return if (currentMatch == null) null else Candidate(functions[currentMatch!!].getInstance(args.toTypedArray()))
     }
 
     /**
@@ -145,7 +146,6 @@ internal class ExprCallDynamic(
                 PType.Kind.REAL -> CoercionFamily.NUMBER
                 PType.Kind.DOUBLE -> CoercionFamily.NUMBER
                 PType.Kind.DECIMAL -> CoercionFamily.NUMBER
-                PType.Kind.DECIMAL_ARBITRARY -> CoercionFamily.NUMBER
                 PType.Kind.STRING -> CoercionFamily.STRING
                 PType.Kind.BOOL -> CoercionFamily.BOOLEAN
                 PType.Kind.TIMEZ -> CoercionFamily.TIME
@@ -155,13 +155,11 @@ internal class ExprCallDynamic(
                 PType.Kind.DATE -> CoercionFamily.DATE
                 PType.Kind.STRUCT -> CoercionFamily.STRUCTURE
                 PType.Kind.ARRAY -> CoercionFamily.COLLECTION
-                PType.Kind.SEXP -> CoercionFamily.COLLECTION
                 PType.Kind.BAG -> CoercionFamily.COLLECTION
                 PType.Kind.ROW -> CoercionFamily.STRUCTURE
                 PType.Kind.CHAR -> CoercionFamily.STRING
                 PType.Kind.VARCHAR -> CoercionFamily.STRING
                 PType.Kind.DYNAMIC -> DYNAMIC // TODO: REMOVE
-                PType.Kind.SYMBOL -> CoercionFamily.STRING
                 PType.Kind.BLOB -> CoercionFamily.BINARY
                 PType.Kind.CLOB -> CoercionFamily.STRING
                 PType.Kind.UNKNOWN -> UNKNOWN // TODO: REMOVE

diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathIndex.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/operator/rex/ExprPathIndex.kt
@@ -16,8 +16,7 @@ internal class ExprPathIndex(
         val input = root.eval(env)
         val iterator = when (input.type.kind) {
             PType.Kind.BAG,
-            PType.Kind.ARRAY,
-            PType.Kind.SEXP -> input.iterator()
+            PType.Kind.ARRAY -> input.iterator()
             else -> throw TypeCheckException("expected collection, found ${input.type.kind}")
         }
 

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
@@ -32,7 +32,7 @@ internal class ExprStructPermissive(private val fields: List<ExprStructField>) :
                 return null
             }
             return when (this.type.kind) {
-                PType.Kind.STRING, PType.Kind.SYMBOL, PType.Kind.CHAR -> this.string
+                PType.Kind.STRING, PType.Kind.CHAR -> this.string
                 else -> 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
@@ -32,7 +32,6 @@ import org.partiql.value.missingValue
 import org.partiql.value.nullValue
 import org.partiql.value.stringValue
 import org.partiql.value.structValue
-import org.partiql.value.symbolValue
 import java.io.ByteArrayOutputStream
 import java.math.BigDecimal
 import kotlin.test.assertEquals
@@ -123,12 +122,6 @@ class PartiQLEvaluatorTest {
                     decimalValue(BigDecimal.valueOf(3000, 1)),
                 )
             ),
-            SuccessTestCase(
-                input = """
-                    CAST(20 AS SYMBOL);
-                """.trimIndent(),
-                expected = symbolValue("20"),
-            ),
             // TODO: Use Datum for assertions. Currently, PartiQLValue doesn't support parameterized CHAR/VARCHAR
 //            SuccessTestCase(
 //                input = """
@@ -1396,7 +1389,7 @@ class PartiQLEvaluatorTest {
             try {
                 val (strictResult, _) = run(mode = Mode.STRICT())
                 when (strictResult.type.kind) {
-                    PType.Kind.BAG, PType.Kind.ARRAY, PType.Kind.SEXP -> strictResult.toList()
+                    PType.Kind.BAG, PType.Kind.ARRAY -> strictResult.toList()
                     else -> strictResult
                 }
             } catch (e: Throwable) {

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
@@ -8,6 +8,7 @@ import org.junit.jupiter.params.provider.MethodSource
 import org.partiql.eval.Environment
 import org.partiql.eval.internal.helpers.ValueUtility.check
 import org.partiql.spi.function.Function
+import org.partiql.spi.function.Parameter
 import org.partiql.spi.value.Datum
 import org.partiql.spi.value.Datum.array
 import org.partiql.spi.value.Datum.bag
@@ -62,12 +63,29 @@ class ExprCallDynamicTest {
             )
 
             @OptIn(PartiQLValueExperimental::class)
-            internal val functions: Array<Function.Instance> = params.mapIndexed { index, it ->
-                object : Function.Instance(
-                    returns = PType.integer(),
-                    parameters = arrayOf(it.first.toPType(), it.second.toPType())
-                ) {
-                    override fun invoke(args: Array<Datum>): Datum = integer(index)
+            internal val functions: Array<Function> = params.mapIndexed { index, it ->
+                object : Function {
+
+                    override fun getName(): String {
+                        return "example"
+                    }
+
+                    override fun getParameters(): Array<Parameter> {
+                        return arrayOf(Parameter("lhs", it.first.toPType()), Parameter("rhs", it.second.toPType()))
+                    }
+
+                    override fun getReturnType(args: Array<PType>): PType {
+                        return PType.integer()
+                    }
+
+                    override fun getInstance(args: Array<PType>): Function.Instance {
+                        return object : Function.Instance(
+                            returns = PType.integer(),
+                            parameters = arrayOf(it.first.toPType(), it.second.toPType())
+                        ) {
+                            override fun invoke(args: Array<Datum>): Datum = integer(index)
+                        }
+                    }
                 }
             }.toTypedArray()
         }

diff --git a/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt b/partiql-parser/src/main/kotlin/org/partiql/parser/internal/PartiQLParserDefault.kt
@@ -1466,7 +1466,8 @@ internal class PartiQLParserDefault : PartiQLParser {
         }
 
         override fun visitSequenceConstructor(ctx: GeneratedParser.SequenceConstructorContext) = translate(ctx) {
-            error("Sequence constructor not supported")
+            val expressions = visitOrEmpty<Expr>(ctx.expr())
+            exprArray(expressions)
         }
 
         private fun PathStep.copy(next: PathStep?) = when (this) {

diff --git a/partiql-plan/src/main/kotlin/org/partiql/plan/builder/PlanFactory.kt b/partiql-plan/src/main/kotlin/org/partiql/plan/builder/PlanFactory.kt
@@ -395,7 +395,7 @@ public interface PlanFactory {
      * @param args
      * @return
      */
-    public fun rexCallDynamic(name: String, functions: List<Function.Instance>, args: List<Rex>): RexCallDynamic =
+    public fun rexCallDynamic(name: String, functions: List<Function>, args: List<Rex>): RexCallDynamic =
         RexCallDynamicImpl(name, functions, args)
 
     /**

diff --git a/partiql-plan/src/main/kotlin/org/partiql/plan/rex/RexCallDynamic.kt b/partiql-plan/src/main/kotlin/org/partiql/plan/rex/RexCallDynamic.kt
@@ -16,7 +16,7 @@ public interface RexCallDynamic : Rex {
     /**
      * Returns the functions to dispatch to.
      */
-    public fun getFunctions(): List<Function.Instance>
+    public fun getFunctions(): List<Function>
 
     /**
      * Returns the list of function arguments.
@@ -33,7 +33,7 @@ public interface RexCallDynamic : Rex {
  */
 internal class RexCallDynamicImpl(
     private var name: String,
-    private var functions: List<Function.Instance>,
+    private var functions: List<Function>,
     private var args: List<Rex>,
 ) : RexCallDynamic {
 
@@ -42,7 +42,7 @@ internal class RexCallDynamicImpl(
 
     override fun getName(): String = name
 
-    override fun getFunctions(): List<Function.Instance> = functions
+    override fun getFunctions(): List<Function> = functions
 
     override fun getArgs(): List<Rex> = args
 

diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnComparator.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/FnComparator.kt
@@ -57,10 +57,8 @@ internal object FnComparator : Comparator<Function> {
         Kind.DECIMAL,
         Kind.REAL,
         Kind.DOUBLE,
-        Kind.DECIMAL_ARBITRARY, // Arbitrary precision decimal has a higher precedence than FLOAT
         Kind.CHAR,
         Kind.VARCHAR,
-        Kind.SYMBOL,
         Kind.STRING,
         Kind.CLOB,
         Kind.BLOB,
@@ -70,7 +68,6 @@ internal object FnComparator : Comparator<Function> {
         Kind.TIMESTAMP,
         Kind.TIMESTAMPZ,
         Kind.ARRAY,
-        Kind.SEXP,
         Kind.BAG,
         Kind.ROW,
         Kind.STRUCT,