Skip to content

Commit

Permalink
[SPARK-42490][BUILD] Upgrade protobuf-java from 3.21.12 to 3.22.0
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?
This pr aims upgrade `protobuf-java` from 3.21.12 to 3.22.0

### Why are the changes needed?
The new version bring some improvements like:

- Use bit-field int values in buildPartial to skip work on unset groups of fields. (protocolbuffers/protobuf@2326aef)
- Fix serialization warnings in generated code when compiling with Java 18 and above (protocolbuffers/protobuf#10561)
- Enable Text format parser to skip unknown short-formed repeated fields. (protocolbuffers/protobuf@6dbd413)
- Add serialVersionUID to ByteString and subclasses (protocolbuffers/protobuf#10718)

and some bug fix like:
- Mark default instance as immutable first to avoid race during static initialization of default instances. (protocolbuffers/protobuf#10770)

- Fix Timestamps fromDate for negative 'exact second' java.sql.Timestamps (protocolbuffers/protobuf#10321)
- Fix Timestamps.fromDate to correctly handle java.sql.Timestamps before unix epoch (protocolbuffers/protobuf#10126)
- Fix bug in nested builder caching logic where cleared sub-field builders would remain dirty after a clear and build in a parent layer. protocolbuffers/protobuf#10624

The release notes as follows:

- https://github.com/protocolbuffers/protobuf/releases/tag/v22.0

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
Pass GitHub Actions

Closes #40084 from LuciferYang/SPARK-42490.

Authored-by: yangjie01 <yangjie01@baidu.com>
Signed-off-by: Sean Owen <srowen@gmail.com>
  • Loading branch information
LuciferYang authored and srowen committed Feb 20, 2023
1 parent 09d1e94 commit 66ab715
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<protobuf.hadoopDependency.version>2.5.0</protobuf.hadoopDependency.version>
<!-- Actual Protobuf version in Spark modules like Spark Connect, protobuf connector, etc. -->
<!-- SPARK-41247: When updating `protobuf.version`, also need to update `protoVersion` in `SparkBuild.scala` -->
<protobuf.version>3.21.12</protobuf.version>
<protobuf.version>3.22.0</protobuf.version>
<protoc-jar-maven-plugin.version>3.11.4</protoc-jar-maven-plugin.version>
<yarn.version>${hadoop.version}</yarn.version>
<zookeeper.version>3.6.3</zookeeper.version>
Expand Down
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ object BuildCommons {

// Google Protobuf version used for generating the protobuf.
// SPARK-41247: needs to be consistent with `protobuf.version` in `pom.xml`.
val protoVersion = "3.21.12"
val protoVersion = "3.22.0"
// GRPC version used for Spark Connect.
val gprcVersion = "1.47.0"
}
Expand Down

0 comments on commit 66ab715

Please sign in to comment.