From 112c7c61db86f9a7383b0667af846ac02b1703c7 Mon Sep 17 00:00:00 2001
From: Trent Hauck <trent@trenthauck.com>
Date: Fri, 3 May 2024 12:37:13 -0700
Subject: [PATCH] refactor: rename majorSource to majorVerSrc, same with minor

---
 common/pom.xml                                     |  4 ++--
 pom.xml                                            | 10 +++++-----
 spark/pom.xml                                      |  4 ++--
 .../org/apache/comet/CometExpressionSuite.scala    | 14 +++++---------
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index ac9d136b3..cc1f44481 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -179,8 +179,8 @@ under the License.
             </goals>
             <configuration>
               <sources>
-                <source>src/main/${shims.majorSource}</source>
-                <source>src/main/${shims.minorSource}</source>
+                <source>src/main/${shims.majorVerSrc}</source>
+                <source>src/main/${shims.minorVerSrc}</source>
               </sources>
             </configuration>
           </execution>
diff --git a/pom.xml b/pom.xml
index 5e0454589..3ffdda97a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,8 +88,8 @@ under the License.
     <argLine>-ea -Xmx4g -Xss4m ${extraJavaTestArgs}</argLine>
     <additional.3_3.test.source>spark-3.3-plus</additional.3_3.test.source>
     <additional.3_4.test.source>spark-3.4</additional.3_4.test.source>
-    <shims.majorSource>spark-3.x</shims.majorSource>
-    <shims.minorSource>spark-3.4</shims.minorSource>
+    <shims.majorVerSrc>spark-3.x</shims.majorVerSrc>
+    <shims.minorVerSrc>spark-3.4</shims.minorVerSrc>
   </properties>
 
   <dependencyManagement>
@@ -501,7 +501,7 @@ under the License.
         <!-- we don't add special test suits for spark-3.2, so a not existed dir is specified-->
         <additional.3_3.test.source>not-needed-yet</additional.3_3.test.source>
         <additional.3_4.test.source>not-needed-yet</additional.3_4.test.source>
-        <shims.minorSource>spark-3.2</shims.minorSource>
+        <shims.minorVerSrc>spark-3.2</shims.minorVerSrc>
       </properties>
     </profile>
 
@@ -514,7 +514,7 @@ under the License.
         <parquet.version>1.12.0</parquet.version>
         <additional.3_3.test.source>spark-3.3-plus</additional.3_3.test.source>
         <additional.3_4.test.source>not-needed-yet</additional.3_4.test.source>
-        <shims.minorSource>spark-3.3</shims.minorSource>
+        <shims.minorVerSrc>spark-3.3</shims.minorVerSrc>
       </properties>
     </profile>
 
@@ -526,7 +526,7 @@ under the License.
         <parquet.version>1.13.1</parquet.version>
         <additional.3_3.test.source>spark-3.3-plus</additional.3_3.test.source>
         <additional.3_4.test.source>spark-3.4</additional.3_4.test.source>
-        <shims.minorSource>spark-3.4</shims.minorSource>
+        <shims.minorVerSrc>spark-3.4</shims.minorVerSrc>
       </properties>
     </profile>
 
diff --git a/spark/pom.xml b/spark/pom.xml
index 8c900451a..f8fe68221 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -258,8 +258,8 @@ under the License.
             </goals>
             <configuration>
               <sources>
-                <source>src/main/${shims.majorSource}</source>
-                <source>src/main/${shims.minorSource}</source>
+                <source>src/main/${shims.majorVerSrc}</source>
+                <source>src/main/${shims.minorVerSrc}</source>
               </sources>
             </configuration>
           </execution>
diff --git a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
index b59dd7324..62e26247c 100644
--- a/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
+++ b/spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
@@ -1026,15 +1026,11 @@ class CometExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelper {
   }
 
   test("unhex") {
-    Seq(false, true).foreach { dictionary =>
-      withSQLConf("parquet.enable.dictionary" -> dictionary.toString) {
-        val table = "test"
-        withTable(table) {
-          sql(s"create table $table(col string) using parquet")
-          sql(s"insert into $table values('537061726B2053514C')")
-          checkSparkAnswerAndOperator(s"SELECT unhex(col) FROM $table")
-        }
-      }
+    val table = "test"
+    withTable(table) {
+      sql(s"create table $table(col string) using parquet")
+      sql(s"insert into $table values('537061726B2053514C')")
+      checkSparkAnswerAndOperator(s"SELECT unhex(col) FROM $table")
     }
   }