From b471c324c582f46b6925269e2846ce62b8c10cce Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Mon, 29 Dec 2025 09:25:04 -0700
Subject: [PATCH] improve string benchmarks

---
 .../CometStringExpressionBenchmark.scala      | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometStringExpressionBenchmark.scala b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometStringExpressionBenchmark.scala
index 41eabb8513..6550017293 100644
--- a/spark/src/test/scala/org/apache/spark/sql/benchmark/CometStringExpressionBenchmark.scala
+++ b/spark/src/test/scala/org/apache/spark/sql/benchmark/CometStringExpressionBenchmark.scala
@@ -35,13 +35,13 @@ case class StringExprConfig(
     query: String,
     extraCometConfigs: Map[String, String] = Map.empty)
 
-// spotless:off
 /**
  * Benchmark to measure performance of Comet string expressions. To run this benchmark:
- * `SPARK_GENERATE_BENCHMARK_FILES=1 make benchmark-org.apache.spark.sql.benchmark.CometStringExpressionBenchmark`
+ * {{{
+ *   SPARK_GENERATE_BENCHMARK_FILES=1 make benchmark-org.apache.spark.sql.benchmark.CometStringExpressionBenchmark
+ * }}}
  * Results will be written to "spark/benchmarks/CometStringExpressionBenchmark-**results.txt".
  */
-// spotless:on
 object CometStringExpressionBenchmark extends CometBenchmarkBase {
 
   /**
@@ -50,7 +50,7 @@ object CometStringExpressionBenchmark extends CometBenchmarkBase {
   def runStringExprBenchmark(config: StringExprConfig, values: Int): Unit = {
     withTempPath { dir =>
       withTempTable("parquetV1Table") {
-        prepareTable(dir, spark.sql(s"SELECT REPEAT(CAST(value AS STRING), 100) AS c1 FROM $tbl"))
+        prepareTable(dir, spark.sql(s"SELECT REPEAT(CAST(value AS STRING), 20) AS c1 FROM $tbl"))
 
         val extraConfigs =
           Map(CometConf.COMET_CASE_CONVERSION_ENABLED.key -> "true") ++ config.extraCometConfigs
@@ -62,23 +62,36 @@ object CometStringExpressionBenchmark extends CometBenchmarkBase {
 
   // Configuration for all string expression benchmarks
   private val stringExpressions = List(
-    StringExprConfig("Substring", "select substring(c1, 1, 100) from parquetV1Table"),
     StringExprConfig("ascii", "select ascii(c1) from parquetV1Table"),
-    StringExprConfig("bitLength", "select bit_length(c1) from parquetV1Table"),
-    StringExprConfig("octet_length", "select octet_length(c1) from parquetV1Table"),
-    StringExprConfig("upper", "select upper(c1) from parquetV1Table"),
-    StringExprConfig("lower", "select lower(c1) from parquetV1Table"),
+    StringExprConfig("bit_length", "select bit_length(c1) from parquetV1Table"),
     StringExprConfig("chr", "select chr(c1) from parquetV1Table"),
+    StringExprConfig("concat", "select concat(c1, c1) from parquetV1Table"),
+    StringExprConfig("concat_ws", "select concat_ws(' ', c1, c1) from parquetV1Table"),
+    StringExprConfig("contains", "select contains(c1, '123') from parquetV1Table"),
+    StringExprConfig("endswith", "select endswith(c1, '9') from parquetV1Table"),
     StringExprConfig("initCap", "select initCap(c1) from parquetV1Table"),
-    StringExprConfig("trim", "select trim(c1) from parquetV1Table"),
-    StringExprConfig("concatws", "select concat_ws(' ', c1, c1) from parquetV1Table"),
+    StringExprConfig("instr", "select instr(c1, '123') from parquetV1Table"),
     StringExprConfig("length", "select length(c1) from parquetV1Table"),
+    StringExprConfig("like", "select c1 like '%123%' from parquetV1Table"),
+    StringExprConfig("lower", "select lower(c1) from parquetV1Table"),
+    StringExprConfig("lpad", "select lpad(c1, 150, 'x') from parquetV1Table"),
+    StringExprConfig("ltrim", "select ltrim(c1) from parquetV1Table"),
+    StringExprConfig("octet_length", "select octet_length(c1) from parquetV1Table"),
+    StringExprConfig(
+      "regexp_replace",
+      "select regexp_replace(c1, '[0-9]', 'X') from parquetV1Table"),
     StringExprConfig("repeat", "select repeat(c1, 3) from parquetV1Table"),
-    StringExprConfig("reverse", "select reverse(c1) from parquetV1Table"),
-    StringExprConfig("instr", "select instr(c1, '123') from parquetV1Table"),
     StringExprConfig("replace", "select replace(c1, '123', 'ab') from parquetV1Table"),
+    StringExprConfig("reverse", "select reverse(c1) from parquetV1Table"),
+    StringExprConfig("rlike", "select c1 rlike '[0-9]+' from parquetV1Table"),
+    StringExprConfig("rpad", "select rpad(c1, 150, 'x') from parquetV1Table"),
+    StringExprConfig("rtrim", "select rtrim(c1) from parquetV1Table"),
     StringExprConfig("space", "select space(2) from parquetV1Table"),
-    StringExprConfig("translate", "select translate(c1, '123456', 'aBcDeF') from parquetV1Table"))
+    StringExprConfig("startswith", "select startswith(c1, '1') from parquetV1Table"),
+    StringExprConfig("substring", "select substring(c1, 1, 100) from parquetV1Table"),
+    StringExprConfig("translate", "select translate(c1, '123456', 'aBcDeF') from parquetV1Table"),
+    StringExprConfig("trim", "select trim(c1) from parquetV1Table"),
+    StringExprConfig("upper", "select upper(c1) from parquetV1Table"))
 
   override def runCometBenchmark(mainArgs: Array[String]): Unit = {
     val values = 1024 * 1024;