Skip to content

minor: Update TPC-DS microbenchmarks to remove "scan only" and "exec only" runs #2396

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

Merged
mbutrovich merged 7 commits into from
Sep 20, 2025
Merged

minor: Update TPC-DS microbenchmarks to remove "scan only" and "exec only" runs #2396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf5faf9
save
andygrove Sep 14, 2025
a08416c
Minor cleanup of TPC-DS microbenchmarks
andygrove Sep 14, 2025
ad62b55
revert
andygrove Sep 14, 2025
44a0948
Merge remote-tracking branch 'apache/main' into microbench
andygrove Sep 17, 2025
5c1c9ac
prep for review
andygrove Sep 17, 2025
67ae484
prep for review
andygrove Sep 17, 2025
6f2420d
prep for review
andygrove Sep 17, 2025
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
29 changes: 4 additions & 25 deletions spark/src/test/scala/org/apache/spark/sql/benchmark/CometTPCDSMicroBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ object CometTPCDSMicroBenchmark extends CometTPCQueryBenchmarkBase {
benchmarkName: String,
nameSuffix: String = ""): Unit = {
queries.foreach { name =>
val source = Source.fromFile(s"spark/src/test/resources/tpcds-micro-benchmarks/$name.sql")
val source = Source.fromFile(s"src/test/resources/tpcds-micro-benchmarks/$name.sql")
Copy link
Member Author

@andygrove andygrove Sep 17, 2025

Choose a reason for hiding this comment

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

I had to modify the path to get the benchmark working from the command-line

val queryString = source
.getLines()
.filterNot(_.startsWith("--"))
Expand All @@ -108,34 +108,13 @@ object CometTPCDSMicroBenchmark extends CometTPCQueryBenchmarkBase {
benchmark.addCase(s"$name$nameSuffix") { _ =>
cometSpark.sql(queryString).noop()
}
benchmark.addCase(s"$name$nameSuffix: Comet (Scan)") { _ =>
withSQLConf(CometConf.COMET_ENABLED.key -> "true") {
cometSpark.sql(queryString).noop()
}
}
benchmark.addCase(s"$name$nameSuffix: Comet (Scan, Exec)") { _ =>
withSQLConf(
CometConf.COMET_ENABLED.key -> "true",
CometConf.COMET_EXEC_SHUFFLE_ENABLED.key -> "true",
CometConf.COMET_SHUFFLE_MODE.key -> "auto",
CometConf.COMET_REGEXP_ALLOW_INCOMPATIBLE.key -> "true",
// enabling COMET_EXPLAIN_NATIVE_ENABLED may add overhead but is useful for debugging
CometConf.COMET_EXPLAIN_NATIVE_ENABLED.key -> "false",
CometConf.COMET_EXEC_ENABLED.key -> "true") {
cometSpark.sql(queryString).noop()
}
}
benchmark.addCase(s"$name$nameSuffix: Comet (Exec)") { _ =>
benchmark.addCase(s"$name$nameSuffix: Comet") { _ =>
withSQLConf(
CometConf.COMET_ENABLED.key -> "true",
CometConf.COMET_NATIVE_SCAN_ENABLED.key -> "false",
CometConf.COMET_CONVERT_FROM_PARQUET_ENABLED.key -> "true",
CometConf.COMET_EXEC_SHUFFLE_ENABLED.key -> "true",
CometConf.COMET_SHUFFLE_MODE.key -> "auto",
CometConf.COMET_EXEC_ENABLED.key -> "true",
CometConf.COMET_REGEXP_ALLOW_INCOMPATIBLE.key -> "true",
// enabling COMET_EXPLAIN_NATIVE_ENABLED may add overhead but is useful for debugging
CometConf.COMET_EXPLAIN_NATIVE_ENABLED.key -> "false",
CometConf.COMET_EXEC_ENABLED.key -> "true") {
CometConf.COMET_EXPLAIN_NATIVE_ENABLED.key -> "false") {
cometSpark.sql(queryString).noop()
}
}
Expand Down
22 changes: 2 additions & 20 deletions spark/src/test/scala/org/apache/spark/sql/benchmark/CometTPCQueryBenchmarkBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,28 +65,10 @@ trait CometTPCQueryBenchmarkBase extends SqlBasedBenchmark with CometTPCQueryBas
benchmark.addCase(s"$name$nameSuffix") { _ =>
cometSpark.sql(queryString).noop()
}
benchmark.addCase(s"$name$nameSuffix: Comet (Scan)") { _ =>
withSQLConf(CometConf.COMET_ENABLED.key -> "true") {
cometSpark.sql(queryString).noop()
}
}
benchmark.addCase(s"$name$nameSuffix: Comet (Scan, Exec)") { _ =>
withSQLConf(
CometConf.COMET_ENABLED.key -> "true",
CometConf.COMET_EXEC_ENABLED.key -> "true",
CometConf.COMET_EXEC_SHUFFLE_ENABLED.key -> "true",
CometConf.COMET_SHUFFLE_MODE.key -> "auto") {
cometSpark.sql(queryString).noop()
}
}
benchmark.addCase(s"$name$nameSuffix: Comet (Exec)") { _ =>
benchmark.addCase(s"$name$nameSuffix: Comet") { _ =>
withSQLConf(
CometConf.COMET_ENABLED.key -> "true",
CometConf.COMET_EXEC_ENABLED.key -> "true",
CometConf.COMET_NATIVE_SCAN_ENABLED.key -> "false",
CometConf.COMET_CONVERT_FROM_PARQUET_ENABLED.key -> "true",
CometConf.COMET_EXEC_SHUFFLE_ENABLED.key -> "true",
CometConf.COMET_SHUFFLE_MODE.key -> "auto") {
CometConf.COMET_EXEC_ENABLED.key -> "true") {
cometSpark.sql(queryString).noop()
}
}
Expand Down
Loading