Skip to content

[SPARK-21973][SQL] Add an new option to filter queries in TPC-DS #19188

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

Closed
maropu wants to merge 3 commits into from
Closed

[SPARK-21973][SQL] Add an new option to filter queries in TPC-DS #19188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be1a199
Add a new option to filter queries
maropu Sep 13, 2017
cc11163
Fix
maropu Sep 13, 2017
b543e71
case-insensitive option matches
maropu Sep 14, 2017
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
20 changes: 18 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/TPCDSQueryBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.spark.sql.execution.benchmark

import org.apache.spark.SparkConf
import org.apache.spark.internal.Logging
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.UnresolvedRelation
Expand All @@ -31,7 +32,7 @@ import org.apache.spark.util.Benchmark
* To run this:
* spark-submit --class <this class> <spark sql test jar> <TPCDS data location>
Copy link
Member

@viirya viirya Sep 13, 2017

Choose a reason for hiding this comment

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

Update this usage text too?

Copy link
Member Author

@maropu maropu Sep 13, 2017

Choose a reason for hiding this comment

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

ok

*/
object TPCDSQueryBenchmark {
object TPCDSQueryBenchmark extends Logging {
val conf =
new SparkConf()
.setMaster("local[1]")
Expand Down Expand Up @@ -90,7 +91,9 @@ object TPCDSQueryBenchmark {
benchmark.addCase(name) { i =>
spark.sql(queryString).collect()
}
logInfo(s"\n\n===== TPCDS QUERY BENCHMARK OUTPUT FOR $name =====\n")
Copy link
Member Author

@maropu maropu Sep 13, 2017

Choose a reason for hiding this comment

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

See #19188 (comment)

benchmark.run()
logInfo(s"\n\n===== FINISHED $name =====\n")
}
}

Expand All @@ -110,6 +113,19 @@ object TPCDSQueryBenchmark {
"q81", "q82", "q83", "q84", "q85", "q86", "q87", "q88", "q89", "q90",
"q91", "q92", "q93", "q94", "q95", "q96", "q97", "q98", "q99")

tpcdsAll(benchmarkArgs.dataLocation, queries = tpcdsQueries)
// If `--query-filter` defined, filters the queries that this option selects
val queriesToRun = if (benchmarkArgs.queryFilter.nonEmpty) {
val queries = tpcdsQueries.filter { case queryName =>
benchmarkArgs.queryFilter.contains(queryName)
Copy link
Member

@viirya viirya Sep 13, 2017

Choose a reason for hiding this comment

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

Add case insensitive?

Copy link
Member Author

@maropu maropu Sep 13, 2017

Choose a reason for hiding this comment

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

yea, I like the idea.

}
if (queries.isEmpty) {
throw new RuntimeException("Bad query name filter: " + benchmarkArgs.queryFilter)
Copy link
Member

@viirya viirya Sep 13, 2017

Choose a reason for hiding this comment

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

"Empty queries to run. Bad query name filter: " + benchmarkArgs.queryFilter.

Copy link
Member Author

@maropu maropu Sep 13, 2017

Choose a reason for hiding this comment

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

ok

}
queries
} else {
tpcdsQueries
}

tpcdsAll(benchmarkArgs.dataLocation, queries = queriesToRun)
}
}
6 changes: 6 additions & 0 deletions ...rc/test/scala/org/apache/spark/sql/execution/benchmark/TPCDSQueryBenchmarkArguments.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.sql.execution.benchmark

class TPCDSQueryBenchmarkArguments(val args: Array[String]) {
var dataLocation: String = null
var queryFilter: Set[String] = Set.empty

parseArgs(args.toList)
validateArguments()
Expand All @@ -32,6 +33,10 @@ class TPCDSQueryBenchmarkArguments(val args: Array[String]) {
dataLocation = value
args = tail

case ("--query-filter") :: value :: tail =>
queryFilter = value.split(",").map(_.trim).toSet
args = tail

case _ =>
// scalastyle:off println
System.err.println("Unknown/unsupported param " + args)
Expand All @@ -47,6 +52,7 @@ class TPCDSQueryBenchmarkArguments(val args: Array[String]) {
|Usage: spark-submit --class <this class> <spark sql test jar> [Options]
|Options:
| --data-location Path to TPCDS data
| --query-filter Queries to filter, e.g., q3,q5,q13
|
|------------------------------------------------------------------------------------------------------------------
|In order to run this benchmark, please follow the instructions at
Expand Down