Skip to content

Commit 802b794

Browse files
authored
Df52 migration - ignore width_bucket (#3501)
1 parent f3b08bc commit 802b794

3 files changed

Lines changed: 25 additions & 11 deletions

File tree

spark/src/main/spark-3.5/org/apache/comet/shims/CometExprShim.scala

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.apache.comet.CometSparkSessionExtensions.withInfo
2626
import org.apache.comet.expressions.{CometCast, CometEvalMode}
2727
import org.apache.comet.serde.{CommonStringExprs, Compatible, ExprOuterClass, Incompatible}
2828
import org.apache.comet.serde.ExprOuterClass.{BinaryOutputStyle, Expr}
29-
import org.apache.comet.serde.QueryPlanSerde.{exprToProtoInternal, optExprWithInfo, scalarFunctionExprToProto}
29+
import org.apache.comet.serde.QueryPlanSerde.exprToProtoInternal
3030

3131
/**
3232
* `CometExprShim` acts as a shim for parsing expressions from different Spark versions.
@@ -82,9 +82,14 @@ trait CometExprShim extends CommonStringExprs {
8282
}
8383

8484
case wb: WidthBucket =>
85-
val childExprs = wb.children.map(exprToProtoInternal(_, inputs, binding))
86-
val optExpr = scalarFunctionExprToProto("width_bucket", childExprs: _*)
87-
optExprWithInfo(optExpr, wb, wb.children: _*)
85+
withInfo(
86+
wb,
87+
"WidthBucket not supported, track https://github.com/apache/datafusion/issues/20320")
88+
None
89+
// https://github.com/apache/datafusion/issues/20320
90+
// val childExprs = wb.children.map(exprToProtoInternal(_, inputs, binding))
91+
// val optExpr = scalarFunctionExprToProto("width_bucket", childExprs: _*)
92+
// optExprWithInfo(optExpr, wb, wb.children: _*)
8893

8994
case _ => None
9095
}

spark/src/main/spark-4.0/org/apache/comet/shims/CometExprShim.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,14 @@ trait CometExprShim extends CommonStringExprs {
104104
}
105105

106106
case wb: WidthBucket =>
107-
val childExprs = wb.children.map(exprToProtoInternal(_, inputs, binding))
108-
val optExpr = scalarFunctionExprToProto("width_bucket", childExprs: _*)
109-
optExprWithInfo(optExpr, wb, wb.children: _*)
107+
withInfo(
108+
wb,
109+
"WidthBucket not supported, track https://github.com/apache/datafusion/issues/20320")
110+
None
111+
// https://github.com/apache/datafusion/issues/20320
112+
// val childExprs = wb.children.map(exprToProtoInternal(_, inputs, binding))
113+
// val optExpr = scalarFunctionExprToProto("width_bucket", childExprs: _*)
114+
// optExprWithInfo(optExpr, wb, wb.children: _*)
110115

111116
case _ => None
112117
}

spark/src/test/scala/org/apache/comet/CometMathExpressionSuite.scala

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ class CometMathExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
9292
DataGenOptions(generateNegativeZero = generateNegativeZero))
9393
}
9494

95-
test("width_bucket") {
95+
// https://github.com/apache/datafusion/issues/20320
96+
ignore("width_bucket") {
9697
assume(isSpark35Plus, "width_bucket was added in Spark 3.5")
9798
withSQLConf("spark.comet.exec.localTableScan.enabled" -> "true") {
9899
spark
@@ -105,7 +106,8 @@ class CometMathExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
105106
}
106107
}
107108

108-
test("width_bucket - edge cases") {
109+
// https://github.com/apache/datafusion/issues/20320
110+
ignore("width_bucket - edge cases") {
109111
assume(isSpark35Plus, "width_bucket was added in Spark 3.5")
110112
withSQLConf("spark.comet.exec.localTableScan.enabled" -> "true") {
111113
spark
@@ -122,7 +124,8 @@ class CometMathExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
122124
}
123125
}
124126

125-
test("width_bucket - NaN values") {
127+
// https://github.com/apache/datafusion/issues/20320
128+
ignore("width_bucket - NaN values") {
126129
assume(isSpark35Plus, "width_bucket was added in Spark 3.5")
127130
withSQLConf("spark.comet.exec.localTableScan.enabled" -> "true") {
128131
spark
@@ -134,7 +137,8 @@ class CometMathExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
134137
}
135138
}
136139

137-
test("width_bucket - with range data") {
140+
// https://github.com/apache/datafusion/issues/20320
141+
ignore("width_bucket - with range data") {
138142
assume(isSpark35Plus, "width_bucket was added in Spark 3.5")
139143
withSQLConf("spark.comet.exec.localTableScan.enabled" -> "true") {
140144
spark

0 commit comments

Comments
 (0)