Skip to content

Commit 5f3238c

Browse files
committed
test: regenerate tpcds-v1.4/{q24a,q24b} and tpcds-v2.7.0/q24 goldens
`CometCaseConversionBase` no longer gates compat with the bespoke `spark.comet.caseConversion.enabled` conf inside `convert()`. The fallback now flows through the standard dispatcher path, so the `BroadcastHashJoin` COMET tag on `upper(ca_country)` switches from "Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway." to the dispatcher's per-expression Incompatible message, including the `spark.comet.expression.Upper.allowIncompatible=true` opt-in and the compat-guide link. The plan shape is unchanged; only the two annotation lines in each affected golden differ.
1 parent e6694b1 commit 5f3238c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24a/extended.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Filter
77
: +- Exchange
88
: +- HashAggregate
99
: +- Project
10-
: +- BroadcastHashJoin [COMET: Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway.]
10+
: +- BroadcastHashJoin [COMET: upper(ca_country#1) is not fully compatible with Spark (Results can vary depending on locale and character set (https://github.com/apache/datafusion-comet/issues/2190).). To enable it anyway, set spark.comet.expression.Upper.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
1111
: :- CometNativeColumnarToRow
1212
: : +- CometProject
1313
: : +- CometBroadcastHashJoin
@@ -51,7 +51,7 @@ Filter
5151
+- Exchange
5252
+- HashAggregate
5353
+- Project
54-
+- BroadcastHashJoin [COMET: Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway.]
54+
+- BroadcastHashJoin [COMET: upper(ca_country#2) is not fully compatible with Spark (Results can vary depending on locale and character set (https://github.com/apache/datafusion-comet/issues/2190).). To enable it anyway, set spark.comet.expression.Upper.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
5555
:- CometNativeColumnarToRow
5656
: +- CometProject
5757
: +- CometBroadcastHashJoin

spark/src/test/resources/tpcds-plan-stability/approved-plans-v1_4/q24b/extended.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Filter
77
: +- Exchange
88
: +- HashAggregate
99
: +- Project
10-
: +- BroadcastHashJoin [COMET: Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway.]
10+
: +- BroadcastHashJoin [COMET: upper(ca_country#1) is not fully compatible with Spark (Results can vary depending on locale and character set (https://github.com/apache/datafusion-comet/issues/2190).). To enable it anyway, set spark.comet.expression.Upper.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
1111
: :- CometNativeColumnarToRow
1212
: : +- CometProject
1313
: : +- CometBroadcastHashJoin
@@ -51,7 +51,7 @@ Filter
5151
+- Exchange
5252
+- HashAggregate
5353
+- Project
54-
+- BroadcastHashJoin [COMET: Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway.]
54+
+- BroadcastHashJoin [COMET: upper(ca_country#2) is not fully compatible with Spark (Results can vary depending on locale and character set (https://github.com/apache/datafusion-comet/issues/2190).). To enable it anyway, set spark.comet.expression.Upper.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
5555
:- CometNativeColumnarToRow
5656
: +- CometProject
5757
: +- CometBroadcastHashJoin

spark/src/test/resources/tpcds-plan-stability/approved-plans-v2_7/q24/extended.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CometNativeColumnarToRow
1010
: +- Exchange
1111
: +- HashAggregate
1212
: +- Project
13-
: +- BroadcastHashJoin [COMET: Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway.]
13+
: +- BroadcastHashJoin [COMET: upper(ca_country#1) is not fully compatible with Spark (Results can vary depending on locale and character set (https://github.com/apache/datafusion-comet/issues/2190).). To enable it anyway, set spark.comet.expression.Upper.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
1414
: :- CometNativeColumnarToRow
1515
: : +- CometProject
1616
: : +- CometBroadcastHashJoin
@@ -54,7 +54,7 @@ CometNativeColumnarToRow
5454
+- Exchange
5555
+- HashAggregate
5656
+- Project
57-
+- BroadcastHashJoin [COMET: Comet is not compatible with Spark for case conversion in locale-specific cases. Set spark.comet.caseConversion.enabled=true to enable it anyway.]
57+
+- BroadcastHashJoin [COMET: upper(ca_country#2) is not fully compatible with Spark (Results can vary depending on locale and character set (https://github.com/apache/datafusion-comet/issues/2190).). To enable it anyway, set spark.comet.expression.Upper.allowIncompatible=true. For more information, refer to the Comet Compatibility Guide (https://datafusion.apache.org/comet/user-guide/compatibility.html).]
5858
:- CometNativeColumnarToRow
5959
: +- CometProject
6060
: +- CometBroadcastHashJoin

0 commit comments

Comments
 (0)