merge 25.x to main#14617
Merged
mkruskal-google merged 32 commits intoprotocolbuffers:mainfrom Nov 2, 2023
anandolee:25.x
Merged
merge 25.x to main#14617mkruskal-google merged 32 commits intoprotocolbuffers:mainfrom anandolee:25.x
mkruskal-google merged 32 commits intoprotocolbuffers:mainfrom
anandolee:25.x
Conversation
This should fix the postsubmit test failures on 25.x by updating the checked-in files to match the new version number.
This function needs to be visible to generated code, so this CL ensures that it's exported on libprotobuf.so. PiperOrigin-RevId: 573980166
Fixes #14436 PiperOrigin-RevId: 574168872
Update version numbers for 25.0-rc2
gRPC auto-generates CMake and other build configs from the Bazel build graph, but the logic for doing this does not know how to handle filegroups. This change works around that problem by making the `:port` target refer directly to the `.inc` files instead of going through a filegroup. This solution is not ideal but I think it's probably the best way to unblock progress for now. PiperOrigin-RevId: 578333954
Previously we were allocating memory on the message's arena every time we performed a `map[key]` or `map.get(key)` operation. This is unnecessary, as the key's data is only needed ephemerally, for the duration of the lookup, and we can therefore alias the Python object's string data instead of copying it. This required fixing a bug in the convert.c operation. Previously in the `arena==NULL` case, if the user passes a bytes object instead of a unicode string, the code would return a pointer to a temporary Python object that had already been freed, leading to use-after-free. I fixed this by referencing the bytes object's data directly, and using utf8_range to verify the UTF-8. Fixes: #14571 PiperOrigin-RevId: 578563555
Fixed Python memory leak in map lookup.
25.x 202311012212
anandolee
requested review from
JasonLunn,
acozzette and
zhangskz
and removed request for
a team
github-actions
bot
removed
the
🅰️ safe for tests
anandolee
added
the
🅰️ safe for tests
github-actions
bot
removed
the
🅰️ safe for tests
protobuf-team-bot
added a commit
that referenced
this pull request
Nov 2, 2023
dongjoon-hyun
added a commit
to apache/spark
that referenced
this pull request
Nov 19, 2023
…`protobuf` 4.25.1 ### What changes were proposed in this pull request? This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. ### Why are the changes needed? `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass the CIs. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
prabhjyotsingh
pushed a commit
to acceldata-io/spark3
that referenced
this pull request
Feb 8, 2025
…atch with `protobuf` 4.25.1 This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` No. Pass the CIs. No. Closes apache#43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit de17724)
prabhjyotsingh
pushed a commit
to acceldata-io/spark3
that referenced
this pull request
Feb 8, 2025
…atch with `protobuf` 4.25.1 This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` No. Pass the CIs. No. Closes apache#43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit de17724) (cherry picked from commit cba5a11)
prabhjyotsingh
pushed a commit
to acceldata-io/spark3
that referenced
this pull request
Feb 8, 2025
…atch with `protobuf` 4.25.1 This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` No. Pass the CIs. No. Closes apache#43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit de17724) (cherry picked from commit cba5a11)
shubhluck
pushed a commit
to acceldata-io/spark3
that referenced
this pull request
May 16, 2025
…atch with `protobuf` 4.25.1 This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` No. Pass the CIs. No. Closes apache#43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit de17724) (cherry picked from commit cba5a11)
senthh
pushed a commit
to acceldata-io/spark3
that referenced
this pull request
May 26, 2025
…atch with `protobuf` 4.25.1 This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` No. Pass the CIs. No. Closes apache#43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit de17724) (cherry picked from commit cba5a11)
shubhluck
pushed a commit
to acceldata-io/spark3
that referenced
this pull request
Sep 3, 2025
…atch with `protobuf` 4.25.1 This PR aims to upgrade `protobuf-java` to 3.25.1 in order to match with the corresponding `protobuf` 4.25. `protobuf 4.25` is matched with `protobuf-java 3.25`. - protocolbuffers/protobuf#14617 ``` - set(protobuf_VERSION_STRING "4.24.0") + set(protobuf_VERSION_STRING "4.25.0") - <version>3.24.0</version> + <version>3.25.0</version> ``` Note that I also ran ``` $ dev/connect-gen-protos.sh $ git status On branch SPARK-45991 Your branch is up to date with 'dongjoon/SPARK-45991'. nothing to commit, working tree clean ``` No. Pass the CIs. No. Closes apache#43886 from dongjoon-hyun/SPARK-45991. Authored-by: Dongjoon Hyun <dhyun@apple.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com> (cherry picked from commit de17724) (cherry picked from commit cba5a11)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.