tomvanbussel commented on a change in pull request #34670:
URL: https://github.com/apache/spark/pull/34670#discussion_r753524235
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/mathExpressions.scala
##########
@@ -1547,14 +1547,25 @@ case class BRound(child: Expression, scale: Expression)
}
object WidthBucket {
-
def computeBucketNumber(value: Double, min: Double, max: Double, numBucket:
Long): jl.Long = {
- if (numBucket <= 0 || numBucket == Long.MaxValue || jl.Double.isNaN(value)
|| min == max ||
- jl.Double.isNaN(min) || jl.Double.isInfinite(min) ||
- jl.Double.isNaN(max) || jl.Double.isInfinite(max)) {
- return null
+ if (isNull(value, min, max, numBucket)) {
+ null
+ } else {
+ computeBucketNumberNotNull(value, min, max, numBucket)
}
+ }
+ def isNull(value: Double, min: Double, max: Double, numBucket: Long):
Boolean = {
Review comment:
Are you sure? The Java code generated for `WholeStageCodegenExec` won't
be part of the `WidthBucket` class, so I don't think it can call
`WidthBucket.isNull` if the function is `private`.
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/mathExpressions.scala
##########
@@ -1547,14 +1547,25 @@ case class BRound(child: Expression, scale: Expression)
}
object WidthBucket {
-
def computeBucketNumber(value: Double, min: Double, max: Double, numBucket:
Long): jl.Long = {
- if (numBucket <= 0 || numBucket == Long.MaxValue || jl.Double.isNaN(value)
|| min == max ||
- jl.Double.isNaN(min) || jl.Double.isInfinite(min) ||
- jl.Double.isNaN(max) || jl.Double.isInfinite(max)) {
- return null
+ if (isNull(value, min, max, numBucket)) {
+ null
+ } else {
+ computeBucketNumberNotNull(value, min, max, numBucket)
}
+ }
+ def isNull(value: Double, min: Double, max: Double, numBucket: Long):
Boolean = {
+ numBucket <= 0 ||
+ numBucket == Long.MaxValue ||
+ jl.Double.isNaN(value) ||
+ min == max ||
+ jl.Double.isNaN(min) || jl.Double.isInfinite(min) ||
+ jl.Double.isNaN(max) || jl.Double.isInfinite(max)
+ }
+
+ def computeBucketNumberNotNull(
Review comment:
Same comment as above.
--
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]
