wip; fix typing and overflow behavior of SUM and AVG; still have clea…

…nup to do
partiql · Jan 24, 2025 · c841580 · c841580
1 parent f004d3e
commit c841580
Show file tree

Hide file tree

Showing 25 changed files with 347 additions and 249 deletions.
diff --git a/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTestsPorted.kt b/partiql-planner/src/test/kotlin/org/partiql/planner/internal/typer/PlanTyperTestsPorted.kt
@@ -3332,7 +3332,7 @@ internal class PlanTyperTestsPorted {
                             "a" to StaticType.INT4,
                             "_1" to StaticType.INT8,
                             "_2" to StaticType.INT8,
-                            "_3" to StaticType.INT4,
+                            "_3" to StaticType.INT8,
                             "_4" to StaticType.INT4,
                             "_5" to StaticType.INT4,
                         ),
@@ -3354,7 +3354,7 @@ internal class PlanTyperTestsPorted {
                             "a" to StaticType.INT4,
                             "c_s" to StaticType.INT8,
                             "c" to StaticType.INT8,
-                            "s" to StaticType.INT4,
+                            "s" to StaticType.INT8,
                             "m" to StaticType.INT4,
                         ),
                         contentClosed = true,

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/AggAvg.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/AggAvg.kt
@@ -9,20 +9,20 @@ import org.partiql.spi.function.builtins.internal.AccumulatorAvg
 import org.partiql.spi.types.PType
 
 // TODO: This needs to be formalized. See https://github.com/partiql/partiql-lang-kotlin/issues/1659
-private val AVG_DECIMAL = PType.decimal(38, 19)
+private val AVG_DECIMAL = DefaultDecimal.DECIMAL
 
 internal val Agg_AVG__INT8__INT8 = Aggregation.static(
     name = "avg",
     returns = AVG_DECIMAL,
     parameters = arrayOf(Parameter("value", PType.tinyint())),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_AVG__INT16__INT16 = Aggregation.static(
     name = "avg",
     returns = AVG_DECIMAL,
     parameters = arrayOf(Parameter("value", PType.smallint())),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_AVG__INT32__INT32 = Aggregation.static(
@@ -32,7 +32,7 @@ internal val Agg_AVG__INT32__INT32 = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", PType.integer()),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_AVG__INT64__INT64 = Aggregation.static(
@@ -42,7 +42,7 @@ internal val Agg_AVG__INT64__INT64 = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", PType.bigint()),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_AVG__NUMERIC__NUMERIC = Aggregation.static(
@@ -52,7 +52,7 @@ internal val Agg_AVG__NUMERIC__NUMERIC = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", DefaultNumeric.NUMERIC),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_AVG__DECIMAL_ARBITRARY__DECIMAL_ARBITRARY = Aggregation.static(
@@ -62,7 +62,7 @@ internal val Agg_AVG__DECIMAL_ARBITRARY__DECIMAL_ARBITRARY = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", AVG_DECIMAL),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_AVG__FLOAT32__FLOAT32 = Aggregation.static(
@@ -72,7 +72,7 @@ internal val Agg_AVG__FLOAT32__FLOAT32 = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", PType.real()),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(PType.doublePrecision()) },
 )
 
 internal val Agg_AVG__FLOAT64__FLOAT64 = Aggregation.static(
@@ -82,7 +82,7 @@ internal val Agg_AVG__FLOAT64__FLOAT64 = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", PType.doublePrecision()),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(PType.doublePrecision()) },
 )
 
 internal val Agg_AVG__ANY__ANY = Aggregation.static(
@@ -92,5 +92,5 @@ internal val Agg_AVG__ANY__ANY = Aggregation.static(
     parameters = arrayOf(
         Parameter("value", PType.dynamic()),
     ),
-    accumulator = ::AccumulatorAvg,
+    accumulator = { AccumulatorAvg(PType.dynamic()) },
 )
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/AggSum.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/AggSum.kt
@@ -10,38 +10,38 @@ import org.partiql.spi.types.PType
 
 internal val Agg_SUM__INT8__INT8 = Aggregation.static(
     name = "sum",
-    returns = PType.tinyint(),
+    returns = PType.bigint(),
     parameters = arrayOf(
         Parameter("value", PType.tinyint()),
     ),
-    accumulator = { AccumulatorSum(PType.tinyint()) },
+    accumulator = { AccumulatorSum(PType.bigint()) },
 )
 
 internal val Agg_SUM__INT16__INT16 = Aggregation.static(
     name = "sum",
-    returns = PType.smallint(),
+    returns = PType.bigint(),
     parameters = arrayOf(
         Parameter("value", PType.smallint()),
     ),
-    accumulator = { AccumulatorSum(PType.smallint()) },
+    accumulator = { AccumulatorSum(PType.bigint()) },
 )
 
 internal val Agg_SUM__INT32__INT32 = Aggregation.static(
     name = "sum",
-    returns = PType.integer(),
+    returns = PType.bigint(),
     parameters = arrayOf(
         Parameter("value", PType.integer()),
     ),
-    accumulator = { AccumulatorSum(PType.integer()) },
+    accumulator = { AccumulatorSum(PType.bigint()) },
 )
 
 internal val Agg_SUM__INT64__INT64 = Aggregation.static(
     name = "sum",
-    returns = PType.bigint(),
+    returns = DefaultDecimal.DECIMAL,
     parameters = arrayOf(
         Parameter("value", PType.bigint())
     ),
-    accumulator = { AccumulatorSum(PType.bigint()) },
+    accumulator = { AccumulatorSum(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_SUM__NUMERIC__NUMERIC = Aggregation.static(
@@ -55,11 +55,11 @@ internal val Agg_SUM__NUMERIC__NUMERIC = Aggregation.static(
 
 internal val Agg_SUM__DECIMAL_ARBITRARY__DECIMAL_ARBITRARY = Aggregation.static(
     name = "sum",
-    returns = PType.decimal(38, 19),
+    returns = DefaultDecimal.DECIMAL,
     parameters = arrayOf(
         Parameter("value", PType.decimal(38, 19)), // TODO: Rewrite aggregations using new function modeling.
     ),
-    accumulator = { AccumulatorSum(PType.decimal(38, 19)) },
+    accumulator = { AccumulatorSum(DefaultDecimal.DECIMAL) },
 )
 
 internal val Agg_SUM__FLOAT32__FLOAT32 = Aggregation.static(

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/DefaultDecimal.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/DefaultDecimal.kt
@@ -0,0 +1,8 @@
+package org.partiql.spi.function.builtins
+
+import org.partiql.spi.types.PType
+
+internal object DefaultDecimal {
+    // TODO: Once all functions are converted to use the new function modeling, this can be removed.
+    val DECIMAL: PType = PType.decimal(38, 19)
+}
diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnDivide.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnDivide.kt
@@ -6,7 +6,7 @@ package org.partiql.spi.function.builtins
 import org.partiql.spi.function.Function
 import org.partiql.spi.function.builtins.internal.PErrors
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.isZero
+import org.partiql.spi.utils.NumberUtils.isZero
 import org.partiql.spi.value.Datum
 import java.math.RoundingMode
 

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnGt.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnGt.kt
@@ -5,7 +5,7 @@ package org.partiql.spi.function.builtins
 
 import org.partiql.spi.function.Function
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.compareTo
+import org.partiql.spi.utils.NumberUtils.compareTo
 import org.partiql.spi.value.Datum
 
 internal object FnGt : DiadicComparisonOperator("gt") {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnGte.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnGte.kt
@@ -5,7 +5,7 @@ package org.partiql.spi.function.builtins
 
 import org.partiql.spi.function.Function
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.compareTo
+import org.partiql.spi.utils.NumberUtils.compareTo
 import org.partiql.spi.value.Datum
 
 internal object FnGte : DiadicComparisonOperator("gte") {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnIsFalse.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnIsFalse.kt
@@ -4,9 +4,9 @@
 package org.partiql.spi.function.builtins
 
 import org.partiql.spi.function.Parameter
-import org.partiql.spi.function.builtins.internal.booleanValue
 import org.partiql.spi.types.PType
 import org.partiql.spi.utils.FunctionUtils
+import org.partiql.spi.utils.FunctionUtils.booleanValue
 import org.partiql.spi.value.Datum
 
 /**

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnIsTrue.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnIsTrue.kt
@@ -4,9 +4,9 @@
 package org.partiql.spi.function.builtins
 
 import org.partiql.spi.function.Parameter
-import org.partiql.spi.function.builtins.internal.booleanValue
 import org.partiql.spi.types.PType
 import org.partiql.spi.utils.FunctionUtils
+import org.partiql.spi.utils.FunctionUtils.booleanValue
 import org.partiql.spi.value.Datum
 
 /**

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnLt.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnLt.kt
@@ -5,7 +5,7 @@ package org.partiql.spi.function.builtins
 
 import org.partiql.spi.function.Function
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.compareTo
+import org.partiql.spi.utils.NumberUtils.compareTo
 import org.partiql.spi.value.Datum
 
 internal object FnLt : DiadicComparisonOperator("lt") {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnLte.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnLte.kt
@@ -5,7 +5,7 @@ package org.partiql.spi.function.builtins
 
 import org.partiql.spi.function.Function
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.compareTo
+import org.partiql.spi.utils.NumberUtils.compareTo
 import org.partiql.spi.value.Datum
 
 internal object FnLte : DiadicComparisonOperator("lte") {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnMinus.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnMinus.kt
@@ -7,8 +7,8 @@ import org.partiql.spi.function.Function
 import org.partiql.spi.function.Parameter
 import org.partiql.spi.function.builtins.internal.PErrors
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.byteOverflows
-import org.partiql.spi.utils.NumberExtensions.shortOverflows
+import org.partiql.spi.utils.NumberUtils.byteOverflows
+import org.partiql.spi.utils.NumberUtils.shortOverflows
 import org.partiql.spi.value.Datum
 
 internal object FnMinus : DiadicArithmeticOperator("minus") {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnModulo.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnModulo.kt
@@ -6,7 +6,7 @@ package org.partiql.spi.function.builtins
 import org.partiql.spi.function.Function
 import org.partiql.spi.function.builtins.internal.PErrors
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.isZero
+import org.partiql.spi.utils.NumberUtils.isZero
 import org.partiql.spi.value.Datum
 
 internal object FnModulo : DiadicArithmeticOperator("mod", false) {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnPlus.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnPlus.kt
@@ -7,8 +7,8 @@ import org.partiql.spi.function.Function
 import org.partiql.spi.function.Parameter
 import org.partiql.spi.function.builtins.internal.PErrors
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.byteOverflows
-import org.partiql.spi.utils.NumberExtensions.shortOverflows
+import org.partiql.spi.utils.NumberUtils.byteOverflows
+import org.partiql.spi.utils.NumberUtils.shortOverflows
 import org.partiql.spi.value.Datum
 
 internal object FnPlus : DiadicArithmeticOperator("plus") {

diff --git a/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnTimes.kt b/partiql-spi/src/main/kotlin/org/partiql/spi/function/builtins/FnTimes.kt
@@ -6,8 +6,8 @@ package org.partiql.spi.function.builtins
 import org.partiql.spi.function.Function
 import org.partiql.spi.function.builtins.internal.PErrors
 import org.partiql.spi.types.PType
-import org.partiql.spi.utils.NumberExtensions.byteOverflows
-import org.partiql.spi.utils.NumberExtensions.shortOverflows
+import org.partiql.spi.utils.NumberUtils.byteOverflows
+import org.partiql.spi.utils.NumberUtils.shortOverflows
 import org.partiql.spi.value.Datum
 
 internal object FnTimes : DiadicArithmeticOperator("times") {