address comments

partiql · Jan 24, 2024 · c50fde3 · c50fde3
1 parent 7ef78e3
commit c50fde3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/PartiQLEngine.kt
@@ -37,7 +37,7 @@ public interface PartiQLEngine {
     }
 
     public class Session @OptIn(PartiQLFunctionExperimental::class) constructor(
-        var bindings: MutableMap<String, ConnectorBindings> = mutableMapOf(),
-        val functions: MutableMap<String, List<PartiQLFunction>> = mutableMapOf()
+        val bindings: Map<String, ConnectorBindings> = mapOf(),
+        val functions: Map<String, List<PartiQLFunction>> = mapOf()
     )
 }
diff --git a/partiql-eval/src/main/kotlin/org/partiql/eval/internal/Compiler.kt b/partiql-eval/src/main/kotlin/org/partiql/eval/internal/Compiler.kt
@@ -137,15 +137,11 @@ internal class Compiler(
         val args = node.args.map { visitRex(it, ctx) }
         val matches = session.functions
             .flatMap { it.value }
+            .filterIsInstance<PartiQLFunction.Scalar>()
             .filter { it.signature == fn }
         return when (matches.size) {
             0 -> error("no match")
-            1 -> {
-                when (val call = matches.first()) {
-                    is PartiQLFunction.Aggregation -> error("expect scalar func")
-                    is PartiQLFunction.Scalar -> ExprCall(call, args.toTypedArray())
-                }
-            }
+            1 -> ExprCall(matches.first(), args.toTypedArray())
             else -> error("multiple math")
         }
     }

diff --git a/partiql-planner/src/main/kotlin/org/partiql/planner/internal/Env.kt b/partiql-planner/src/main/kotlin/org/partiql/planner/internal/Env.kt
@@ -20,7 +20,6 @@ import org.partiql.spi.connector.ConnectorMetadata
 import org.partiql.spi.connector.ConnectorObjectHandle
 import org.partiql.spi.connector.ConnectorObjectPath
 import org.partiql.spi.connector.ConnectorSession
-import org.partiql.types.AnyType
 import org.partiql.types.StaticType
 import org.partiql.value.PartiQLValueExperimental
 import org.partiql.value.stringValue

diff --git a/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/test/TestRunner.kt b/test/partiql-tests-runner/src/test/kotlin/org/partiql/runner/test/TestRunner.kt
@@ -46,7 +46,7 @@ class TestRunner<T, V>(private val factory: TestExecutor.Factory<T, V>) {
             }
         } catch (e: Exception) {
             when (case.assertion) {
-                is Assertion.EvaluationSuccess -> error("Expected success but exception thrown: $e}")
+                is Assertion.EvaluationSuccess -> error("Expected success but exception thrown: $e")
                 is Assertion.EvaluationFailure -> {} // skip
             }
         }