Spark: Add int long BigInteger cases for Decimal (ClickHouse#266)

Co-authored-by: eye <eye.gu@aloudata.com>
camper42 · Aug 10, 2023 · 821adcc · 821adcc
1 parent 4ea03f8
commit 821adcc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...3/clickhouse-spark/src/main/scala/xenon/clickhouse/read/format/ClickHouseJsonReader.scala b/...3/clickhouse-spark/src/main/scala/xenon/clickhouse/read/format/ClickHouseJsonReader.scala
@@ -70,6 +70,12 @@ class ClickHouseJsonReader(
         Decimal(jsonNode.decimalValue, d.precision, d.scale)
       case d: DecimalType if jsonNode.isFloat | jsonNode.isDouble =>
         Decimal(BigDecimal(jsonNode.doubleValue, new MathContext(d.precision)), d.precision, d.scale)
+      case d: DecimalType if jsonNode.isInt =>
+        Decimal(BigDecimal(jsonNode.intValue, new MathContext(d.precision)), d.precision, d.scale)
+      case d: DecimalType if jsonNode.isLong =>
+        Decimal(BigDecimal(jsonNode.longValue, new MathContext(d.precision)), d.precision, d.scale)
+      case d: DecimalType if jsonNode.isBigInteger =>
+        Decimal(BigDecimal(jsonNode.bigIntegerValue, new MathContext(d.precision)), d.precision, d.scale)
       case d: DecimalType =>
         Decimal(BigDecimal(jsonNode.textValue, new MathContext(d.precision)), d.precision, d.scale)
       case TimestampType =>

diff --git a/...4/clickhouse-spark/src/main/scala/xenon/clickhouse/read/format/ClickHouseJsonReader.scala b/...4/clickhouse-spark/src/main/scala/xenon/clickhouse/read/format/ClickHouseJsonReader.scala
@@ -70,6 +70,12 @@ class ClickHouseJsonReader(
         Decimal(jsonNode.decimalValue, d.precision, d.scale)
       case d: DecimalType if jsonNode.isFloat | jsonNode.isDouble =>
         Decimal(BigDecimal(jsonNode.doubleValue, new MathContext(d.precision)), d.precision, d.scale)
+      case d: DecimalType if jsonNode.isInt =>
+        Decimal(BigDecimal(jsonNode.intValue, new MathContext(d.precision)), d.precision, d.scale)
+      case d: DecimalType if jsonNode.isLong =>
+        Decimal(BigDecimal(jsonNode.longValue, new MathContext(d.precision)), d.precision, d.scale)
+      case d: DecimalType if jsonNode.isBigInteger =>
+        Decimal(BigDecimal(jsonNode.bigIntegerValue, new MathContext(d.precision)), d.precision, d.scale)
       case d: DecimalType =>
         Decimal(BigDecimal(jsonNode.textValue, new MathContext(d.precision)), d.precision, d.scale)
       case TimestampType =>