Skip to content
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

Jump to bottom

[SPARK-25581][SQL] Rename method benchmark as runBenchmarkSuite in BenchmarkBase #22599

Closed
wants to merge 3 commits into from
Closed

[SPARK-25581][SQL] Rename method benchmark as runBenchmarkSuite in BenchmarkBase #22599

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b74ad77
rename method benchmark as benchmarkSuite
gengliangwang Oct 1, 2018
78e48ea
update to latest master
gengliangwang Oct 1, 2018
1c15c25
rename as runBenchmarkSuite
gengliangwang Oct 2, 2018
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
7 changes: 5 additions & 2 deletions core/src/test/scala/org/apache/spark/benchmark/BenchmarkBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ import java.io.{File, FileOutputStream, OutputStream}
abstract class BenchmarkBase {
var output: Option[OutputStream] = None

def benchmark(): Unit
/**
* Main process of the whole benchmark.
*/
def benchmarkSuite(): Unit
Copy link
Member

Choose a reason for hiding this comment

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

I got the idea of this PR. But, for me, benchmarkSuite looks like a test suite again. Isn't it confusing in another way.

Copy link
Member Author

Choose a reason for hiding this comment

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

Well it means a collection of benchmarks. Just like TestSuite is a collection of test cases.

Copy link
Member Author

Choose a reason for hiding this comment

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

For the word suite, it doesn't have to be about testing.


final def runBenchmark(benchmarkName: String)(func: => Any): Unit = {
val separator = "=" * 96
Expand All @@ -46,7 +49,7 @@ abstract class BenchmarkBase {
output = Some(new FileOutputStream(file))
}

benchmark()
benchmarkSuite()

output.foreach { o =>
if (o != null) {
Expand Down
2 changes: 1 addition & 1 deletion mllib/src/test/scala/org/apache/spark/mllib/linalg/UDTSerializationBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
*/
object UDTSerializationBenchmark extends BenchmarkBase {

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {

runBenchmark("VectorUDT de/serialization") {
val iters = 1e2.toInt
Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/src/test/scala/org/apache/spark/sql/UnsafeProjectionBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object UnsafeProjectionBenchmark extends BenchmarkBase {
(1 to numRows).map(_ => encoder.toRow(generator().asInstanceOf[Row]).copy()).toArray
}

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("unsafe projection") {
val iters = 1024 * 16
val numRows = 1024 * 16
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/AggregateBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import org.apache.spark.unsafe.map.BytesToBytesMap
*/
object AggregateBenchmark extends SqlBasedBenchmark {

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("aggregate without grouping") {
val N = 500L << 22
codegenBenchmark("agg w/o group", N) {
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/test/scala/org/apache/spark/sql/execution/benchmark/FilterPushdownBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ object FilterPushdownBenchmark extends BenchmarkBase with SQLHelper {
}
}

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("Pushdown for many distinct value case") {
withTempPath { dir =>
withTempTable("orcTable", "parquetTable") {
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/test/scala/org/apache/spark/sql/execution/benchmark/PrimitiveArrayBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object PrimitiveArrayBenchmark extends BenchmarkBase {
.config("spark.sql.autoBroadcastJoinThreshold", 1)
.getOrCreate()

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("Write primitive arrays in dataset") {
writeDatasetArray(4)
}
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/SortBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ object SortBenchmark extends BenchmarkBase {
benchmark.run()
}

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("radix sort") {
sortBenchmark()
}
Expand Down
2 changes: 1 addition & 1 deletion ...cala/org/apache/spark/sql/execution/columnar/compression/CompressionSchemeBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ object CompressionSchemeBenchmark extends BenchmarkBase with AllCompressionSchem
runDecodeBenchmark("STRING Decode", iters, count, STRING, testData)
}

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("Compression Scheme Benchmark") {
bitEncodingBenchmark(1024)
shortEncodingBenchmark(1024)
Expand Down
2 changes: 1 addition & 1 deletion ...ore/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ object ColumnarBatchBenchmark extends BenchmarkBase {
benchmark.run
}

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("Int Read/Write") {
intAccess(1024 * 40)
}
Expand Down
2 changes: 1 addition & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcReadBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ object OrcReadBenchmark extends BenchmarkBase with SQLHelper {
}
}

override def benchmark(): Unit = {
override def benchmarkSuite(): Unit = {
runBenchmark("SQL Single Numeric Column Scan") {
Seq(ByteType, ShortType, IntegerType, LongType, FloatType, DoubleType).foreach { dataType =>
numericScanBenchmark(1024 * 1024 * 15, dataType)
Expand Down