Skip to content

Commit

Permalink
refactor: rename majorSource to majorVerSrc, same with minor
Browse files Browse the repository at this point in the history
  • Loading branch information
tshauck committed May 3, 2024
1 parent a378f74 commit 112c7c6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
4 changes: 2 additions & 2 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions spark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 5 additions & 9 deletions spark/src/test/scala/org/apache/comet/CometExpressionSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down

0 comments on commit 112c7c6

Please sign in to comment.