From 027c15c7604e6cf5a28aa0bd13376407a7dc77fc Mon Sep 17 00:00:00 2001 From: xorsum Date: Thu, 5 Mar 2026 11:13:17 +0800 Subject: [PATCH 1/4] skip tpcds q54 test for spark3.5 --- .github/workflows/tpcds.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/tpcds.yml b/.github/workflows/tpcds.yml index f4c9c2cd6..91b9b1968 100644 --- a/.github/workflows/tpcds.yml +++ b/.github/workflows/tpcds.yml @@ -78,6 +78,19 @@ jobs: javaver: '17' scalaver: '2.13' hadoop-profile: 'hadoop3' + queries: | + [ + "q1,q2,q3,q4,q5,q6,q7,q8,q9", + "q10,q11,q12,q13,q14a,q14b,q15,q16,q17,q18,q19", + "q20,q21,q22,q23a,q23b,q24a,q24b,q25,q26,q27,q28,q29", + "q30,q31,q32,q33,q34,q35,q36,q37,q38,q39a,q39b", + "q40,q41,q42,q43,q44,q45,q46,q47,q48,q49", + "q50,q51,q52,q53,q55,q56,q57,q58,q59", + "q60,q61,q62,q63,q64,q65,q66,q67,q68,q69", + "q70,q71,q72,q73,q74,q75,q76,q77,q78,q79", + "q80,q81,q82,q83,q84,q85,q86,q87,q88,q89", + "q90,q91,q92,q93,q94,q95,q96,q97,q98,q99" + ] test-spark-35-jdk21-scala-2-13: name: Test spark-3.5 JDK21 Scala-2.13 @@ -87,6 +100,19 @@ jobs: javaver: '21' scalaver: '2.13' hadoop-profile: 'hadoop3' + queries: | + [ + "q1,q2,q3,q4,q5,q6,q7,q8,q9", + "q10,q11,q12,q13,q14a,q14b,q15,q16,q17,q18,q19", + "q20,q21,q22,q23a,q23b,q24a,q24b,q25,q26,q27,q28,q29", + "q30,q31,q32,q33,q34,q35,q36,q37,q38,q39a,q39b", + "q40,q41,q42,q43,q44,q45,q46,q47,q48,q49", + "q50,q51,q52,q53,q55,q56,q57,q58,q59", + "q60,q61,q62,q63,q64,q65,q66,q67,q68,q69", + "q70,q71,q72,q73,q74,q75,q76,q77,q78,q79", + "q80,q81,q82,q83,q84,q85,q86,q87,q88,q89", + "q90,q91,q92,q93,q94,q95,q96,q97,q98,q99" + ] test-spark-40-jdk21-scala-2-13: name: Test spark-4.0 JDK21 Scala-2.13 From c0b49e2f583f55642f1c9440412389f820ec0cbc Mon Sep 17 00:00:00 2001 From: xorsum Date: Thu, 5 Mar 2026 15:29:11 +0800 Subject: [PATCH 2/4] Revert "skip tpcds q54 test for spark3.5" This reverts commit 027c15c7604e6cf5a28aa0bd13376407a7dc77fc. --- .github/workflows/tpcds.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/workflows/tpcds.yml b/.github/workflows/tpcds.yml index 91b9b1968..f4c9c2cd6 100644 --- a/.github/workflows/tpcds.yml +++ b/.github/workflows/tpcds.yml @@ -78,19 +78,6 @@ jobs: javaver: '17' scalaver: '2.13' hadoop-profile: 'hadoop3' - queries: | - [ - "q1,q2,q3,q4,q5,q6,q7,q8,q9", - "q10,q11,q12,q13,q14a,q14b,q15,q16,q17,q18,q19", - "q20,q21,q22,q23a,q23b,q24a,q24b,q25,q26,q27,q28,q29", - "q30,q31,q32,q33,q34,q35,q36,q37,q38,q39a,q39b", - "q40,q41,q42,q43,q44,q45,q46,q47,q48,q49", - "q50,q51,q52,q53,q55,q56,q57,q58,q59", - "q60,q61,q62,q63,q64,q65,q66,q67,q68,q69", - "q70,q71,q72,q73,q74,q75,q76,q77,q78,q79", - "q80,q81,q82,q83,q84,q85,q86,q87,q88,q89", - "q90,q91,q92,q93,q94,q95,q96,q97,q98,q99" - ] test-spark-35-jdk21-scala-2-13: name: Test spark-3.5 JDK21 Scala-2.13 @@ -100,19 +87,6 @@ jobs: javaver: '21' scalaver: '2.13' hadoop-profile: 'hadoop3' - queries: | - [ - "q1,q2,q3,q4,q5,q6,q7,q8,q9", - "q10,q11,q12,q13,q14a,q14b,q15,q16,q17,q18,q19", - "q20,q21,q22,q23a,q23b,q24a,q24b,q25,q26,q27,q28,q29", - "q30,q31,q32,q33,q34,q35,q36,q37,q38,q39a,q39b", - "q40,q41,q42,q43,q44,q45,q46,q47,q48,q49", - "q50,q51,q52,q53,q55,q56,q57,q58,q59", - "q60,q61,q62,q63,q64,q65,q66,q67,q68,q69", - "q70,q71,q72,q73,q74,q75,q76,q77,q78,q79", - "q80,q81,q82,q83,q84,q85,q86,q87,q88,q89", - "q90,q91,q92,q93,q94,q95,q96,q97,q98,q99" - ] test-spark-40-jdk21-scala-2-13: name: Test spark-4.0 JDK21 Scala-2.13 From ae6527e2a65a85fac5f3c6dd3d62c77e4c794fd1 Mon Sep 17 00:00:00 2001 From: xorsum Date: Thu, 5 Mar 2026 15:36:21 +0800 Subject: [PATCH 3/4] skip plan validation for q54 --- .../auron/integration/comparison/PlanStabilityChecker.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala index 89a205db8..5ba7c3cf1 100644 --- a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala +++ b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala @@ -44,6 +44,11 @@ class PlanStabilityChecker( def validate(test: QueryExecutionResult): Boolean = { if (!isSupported) return true + if ("q54" == test.queryId) { + println(s"[PlanCheck] Skipping plan check for query ${test.queryId} due to known non-determinism.") + return true + } + if (regenGoldenFiles) { generatePlanGolden(test.queryId, test.plan) } else if (planCheck) { From 42c74ee0d0fca0919f0e096432cc52f994c0fede Mon Sep 17 00:00:00 2001 From: xorsum Date: Thu, 5 Mar 2026 20:26:10 +0800 Subject: [PATCH 4/4] suggestion of copilot --- .../integration/comparison/PlanStabilityChecker.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala index 5ba7c3cf1..d191e8d76 100644 --- a/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala +++ b/dev/auron-it/src/main/scala/org/apache/auron/integration/comparison/PlanStabilityChecker.scala @@ -44,14 +44,14 @@ class PlanStabilityChecker( def validate(test: QueryExecutionResult): Boolean = { if (!isSupported) return true - if ("q54" == test.queryId) { - println(s"[PlanCheck] Skipping plan check for query ${test.queryId} due to known non-determinism.") - return true - } - if (regenGoldenFiles) { generatePlanGolden(test.queryId, test.plan) } else if (planCheck) { + if ("q54" == test.queryId) { + println(s"[PlanCheck] Skipping plan check for query ${test.queryId} " + + s"on ${Shims.get.shimVersion} due to known non-determinism (see issue #2049).") + return true + } return comparePlanGolden(test.queryId, test.plan) } true