beliefer commented on a change in pull request #33665:
URL: https://github.com/apache/spark/pull/33665#discussion_r687477306
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
##########
@@ -2556,13 +2560,20 @@ case class MakeTimestamp(
// Accept `sec` as DecimalType to avoid loosing precision of microseconds
while converting
// them to the fractional part of `sec`.
override def inputTypes: Seq[AbstractDataType] =
- Seq(IntegerType, IntegerType, IntegerType, IntegerType, IntegerType,
DecimalType(8, 6)) ++
- timezone.map(_ => StringType)
+ Seq(IntegerType, IntegerType, IntegerType, IntegerType, IntegerType,
+ TypeCollection(DecimalType(8, 6), IntegerType)) ++ timezone.map(_ =>
StringType)
Review comment:
The conflict is not properly resolved.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
