Skip to content

[SPARK-53585][BUILD] Upgrade Scala to 2.13.17 #52509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+8 −8
Closed

[SPARK-53585][BUILD] Upgrade Scala to 2.13.17 #52509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jakarta.validation-api/3.0.2//jakarta.validation-api-3.0.2.jar
jakarta.ws.rs-api/3.0.0//jakarta.ws.rs-api-3.0.0.jar
jakarta.xml.bind-api/4.0.2//jakarta.xml.bind-api-4.0.2.jar
janino/3.1.9//janino-3.1.9.jar
java-diff-utils/4.15//java-diff-utils-4.15.jar
java-diff-utils/4.16//java-diff-utils-4.16.jar
java-xmlbuilder/1.2//java-xmlbuilder-1.2.jar
javassist/3.30.2-GA//javassist-3.30.2-GA.jar
javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar
Expand All @@ -142,7 +142,7 @@ jjwt-api/0.12.6//jjwt-api-0.12.6.jar
jjwt-impl/0.12.6//jjwt-impl-0.12.6.jar
jjwt-jackson/0.12.6//jjwt-jackson-0.12.6.jar
jline/2.14.6//jline-2.14.6.jar
jline/3.27.1/jdk8/jline-3.27.1-jdk8.jar
jline/3.29.0/jdk8/jline-3.29.0-jdk8.jar
joda-time/2.14.0//joda-time-2.14.0.jar
jpam/1.1//jpam-1.1.jar
json/1.8//json-1.8.jar
Expand Down Expand Up @@ -264,11 +264,11 @@ pickle/1.5//pickle-1.5.jar
py4j/0.10.9.9//py4j-0.10.9.9.jar
remotetea-oncrpc/1.1.2//remotetea-oncrpc-1.1.2.jar
rocksdbjni/9.8.4//rocksdbjni-9.8.4.jar
scala-compiler/2.13.16//scala-compiler-2.13.16.jar
scala-library/2.13.16//scala-library-2.13.16.jar
scala-compiler/2.13.17//scala-compiler-2.13.17.jar
scala-library/2.13.17//scala-library-2.13.17.jar
scala-parallel-collections_2.13/1.2.0//scala-parallel-collections_2.13-1.2.0.jar
scala-parser-combinators_2.13/2.4.0//scala-parser-combinators_2.13-2.4.0.jar
scala-reflect/2.13.16//scala-reflect-2.13.16.jar
scala-reflect/2.13.17//scala-reflect-2.13.17.jar
scala-xml_2.13/2.3.0//scala-xml_2.13-2.3.0.jar
slf4j-api/2.0.17//slf4j-api-2.0.17.jar
snakeyaml-engine/2.10//snakeyaml-engine-2.10.jar
Expand Down
2 changes: 1 addition & 1 deletion docs/_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include:
SPARK_VERSION: 4.1.0-SNAPSHOT
SPARK_VERSION_SHORT: 4.1.0
SCALA_BINARY_VERSION: "2.13"
SCALA_VERSION: "2.13.16"
SCALA_VERSION: "2.13.17"
SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK
SPARK_GITHUB_URL: https://github.com/apache/spark
# Before a new release, we should:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
<!-- managed up from 3.2.1 for SPARK-11652 -->
<commons.collections.version>3.2.2</commons.collections.version>
<commons.collections4.version>4.5.0</commons.collections4.version>
<scala.version>2.13.16</scala.version>
<scala.version>2.13.17</scala.version>
<scala.binary.version>2.13</scala.binary.version>
<scalatest-maven-plugin.version>2.2.0</scalatest-maven-plugin.version>
<scala-maven-plugin.version>4.9.5</scala-maven-plugin.version>
Expand Down
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]]
children.map(_.height).reduceOption(_ max _).getOrElse(0) + 1)
def height: Int = _height()

private val _hashCode = new BestEffortLazyVal[Integer](() => MurmurHash3.productHash(this))
private val _hashCode = new BestEffortLazyVal[Integer](() => MurmurHash3.caseClassHash(this))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

productHash is deprecated in 2.13.17

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And, please spin off this as a new PR if productHash still exists, @vrozov .

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dongjoon-hyun productHash() is deprecated:

[ERROR] [Error] /local/home/vrozov/ws/spark-sbt/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala:226: method productHash in object MurmurHash3 is deprecated (since 2.13.17): use `caseClassHash` instead
Applicable -Wconf / @nowarn filters for this fatal warning: msg=<part of the message>, cat=deprecation, site=org.apache.spark.sql.catalyst.trees.TreeNode._hashCode.$anonfun, origin=scala.util.hashing.MurmurHash3.productHash, version=2.13.17

override def hashCode(): Int = _hashCode()

/**
Expand Down