Skip to content

[SPARK-41196] [CONNECT] Homogenize the protobuf version across the Spark connect server to use the same major version.#38693

Closed
grundprinzip wants to merge 4 commits intoapache:masterfrom
grundprinzip:proto-python
Closed

[SPARK-41196] [CONNECT] Homogenize the protobuf version across the Spark connect server to use the same major version.#38693
grundprinzip wants to merge 4 commits intoapache:masterfrom
grundprinzip:proto-python

Conversation

@grundprinzip
Copy link
Contributor

@grundprinzip grundprinzip commented Nov 17, 2022

What changes were proposed in this pull request?

This patch homogenize the protobuf versions between the Spark Connect server and Python clients to use the same major version.

Why are the changes needed?

Compatibility

Does this PR introduce any user-facing change?

No

How was this patch tested?

Existing UT.

@amaliujia
Copy link
Contributor

amaliujia commented Nov 17, 2022

@grundprinzip

You need to re-generate for the Python side.

@amaliujia
Copy link
Contributor

Also need to make the Scala side version consistent https://github.com/apache/spark/blob/master/connector/connect/pom.xml#L35?

@grundprinzip grundprinzip changed the title Homogenize the python proto version [SPARK-41196] [CONNECT] Homogenize the protobuf version across the Spark connect server to use the same major version. Nov 18, 2022
Copy link
Contributor

@hvanhovell hvanhovell left a comment

Choose a reason for hiding this comment

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

LGTM

@amaliujia
Copy link
Contributor

LGTM

HyukjinKwon pushed a commit that referenced this pull request Nov 19, 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. #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](#38693) 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.

### 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 #38718 from amaliujia/fix_out_of_sync_proto.

Authored-by: Rui Wang <rui.wang@databricks.com>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
@AmplabJenkins
Copy link

Can one of the admins verify this patch?

zhengruifeng added a commit that referenced this pull request Nov 22, 2022
### What changes were proposed in this pull request?
pin `protobuf==3.19.4` in tests

### Why are the changes needed?
versions were already changed in #38693

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

### How was this patch tested?
updated CI

Closes #38729 from zhengruifeng/connect_infra_protobuf.

Authored-by: Ruifeng Zheng <ruifengz@apache.org>
Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
SandishKumarHN pushed a commit to SandishKumarHN/spark that referenced this pull request Dec 12, 2022
…rk connect server to use the same major version

### What changes were proposed in this pull request?

This patch homogenize the protobuf versions between the Spark Connect server and Python clients to use the same major version.

### Why are the changes needed?
Compatibility

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

### How was this patch tested?
Existing UT.

Closes apache#38693 from grundprinzip/proto-python.

Lead-authored-by: Martin Grund <martin.grund@databricks.com>
Co-authored-by: Martin Grund <grundprinzip@gmail.com>
Signed-off-by: Herman van Hovell <herman@databricks.com>
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>
SandishKumarHN pushed a commit to SandishKumarHN/spark that referenced this pull request Dec 12, 2022
### What changes were proposed in this pull request?
pin `protobuf==3.19.4` in tests

### Why are the changes needed?
versions were already changed in apache#38693

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

### How was this patch tested?
updated CI

Closes apache#38729 from zhengruifeng/connect_infra_protobuf.

Authored-by: Ruifeng Zheng <ruifengz@apache.org>
Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
beliefer pushed a commit to beliefer/spark that referenced this pull request Dec 15, 2022
…rk connect server to use the same major version

### What changes were proposed in this pull request?

This patch homogenize the protobuf versions between the Spark Connect server and Python clients to use the same major version.

### Why are the changes needed?
Compatibility

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

### How was this patch tested?
Existing UT.

Closes apache#38693 from grundprinzip/proto-python.

Lead-authored-by: Martin Grund <martin.grund@databricks.com>
Co-authored-by: Martin Grund <grundprinzip@gmail.com>
Signed-off-by: Herman van Hovell <herman@databricks.com>
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 15, 2022
### What changes were proposed in this pull request?
pin `protobuf==3.19.4` in tests

### Why are the changes needed?
versions were already changed in apache#38693

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

### How was this patch tested?
updated CI

Closes apache#38729 from zhengruifeng/connect_infra_protobuf.

Authored-by: Ruifeng Zheng <ruifengz@apache.org>
Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
beliefer pushed a commit to beliefer/spark that referenced this pull request Dec 18, 2022
…rk connect server to use the same major version

### What changes were proposed in this pull request?

This patch homogenize the protobuf versions between the Spark Connect server and Python clients to use the same major version.

### Why are the changes needed?
Compatibility

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

### How was this patch tested?
Existing UT.

Closes apache#38693 from grundprinzip/proto-python.

Lead-authored-by: Martin Grund <martin.grund@databricks.com>
Co-authored-by: Martin Grund <grundprinzip@gmail.com>
Signed-off-by: Herman van Hovell <herman@databricks.com>
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>
beliefer pushed a commit to beliefer/spark that referenced this pull request Dec 18, 2022
### What changes were proposed in this pull request?
pin `protobuf==3.19.4` in tests

### Why are the changes needed?
versions were already changed in apache#38693

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

### How was this patch tested?
updated CI

Closes apache#38729 from zhengruifeng/connect_infra_protobuf.

Authored-by: Ruifeng Zheng <ruifengz@apache.org>
Signed-off-by: Ruifeng Zheng <ruifengz@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants