diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala index c406ba0707b3a..79b2985adc1de 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala @@ -32,7 +32,7 @@ import java.time.{Duration, Instant, LocalDate, LocalDateTime, Period, ZoneOffse import java.util import java.util.Objects -import scala.collection.mutable +import scala.collection.{immutable, mutable} import scala.math.{BigDecimal, BigInt} import scala.reflect.runtime.universe.TypeTag import scala.util.Try @@ -91,6 +91,7 @@ object Literal { case p: Period => Literal(periodToMonths(p), YearMonthIntervalType()) case a: Array[Byte] => Literal(a, BinaryType) case a: mutable.ArraySeq[_] => apply(a.array) + case a: immutable.ArraySeq[_] => apply(a.unsafeArray) case a: Array[_] => val elementType = componentTypeToDataType(a.getClass.getComponentType()) val dataType = ArrayType(elementType) diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralExpressionSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralExpressionSuite.scala index 0a1acd06bd9e7..f63b60f5ebba1 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralExpressionSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralExpressionSuite.scala @@ -477,4 +477,13 @@ class LiteralExpressionSuite extends SparkFunSuite with ExpressionEvalHelper { Literal.create(UTF8String.fromString("Spark SQL"), ObjectType(classOf[UTF8String])), UTF8String.fromString("Spark SQL")) } + + test("SPARK-46604: Literal support immutable ArraySeq") { + import org.apache.spark.util.ArrayImplicits._ + val immArraySeq = Array(1.0, 4.0).toImmutableArraySeq + val expected = toCatalyst(immArraySeq) + checkEvaluation(Literal(immArraySeq), expected) + checkEvaluation(Literal.create(immArraySeq), expected) + checkEvaluation(Literal.create(immArraySeq, ArrayType(DoubleType)), expected) + } }