[SPARK-41196][CONNECT][FOLLOW-UP] Fix out of sync generated files for Python#38718
Closed
amaliujia wants to merge 1 commit intoapache:masterfrom
Closed
[SPARK-41196][CONNECT][FOLLOW-UP] Fix out of sync generated files for Python#38718amaliujia wants to merge 1 commit intoapache:masterfrom
amaliujia wants to merge 1 commit intoapache:masterfrom
Conversation
Contributor
Author
HyukjinKwon
approved these changes
Nov 19, 2022
Member
|
Merged to master. |
Contributor
|
late lgtm |
Contributor
|
it seems that the versions in |
SandishKumarHN
pushed a commit
to SandishKumarHN/spark
that referenced
this pull request
Dec 12, 2022
… Python ### What changes were proposed in this pull request? Fix out of sync generated files for Python. This happens on a rare case for protobuf version change. apache#38693 downgraded protobuf versions. There were something not generated before but with the protobuf version downgraded that was generated (and this is why there was no merge conflict). However [the downgrading PR](apache#38693) was based on old code before apache#38638 so the protobuf generates based on stale code which leads to stale generated files. The way to better avoid this is when upon such change, it should lock the repo (partially on some directory to reduce impact), do the work, merge, and enforce pending PR to rebase. However this is not feasible (or too heavy) for concurrent development on Spark repo. ### Why are the changes needed? Fix out of sync generated files for Python. ### Does this PR introduce _any_ user-facing change? NO ### How was this patch tested? UT Closes apache#38718 from amaliujia/fix_out_of_sync_proto. Authored-by: Rui Wang <rui.wang@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
beliefer
pushed a commit
to beliefer/spark
that referenced
this pull request
Dec 15, 2022
… Python ### What changes were proposed in this pull request? Fix out of sync generated files for Python. This happens on a rare case for protobuf version change. apache#38693 downgraded protobuf versions. There were something not generated before but with the protobuf version downgraded that was generated (and this is why there was no merge conflict). However [the downgrading PR](apache#38693) was based on old code before apache#38638 so the protobuf generates based on stale code which leads to stale generated files. The way to better avoid this is when upon such change, it should lock the repo (partially on some directory to reduce impact), do the work, merge, and enforce pending PR to rebase. However this is not feasible (or too heavy) for concurrent development on Spark repo. ### Why are the changes needed? Fix out of sync generated files for Python. ### Does this PR introduce _any_ user-facing change? NO ### How was this patch tested? UT Closes apache#38718 from amaliujia/fix_out_of_sync_proto. Authored-by: Rui Wang <rui.wang@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
beliefer
pushed a commit
to beliefer/spark
that referenced
this pull request
Dec 18, 2022
… Python ### What changes were proposed in this pull request? Fix out of sync generated files for Python. This happens on a rare case for protobuf version change. apache#38693 downgraded protobuf versions. There were something not generated before but with the protobuf version downgraded that was generated (and this is why there was no merge conflict). However [the downgrading PR](apache#38693) was based on old code before apache#38638 so the protobuf generates based on stale code which leads to stale generated files. The way to better avoid this is when upon such change, it should lock the repo (partially on some directory to reduce impact), do the work, merge, and enforce pending PR to rebase. However this is not feasible (or too heavy) for concurrent development on Spark repo. ### Why are the changes needed? Fix out of sync generated files for Python. ### Does this PR introduce _any_ user-facing change? NO ### How was this patch tested? UT Closes apache#38718 from amaliujia/fix_out_of_sync_proto. Authored-by: Rui Wang <rui.wang@databricks.com> Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
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
3 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.
What changes were proposed in this pull request?
Fix out of sync generated files for Python.
This happens on a rare case for protobuf version change. #38693 downgraded protobuf versions.
There were something not generated before but with the protobuf version downgraded that was generated (and this is why there was no merge conflict). However the downgrading PR was based on old code before #38638 so the protobuf generates based on stale code which leads to stale generated files.
The way to better avoid this is when upon such change, it should lock the repo (partially on some directory to reduce impact), do the work, merge, and enforce pending PR to rebase. However this is not feasible (or too heavy) for concurrent development on Spark repo.
Another approach is to ask relevant PR to rebase, re-generate for python then merge. Though there could be still a gap here (a PR merged right right before merge button clicked) but that is minimized.
Why are the changes needed?
Fix out of sync generated files for Python.
Does this PR introduce any user-facing change?
NO
How was this patch tested?
UT