Skip to content

[SPARK-55708][SQL] TransformingEncoder with primitive inside OptionEncoder #54506

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

Open
eejbyfeldt wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −15
Open

[SPARK-55708][SQL] TransformingEncoder with primitive inside OptionEncoder #54506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/encoders/EncoderUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ object EncoderUtils {
} else if (lenientSerialization) {
ObjectType(classOf[java.lang.Object])
} else {
ObjectType(enc.clsTag.runtimeClass)
dataTypeForClass(enc.clsTag.runtimeClass)
}
}

Expand Down Expand Up @@ -158,8 +158,16 @@ object EncoderUtils {
def dataTypeForClass(c: Class[_]): DataType =
javaClassToPrimitiveType.get(c).getOrElse(ObjectType(c))

private val javaClassToPrimitiveType: Map[Class[_], DataType] =
typeJavaMapping.iterator.filter(_._2.isPrimitive).map(_.swap).toMap
private val javaClassToPrimitiveType: Map[Class[_], DataType] = Map(
classOf[Boolean] -> BooleanType,
classOf[Byte] -> ByteType,
classOf[Short] -> ShortType,
classOf[Int] -> IntegerType,
classOf[Long] -> LongType,
classOf[Float] -> FloatType,
classOf[Double] -> DoubleType,
classOf[Array[Byte]] -> BinaryType
)

val typeBoxedJavaMapping: Map[DataType, Class[_]] = Map[DataType, Class[_]](
BooleanType -> classOf[java.lang.Boolean],
Expand Down
29 changes: 17 additions & 12 deletions ...talyst/src/test/scala/org/apache/spark/sql/catalyst/encoders/ExpressionEncoderSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,22 +766,27 @@ class ExpressionEncoderSuite extends CodegenInterpretedPlanTest with AnalysisTes
testDataTransformingEnc(enc, data)
}

val transformLongToTimestampEnc: AgnosticEncoder[Long] =
TransformingEncoder[Long, java.sql.Timestamp](
classTag,
TimestampEncoder(true),
() =>
new Codec[Long, java.sql.Timestamp] with Serializable {
override def encode(in: Long): Timestamp = Timestamp.from(microsToInstant(in))
override def decode(out: Timestamp): Long = instantToMicros(out.toInstant)
}
)

test("SPARK-52601 TransformingEncoder from primitive to timestamp") {
val enc: AgnosticEncoder[Long] =
TransformingEncoder[Long, java.sql.Timestamp](
classTag,
TimestampEncoder(true),
() =>
new Codec[Long, java.sql.Timestamp] with Serializable {
override def encode(in: Long): Timestamp = Timestamp.from(microsToInstant(in))
override def decode(out: Timestamp): Long = instantToMicros(out.toInstant)
}
)
val data: Seq[Long] = Seq(0L, 1L, 2L)

assert(enc.dataType === TimestampType)
assert(transformLongToTimestampEnc.dataType === TimestampType)
testDataTransformingEnc(transformLongToTimestampEnc, data)
}

testDataTransformingEnc(enc, data)
test("SPARK-55708 TransformingEncoder in Option") {
val data = Seq(Some(0L), None)
testDataTransformingEnc(OptionEncoder(transformLongToTimestampEnc), data)
}

val longEncForTimestamp: AgnosticEncoder[V[Long]] =
Expand Down