Skip to content

Commit 36cdab4

Browse files
authored
Change default Scala version to 2.13 (#18100)
* Change default Scala version to 2.13 * Fix Scala 2.13 array equality in spark common tests
1 parent 15b0de3 commit 36cdab4

6 files changed

Lines changed: 36 additions & 30 deletions

File tree

LICENSE-binary

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.21.1
223223
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.21.1
224224
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.21.1
225225
com.fasterxml.jackson.module:jackson-module-parameter-names:2.21.1
226-
com.fasterxml.jackson.module:jackson-module-scala_2.12:2.21.1
226+
com.fasterxml.jackson.module:jackson-module-scala_2.13:2.21.1
227227
com.fasterxml.woodstox:woodstox-core:7.1.1
228228
com.github.ben-manes.caffeine:caffeine:2.9.3
229229
com.github.erosb:everit-json-schema:1.14.6
@@ -279,7 +279,7 @@ com.squareup.wire:wire-schema-jvm:5.1.0
279279
com.squareup:javapoet:1.13.0
280280
com.squareup:kotlinpoet-jvm:1.18.1
281281
com.tdunning:t-digest:3.2
282-
com.typesafe.scala-logging:scala-logging_2.12:3.9.5
282+
com.typesafe.scala-logging:scala-logging_2.13:3.9.5
283283
com.uber:h3:4.4.0
284284
com.yammer.metrics:metrics-core:2.2.0
285285
com.yscope.clp:clp-ffi:0.4.7
@@ -459,7 +459,7 @@ org.apache.kafka:kafka-storage-api:3.9.2
459459
org.apache.kafka:kafka-storage:3.9.2
460460
org.apache.kafka:kafka-tools-api:3.9.2
461461
org.apache.kafka:kafka-transaction-coordinator:3.9.2
462-
org.apache.kafka:kafka_2.12:3.9.2
462+
org.apache.kafka:kafka_2.13:3.9.2
463463
org.apache.kerby:kerb-core:2.1.1
464464
org.apache.kerby:kerb-crypto:2.1.1
465465
org.apache.kerby:kerb-util:2.1.1
@@ -493,8 +493,8 @@ org.apache.pulsar:bouncy-castle-bc:4.0.9
493493
org.apache.pulsar:pulsar-client-admin-api:4.0.9
494494
org.apache.pulsar:pulsar-client-api:4.0.9
495495
org.apache.pulsar:pulsar-client:4.0.9
496-
org.apache.spark:spark-launcher_2.12:3.5.8
497-
org.apache.spark:spark-tags_2.12:3.5.8
496+
org.apache.spark:spark-launcher_2.13:3.5.8
497+
org.apache.spark:spark-tags_2.13:3.5.8
498498
org.apache.thrift:libthrift:0.22.0
499499
org.apache.yetus:audience-annotations:0.15.1
500500
org.apache.zookeeper:zookeeper-jute:3.9.5
@@ -532,10 +532,10 @@ org.locationtech.proj4j:proj4j:1.2.2
532532
org.lz4:lz4-java:1.8.0
533533
org.quartz-scheduler:quartz:2.5.2
534534
org.roaringbitmap:RoaringBitmap:1.6.12
535-
org.scala-lang.modules:scala-collection-compat_2.12:2.10.0
536-
org.scala-lang.modules:scala-java8-compat_2.12:1.0.2
537-
org.scala-lang:scala-library:2.12.20
538-
org.scala-lang:scala-reflect:2.12.20
535+
org.scala-lang.modules:scala-collection-compat_2.13:2.10.0
536+
org.scala-lang.modules:scala-java8-compat_2.13:1.0.2
537+
org.scala-lang:scala-library:2.13.18
538+
org.scala-lang:scala-reflect:2.13.18
539539
org.slf4j:jcl-over-slf4j:2.0.17
540540
org.webjars:swagger-ui:5.32.0
541541
org.xerial.snappy:snappy-java:1.1.10.8

pinot-connectors/pinot-spark-3-connector/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</properties>
8181
</profile>
8282
<profile>
83-
<id>scala-2.12</id>
83+
<id>scala-build</id>
8484
<activation>
8585
<activeByDefault>true</activeByDefault>
8686
</activation>

pinot-connectors/pinot-spark-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<profiles>
3737
<profile>
38-
<id>scala-2.12</id>
38+
<id>scala-build</id>
3939
<activation>
4040
<activeByDefault>true</activeByDefault>
4141
</activation>

pinot-connectors/pinot-spark-common/src/test/scala/org/apache/pinot/connector/spark/common/PinotDataSourceWriteOptionsTest.scala

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,7 @@ class PinotDataSourceWriteOptionsTest extends BaseTest {
5151
Array("col7", "col8")
5252
)
5353

54-
pinotDataSourceWriteOptions.tableName shouldEqual expected.tableName
55-
pinotDataSourceWriteOptions.segmentNameFormat shouldEqual expected.segmentNameFormat
56-
pinotDataSourceWriteOptions.savePath shouldEqual expected.savePath
57-
pinotDataSourceWriteOptions.timeColumnName shouldEqual expected.timeColumnName
58-
pinotDataSourceWriteOptions.invertedIndexColumns shouldEqual expected.invertedIndexColumns.deep
59-
pinotDataSourceWriteOptions.noDictionaryColumns shouldEqual expected.noDictionaryColumns.deep
60-
pinotDataSourceWriteOptions.bloomFilterColumns shouldEqual expected.bloomFilterColumns.deep
61-
pinotDataSourceWriteOptions.rangeIndexColumns shouldEqual expected.rangeIndexColumns.deep
62-
54+
assertWriteOptions(pinotDataSourceWriteOptions, expected)
6355
}
6456

6557
test("Should throw exception if `table` option is missing") {
@@ -121,6 +113,19 @@ class PinotDataSourceWriteOptionsTest extends BaseTest {
121113
Array.empty
122114
)
123115

124-
pinotDataSourceWriteOptions shouldEqual expected
116+
assertWriteOptions(pinotDataSourceWriteOptions, expected)
117+
}
118+
119+
private def assertWriteOptions(actual: PinotDataSourceWriteOptions, expected: PinotDataSourceWriteOptions): Unit = {
120+
actual.tableName shouldEqual expected.tableName
121+
actual.segmentNameFormat shouldEqual expected.segmentNameFormat
122+
actual.savePath shouldEqual expected.savePath
123+
actual.timeColumnName shouldEqual expected.timeColumnName
124+
actual.timeFormat shouldEqual expected.timeFormat
125+
actual.timeGranularity shouldEqual expected.timeGranularity
126+
actual.invertedIndexColumns.toSeq shouldEqual expected.invertedIndexColumns.toSeq
127+
actual.noDictionaryColumns.toSeq shouldEqual expected.noDictionaryColumns.toSeq
128+
actual.bloomFilterColumns.toSeq shouldEqual expected.bloomFilterColumns.toSeq
129+
actual.rangeIndexColumns.toSeq shouldEqual expected.rangeIndexColumns.toSeq
125130
}
126131
}

pinot-plugins/pinot-input-format/pinot-confluent-json/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
<scope>test</scope>
8484
</dependency>
8585
<!--
86-
VERSION OVERRIDE EXCEPTION: scala-library uses ${scala-2.13.version} instead of the root-managed
87-
${scala.version} (2.12). Confluent's kafka-json-schema-serializer transitively depends on
88-
Scala 2.13, so this test dependency must align with Scala 2.13 to avoid binary incompatibility.
86+
VERSION OVERRIDE EXCEPTION: Confluent's kafka-json-schema-serializer transitively depends on
87+
Scala 2.13, so this test dependency stays pinned to ${scala-2.13.version} even when Pinot is
88+
built with -Pscala-2.12.
8989
-->
9090
<dependency>
9191
<groupId>org.scala-lang</groupId>

pom.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,10 @@
266266
<google.jsr305.version>3.0.2</google.jsr305.version>
267267

268268
<!-- Configuration for Scala -->
269-
<scala.version>2.12.20</scala.version>
269+
<scala-2.12.version>2.12.20</scala-2.12.version>
270270
<scala-2.13.version>2.13.18</scala-2.13.version>
271-
<scala.compat.version>2.12</scala.compat.version>
271+
<scala.version>${scala-2.13.version}</scala.version>
272+
<scala.compat.version>2.13</scala.compat.version>
272273

273274
<!-- For Dependency Verifier module -->
274275
<enforcer-api.version>3.6.2</enforcer-api.version>
@@ -538,13 +539,13 @@
538539
</profile>
539540

540541
<profile>
541-
<id>scala-2.13</id>
542+
<id>scala-2.12</id>
542543
<activation>
543544
<activeByDefault>false</activeByDefault>
544545
</activation>
545546
<properties>
546-
<scala.version>2.13.16</scala.version>
547-
<scala.compat.version>2.13</scala.compat.version>
547+
<scala.version>${scala-2.12.version}</scala.version>
548+
<scala.compat.version>2.12</scala.compat.version>
548549
</properties>
549550
</profile>
550551
</profiles>
@@ -2114,7 +2115,7 @@
21142115
</dependency>
21152116
<dependency>
21162117
<groupId>com.twitter</groupId>
2117-
<artifactId>chill_2.12</artifactId>
2118+
<artifactId>chill_${scala.compat.version}</artifactId>
21182119
<version>${chill.version}</version>
21192120
</dependency>
21202121
<!-- Used by Spark and quartz -->

0 commit comments

Comments
 (0)