Array and Map not wrapped in Nullable

ClickHouse · Mar 26, 2024 · 03b7613 · 03b7613
1 parent 71d8e01
commit 03b7613
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/spark-3.3/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala b/spark-3.3/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala
@@ -110,7 +110,7 @@ object SchemaUtils {
       }
 
   private[clickhouse] def maybeNullable(chType: String, nullable: Boolean): String =
-    if (nullable) wrapNullable(chType) else chType
+    if (nullable && !chType.startsWith("Array") && !chType.startsWith("Map")) wrapNullable(chType) else chType
 
   private[clickhouse] def wrapNullable(chType: String): String = s"Nullable($chType)"
 }
diff --git a/spark-3.4/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala b/spark-3.4/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala
@@ -110,7 +110,7 @@ object SchemaUtils {
       }
 
   private[clickhouse] def maybeNullable(chType: String, nullable: Boolean): String =
-    if (nullable) wrapNullable(chType) else chType
+    if (nullable && !chType.startsWith("Array") && !chType.startsWith("Map")) wrapNullable(chType) else chType
 
   private[clickhouse] def wrapNullable(chType: String): String = s"Nullable($chType)"
 }
diff --git a/spark-3.5/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala b/spark-3.5/clickhouse-spark/src/main/scala/org/apache/spark/sql/clickhouse/SchemaUtils.scala
@@ -110,7 +110,7 @@ object SchemaUtils {
       }
 
   private[clickhouse] def maybeNullable(chType: String, nullable: Boolean): String =
-    if (nullable) wrapNullable(chType) else chType
+    if (nullable && !chType.startsWith("Array") && !chType.startsWith("Map")) wrapNullable(chType) else chType
 
   private[clickhouse] def wrapNullable(chType: String): String = s"Nullable($chType)"
 }