Skip to content

Commit 7b4e94f

Browse files
gengliangwangdongjoon-hyun
authored andcommitted
[SPARK-25581][SQL] Rename method benchmark as runBenchmarkSuite in BenchmarkBase
## What changes were proposed in this pull request? Rename method `benchmark` in `BenchmarkBase` as `runBenchmarkSuite `. Also add comments. Currently the method name `benchmark` is a bit confusing. Also the name is the same as instances of `Benchmark`: https://github.com/apache/spark/blob/f246813afba16fee4d703f09e6302011b11806f3/sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcReadBenchmark.scala#L330-L339 ## How was this patch tested? Unit test. Closes #22599 from gengliangwang/renameBenchmarkSuite. Authored-by: Gengliang Wang <gengliang.wang@databricks.com> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent 9bf397c commit 7b4e94f

File tree

10 files changed

+16
-11
lines changed

10 files changed

+16
-11
lines changed

core/src/test/scala/org/apache/spark/benchmark/BenchmarkBase.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ import java.io.{File, FileOutputStream, OutputStream}
2525
abstract class BenchmarkBase {
2626
var output: Option[OutputStream] = None
2727

28-
def benchmark(): Unit
28+
/**
29+
* Main process of the whole benchmark.
30+
* Implementations of this method are supposed to use the wrapper method `runBenchmark`
31+
* for each benchmark scenario.
32+
*/
33+
def runBenchmarkSuite(): Unit
2934

3035
final def runBenchmark(benchmarkName: String)(func: => Any): Unit = {
3136
val separator = "=" * 96
@@ -46,7 +51,7 @@ abstract class BenchmarkBase {
4651
output = Some(new FileOutputStream(file))
4752
}
4853

49-
benchmark()
54+
runBenchmarkSuite()
5055

5156
output.foreach { o =>
5257
if (o != null) {

mllib/src/test/scala/org/apache/spark/mllib/linalg/UDTSerializationBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
3232
*/
3333
object UDTSerializationBenchmark extends BenchmarkBase {
3434

35-
override def benchmark(): Unit = {
35+
override def runBenchmarkSuite(): Unit = {
3636

3737
runBenchmark("VectorUDT de/serialization") {
3838
val iters = 1e2.toInt

sql/catalyst/src/test/scala/org/apache/spark/sql/UnsafeProjectionBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object UnsafeProjectionBenchmark extends BenchmarkBase {
4141
(1 to numRows).map(_ => encoder.toRow(generator().asInstanceOf[Row]).copy()).toArray
4242
}
4343

44-
override def benchmark(): Unit = {
44+
override def runBenchmarkSuite(): Unit = {
4545
runBenchmark("unsafe projection") {
4646
val iters = 1024 * 16
4747
val numRows = 1024 * 16

sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/AggregateBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import org.apache.spark.unsafe.map.BytesToBytesMap
4444
*/
4545
object AggregateBenchmark extends SqlBasedBenchmark {
4646

47-
override def benchmark(): Unit = {
47+
override def runBenchmarkSuite(): Unit = {
4848
runBenchmark("aggregate without grouping") {
4949
val N = 500L << 22
5050
codegenBenchmark("agg w/o group", N) {

sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/FilterPushdownBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ object FilterPushdownBenchmark extends BenchmarkBase with SQLHelper {
198198
}
199199
}
200200

201-
override def benchmark(): Unit = {
201+
override def runBenchmarkSuite(): Unit = {
202202
runBenchmark("Pushdown for many distinct value case") {
203203
withTempPath { dir =>
204204
withTempTable("orcTable", "parquetTable") {

sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/PrimitiveArrayBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object PrimitiveArrayBenchmark extends BenchmarkBase {
3636
.config("spark.sql.autoBroadcastJoinThreshold", 1)
3737
.getOrCreate()
3838

39-
override def benchmark(): Unit = {
39+
override def runBenchmarkSuite(): Unit = {
4040
runBenchmark("Write primitive arrays in dataset") {
4141
writeDatasetArray(4)
4242
}

sql/core/src/test/scala/org/apache/spark/sql/execution/benchmark/SortBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ object SortBenchmark extends BenchmarkBase {
119119
benchmark.run()
120120
}
121121

122-
override def benchmark(): Unit = {
122+
override def runBenchmarkSuite(): Unit = {
123123
runBenchmark("radix sort") {
124124
sortBenchmark()
125125
}

sql/core/src/test/scala/org/apache/spark/sql/execution/columnar/compression/CompressionSchemeBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ object CompressionSchemeBenchmark extends BenchmarkBase with AllCompressionSchem
233233
runDecodeBenchmark("STRING Decode", iters, count, STRING, testData)
234234
}
235235

236-
override def benchmark(): Unit = {
236+
override def runBenchmarkSuite(): Unit = {
237237
runBenchmark("Compression Scheme Benchmark") {
238238
bitEncodingBenchmark(1024)
239239
shortEncodingBenchmark(1024)

sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ object ColumnarBatchBenchmark extends BenchmarkBase {
443443
benchmark.run
444444
}
445445

446-
override def benchmark(): Unit = {
446+
override def runBenchmarkSuite(): Unit = {
447447
runBenchmark("Int Read/Write") {
448448
intAccess(1024 * 40)
449449
}

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcReadBenchmark.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ object OrcReadBenchmark extends BenchmarkBase with SQLHelper {
336336
}
337337
}
338338

339-
override def benchmark(): Unit = {
339+
override def runBenchmarkSuite(): Unit = {
340340
runBenchmark("SQL Single Numeric Column Scan") {
341341
Seq(ByteType, ShortType, IntegerType, LongType, FloatType, DoubleType).foreach { dataType =>
342342
numericScanBenchmark(1024 * 1024 * 15, dataType)

0 commit comments

Comments
 (0)