Skip to content

[SPARK-46604][SQL] Make Literal.apply support s.c.immuable.ArraySeq #44607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuciferYang wants to merge 4 commits into from
Closed

[SPARK-46604][SQL] Make Literal.apply support s.c.immuable.ArraySeq #44607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff9c2c2
init
LuciferYang Jan 4, 2024
5a959f2
use toImmutableArraySeq
LuciferYang Jan 5, 2024
1169ceb
revert
LuciferYang Jan 5, 2024
813f697
use toImmutableArraySeq
LuciferYang Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 9 additions & 0 deletions ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/LiteralExpressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor Author

@LuciferYang LuciferYang Jan 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even without this PR, the following two lines can pass the test successfully. These two lines are just to increase test coverage.

checkEvaluation(Literal.create(immArraySeq), expected)
checkEvaluation(Literal.create(immArraySeq, ArrayType(DoubleType)), expected)

}
}