Skip to content

Commit 4eb2548

Browse files
authored
Merge branch 'main' into fix-window-declared-order-7223
2 parents 3e991c7 + 3439d48 commit 4eb2548

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

‎spark/src/test/scala/org/apache/comet/CometIcebergNativeSuite.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6743,6 +6743,8 @@ class CometIcebergNativeSuite
67436743
// Spark's V2 path.
67446744
test("AQE DPP - V2 broadcast query stage creation order (SPARK-34637)") {
67456745
assume(icebergAvailable, "Iceberg not available")
6746+
// https://github.com/apache/datafusion-comet/issues/7422
6747+
assume(isSpark35Plus, "Spark 3.4 fails the DPP build side, see #7422")
67466748
withTempIcebergDir { warehouseDir =>
67476749
withSQLConf(
67486750
"spark.sql.catalog.aqe_cat" -> "org.apache.iceberg.spark.SparkCatalog",
@@ -6778,14 +6780,12 @@ class CometIcebergNativeSuite
67786780

67796781
assertNoLeftoverCSAB(cometPlan)
67806782

6781-
if (isSpark35Plus) {
6782-
val cometSubqueries = collectWithSubqueries(cometPlan) {
6783-
case s: CometSubqueryBroadcastExec => s
6784-
}
6785-
assert(
6786-
cometSubqueries.nonEmpty,
6787-
s"Expected CometSubqueryBroadcastExec for DPP, got 0:\n${cometPlan.treeString}")
6783+
val cometSubqueries = collectWithSubqueries(cometPlan) {
6784+
case s: CometSubqueryBroadcastExec => s
67886785
}
6786+
assert(
6787+
cometSubqueries.nonEmpty,
6788+
s"Expected CometSubqueryBroadcastExec for DPP, got 0:\n${cometPlan.treeString}")
67896789

67906790
spark.sql("DROP TABLE aqe_cat.db.q34637_fact")
67916791
}

‎spark/src/test/scala/org/apache/spark/sql/comet/CometCollectMetricsSuite.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ class CometCollectMetricsSuite extends CometTestBase {
576576

577577
for ((consumeRows, sortBeforeConsume) <- Seq((1, false), (0, true))) {
578578
test(s"public foreachPartition preserves observation row demand, rows=$consumeRows") {
579+
// Spark 3.4 runs foreachPartition without a name, so no listener callback reports its plan.
580+
assume(isSpark35Plus)
579581
withSQLConf(
580582
SQLConf.ADAPTIVE_EXECUTION_ENABLED.key -> "false",
581583
SQLConf.WHOLESTAGE_CODEGEN_ENABLED.key -> "true") {

0 commit comments

Comments
 (0)