Skip to content
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.

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

Add serialVersionUID to ByteString and subclasses #10718

Merged
merged 2 commits into from
Oct 20, 2022

Conversation

stickfigure
Copy link
Contributor

Addresses issue #10716

@@ -1603,6 +1606,7 @@ protected int getOffsetIntoBytes() {
// Keep this class private to avoid deadlocks in classloading across threads as ByteString's
// static initializer loads LiteralByteString and another thread loads BoundedByteString.
private static final class BoundedByteString extends LiteralByteString {
private static final long serialVersionUID = 1L;
Copy link
Member

Choose a reason for hiding this comment

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

This is a duplicate definition. I didn't notice in the earlier review that this was already defined below in the Serializable section.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ooops! Sorry, I missed that. Fixed.

@googleberg googleberg self-assigned this Oct 14, 2022
@googleberg googleberg merged commit c7647cb into protocolbuffers:main Oct 20, 2022
srowen pushed a commit to apache/spark that referenced this pull request Feb 20, 2023
### 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 <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants