Skip to content

Fix DataWritingCommand callback naver be called on withListener method #7362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wForget wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix DataWritingCommand callback naver be called on withListener method #7362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...extension-spark-4-1/src/test/scala/org/apache/spark/sql/KyuubiSparkSQLExtensionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.apache.spark.sql

import java.util.concurrent.atomic.AtomicBoolean

import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.spark.SparkConf
import org.apache.spark.sql.classic.SparkSession
Expand Down Expand Up @@ -100,13 +102,17 @@ trait KyuubiSparkSQLExtensionTest extends QueryTest
withListener(sql(sqlString))(callback)
}

def withListener(df: => DataFrame)(callback: DataWritingCommand => Unit): Unit = {
def withListener(df: => DataFrame, mustBeCalled: Boolean = true)(
callback: DataWritingCommand => Unit): Unit = {
val called = new AtomicBoolean(false)
val listener = new QueryExecutionListener {
override def onFailure(f: String, qe: QueryExecution, e: Exception): Unit = {}

override def onSuccess(funcName: String, qe: QueryExecution, duration: Long): Unit = {
qe.executedPlan match {
case write: DataWritingCommandExec => callback(write.cmd)
collect(qe.executedPlan) {
Copy link
Copy Markdown
Member Author

@wForget wForget Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DataWritingCommandExec is wrapped by AdaptiveSparkPlanExec, so we should use AdaptiveSparkPlanHelper#collect

case write: DataWritingCommandExec =>
called.set(true)
callback(write.cmd)
case _ =>
}
}
Expand All @@ -115,6 +121,7 @@ trait KyuubiSparkSQLExtensionTest extends QueryTest
try {
df.collect()
sparkContext.listenerBus.waitUntilEmpty()
assert(!mustBeCalled || called.get(), "callback function should be executed.")
} finally {
spark.listenerManager.unregister(listener)
}
Expand Down
2 changes: 1 addition & 1 deletion ...extension-spark-4-1/src/test/scala/org/apache/spark/sql/RebalanceBeforeWritingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class RebalanceBeforeWritingSuite extends KyuubiSparkSQLExtensionTest {

test("check rebalance does not exists") {
def check(df: DataFrame): Unit = {
withListener(df) { write =>
withListener(df, false) { write =>
assert(write.collect {
case r: RebalancePartitions => r
}.isEmpty)
Expand Down
Loading