MaxGekk commented on a change in pull request #33217:
URL: https://github.com/apache/spark/pull/33217#discussion_r664074226
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
##########
@@ -119,6 +119,39 @@ object IntervalUtils {
}
}
+ private def throwIllegalIntervalFormatException(
+ input: UTF8String,
+ startFiled: Byte,
+ endField: Byte,
+ intervalStr: String,
+ typeName: String,
+ fallBackNotice: Option[String] = None) = {
+ throw new IllegalArgumentException(
+ s"Interval string does not match $intervalStr format of " +
+ s"${supportedFormat((startFiled, endField))
+ .map(format => s"`$format`").mkString(", ")} " +
+ s"when cast to $typeName: ${input.toString}" +
Review comment:
Should we add a gap between the two line?
Could you show an example of the error message, please. I just wonder is it
readable ...
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
##########
@@ -119,6 +119,39 @@ object IntervalUtils {
}
}
+ private def throwIllegalIntervalFormatException(
+ input: UTF8String,
+ startFiled: Byte,
+ endField: Byte,
+ intervalStr: String,
+ typeName: String,
+ fallBackNotice: Option[String] = None) = {
+ throw new IllegalArgumentException(
+ s"Interval string does not match $intervalStr format of " +
+ s"${supportedFormat((startFiled, endField))
+ .map(format => s"`$format`").mkString(", ")} " +
+ s"when cast to $typeName: ${input.toString}" +
+ s"${fallBackNotice.map(s => s", $s").getOrElse("")}")
+ }
+
+ private def checkStringIntervalType(
+ input: UTF8String,
+ startField: Byte,
+ endField: Byte,
+ targetInterval: DataType): Unit = {
+ val (intervalStr, typeName, targetStartField, targetEndField) =
targetInterval match {
+ case DT(startField, endField) =>
+ ("day-time", targetInterval.typeName, startField, endField)
+ case YM(startField, endField) =>
+ ("year-month", targetInterval.typeName, startField, endField)
+ }
+ if (startField != targetStartField || endField != targetEndField) {
Review comment:
Do you catch the case when: `startField == targetStartField && endField
== targetEndField` but `startField > endField`?
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/IntervalUtils.scala
##########
@@ -119,6 +119,39 @@ object IntervalUtils {
}
}
+ private def throwIllegalIntervalFormatException(
+ input: UTF8String,
+ startFiled: Byte,
+ endField: Byte,
+ intervalStr: String,
+ typeName: String,
+ fallBackNotice: Option[String] = None) = {
+ throw new IllegalArgumentException(
+ s"Interval string does not match $intervalStr format of " +
+ s"${supportedFormat((startFiled, endField))
+ .map(format => s"`$format`").mkString(", ")} " +
Review comment:
```suggestion
s"${supportedFormat((startFiled, endField)).map(format =>
s"`$format`").mkString(", ")} " +
```
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala
##########
@@ -1249,7 +1257,12 @@ abstract class CastSuiteBase extends SparkFunSuite with
ExpressionEvalHelper {
val e = intercept[IllegalArgumentException] {
cast(Literal.create(interval), dataType).eval()
}.getMessage
- assert(e.contains("Interval string does not match day-time format"))
+ assert(e.contains(s"Interval string does not match day-time format
of " +
+ s"${IntervalUtils.supportedFormat((dataType.startField,
dataType.endField))
+ .map(format => s"`$format`").mkString(", ")} " +
+ s"when cast to ${dataType.typeName}: $interval, " +
+ s"set spark.sql.legacy.fromDayTimeString.enabled to true " +
Review comment:
Let's use `LEGACY_FROM_DAYTIME_STRING.key`.
##########
File path:
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala
##########
@@ -1267,7 +1280,12 @@ abstract class CastSuiteBase extends SparkFunSuite with
ExpressionEvalHelper {
val e = intercept[IllegalArgumentException] {
cast(Literal.create(interval), dataType).eval()
}.getMessage
- assert(e.contains("Interval string does not match day-time format"))
+ assert(e.contains(s"Interval string does not match day-time format
of " +
+ s"${IntervalUtils.supportedFormat((dataType.startField,
dataType.endField))
+ .map(format => s"`$format`").mkString(", ")} " +
+ s"when cast to ${dataType.typeName}: $interval, " +
+ s"set spark.sql.legacy.fromDayTimeString.enabled to true " +
Review comment:
Please, replace it by `LEGACY_FROM_DAYTIME_STRING.key`
--
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]
