diff --git a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometDatetimeExpressionBenchmark.scala b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometDatetimeExpressionBenchmark.scala index 47eff41bbd..18f292ff24 100644 --- a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometDatetimeExpressionBenchmark.scala +++ b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometDatetimeExpressionBenchmark.scala @@ -30,16 +30,15 @@ import org.apache.spark.sql.internal.SQLConf */ object CometDatetimeExpressionBenchmark extends CometBenchmarkBase { - def dateTruncExprBenchmark(values: Int, useDictionary: Boolean): Unit = { + def dateTruncExprBenchmark(values: Int): Unit = { withTempPath { dir => withTempTable("parquetV1Table") { prepareTable( dir, spark.sql( s"select cast(timestamp_micros(cast(value/100000 as integer)) as date) as dt FROM $tbl")) - Seq("YEAR", "YYYY", "YY", "MON", "MONTH", "MM").foreach { level => - val isDictionary = if (useDictionary) "(Dictionary)" else "" - val name = s"Date Truncate $isDictionary - $level" + Seq("YEAR", "MONTH").foreach { level => + val name = s"Date Truncate - $level" val query = s"select trunc(dt, '$level') from parquetV1Table" runExpressionBenchmark(name, values, query) } @@ -47,30 +46,17 @@ object CometDatetimeExpressionBenchmark extends CometBenchmarkBase { } } - def timestampTruncExprBenchmark(values: Int, useDictionary: Boolean): Unit = { + def timestampTruncExprBenchmark(values: Int): Unit = { withTempPath { dir => withTempTable("parquetV1Table") { prepareTable( dir, spark.sql(s"select timestamp_micros(cast(value/100000 as integer)) as ts FROM $tbl")) - Seq( - "YEAR", - "YYYY", - "YY", - "MON", - "MONTH", - "MM", - "DAY", - "DD", - "HOUR", - "MINUTE", - "SECOND", - "WEEK", - "QUARTER").foreach { level => - val isDictionary = if (useDictionary) "(Dictionary)" else "" - val name = s"Timestamp Truncate $isDictionary - $level" - val query = s"select date_trunc('$level', ts) from parquetV1Table" - runExpressionBenchmark(name, values, query) + Seq("YEAR", "MONTH", "DAY", "HOUR", "MINUTE", "SECOND", "WEEK", "QUARTER").foreach { + level => + val name = s"Timestamp Truncate - $level" + val query = s"select date_trunc('$level', ts) from parquetV1Table" + runExpressionBenchmark(name, values, query) } } } @@ -85,16 +71,10 @@ object CometDatetimeExpressionBenchmark extends CometBenchmarkBase { "spark.sql.parquet.datetimeRebaseModeInWrite" -> "CORRECTED") { runBenchmarkWithTable("DateTrunc", values) { v => - dateTruncExprBenchmark(v, useDictionary = false) - } - runBenchmarkWithTable("DateTrunc (Dictionary)", values, useDictionary = true) { v => - dateTruncExprBenchmark(v, useDictionary = true) + dateTruncExprBenchmark(v) } runBenchmarkWithTable("TimestampTrunc", values) { v => - timestampTruncExprBenchmark(v, useDictionary = false) - } - runBenchmarkWithTable("TimestampTrunc (Dictionary)", values, useDictionary = true) { v => - timestampTruncExprBenchmark(v, useDictionary = true) + timestampTruncExprBenchmark(v) } } }