Bump protobuf to v3.18.x by rschu1ze · Pull Request #50400 · ClickHouse/ClickHouse

rschu1ze · 2023-05-31T16:45:27Z

This PR

references protobuf in a new, forked repository instead of this repo which is a source dump of upstream protobuf. This simplifies future upgrades
upgrades protobuf from v3.17.x to v3.18 which fixes CVE-2022-1941

Most of the custom patches in the previous repository seem no longer necessary, so they were not transferred (~~though I have the feeling that we'll need one or two, let's see what CI says~~ A msan fix was transferred, that's all.).

@larryluogit

Changelog category (leave one):

Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Bump internal protobuf to v3.18 (fixes CVE-2022-1941)

robot-clickhouse-ci-2 · 2023-05-31T16:49:27Z

This is an automated comment for commit 9490cd4 with description of existing statuses. It's updated for the latest CI running
The full report is available here
The overall status of the commit is 🔴 failure

Check name	Description	Status
AST fuzzer	Runs randomly generated queries to catch program errors. The build type is optionally given in parenthesis. If it fails, ask a maintainer for help	🟢 success
CI running	A meta-check that indicates the running CI. Normally, it's in success or pending state. The failed status indicates some problems with the PR	🟡 pending
ClickHouse build check	Builds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The cmake options can be found in the build log, grepping for cmake. Use these options and follow the general build process	🟢 success
Compatibility check	Checks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help	🟢 success
Docker image for servers	The check to build and optionally push the mentioned image to docker hub	🟢 success
Fast test	Normally this is the first check that is ran for a PR. It builds ClickHouse and runs most of stateless functional tests, omitting some. If it fails, further checks are not started until it is fixed. Look at the report to see which tests fail, then reproduce the failure locally as described here	🟢 success
Flaky tests	Checks if new added or modified tests are flaky by running them repeatedly, in parallel, with more randomization. Functional tests are run 100 times with address sanitizer, and additional randomization of thread scheduling. Integrational tests are run up to 10 times. If at least once a new test has failed, or was too long, this check will be red. We don't allow flaky tests, read the doc	🟢 success
Install packages	Checks that the built packages are installable in a clear environment	🟢 success
Integration tests	The integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests	🔴 failure
Mergeable Check	Checks if all other necessary checks are successful	🔴 failure
Performance Comparison	Measure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests	🟢 success
Push to Dockerhub	The check for building and pushing the CI related docker images to docker hub	🟢 success
SQLancer	Fuzzing tests that detect logical bugs with SQLancer tool	🟢 success
Sqllogic	Run clickhouse on the sqllogic test set against sqlite and checks that all statements are passed	🟢 success
Stateful tests	Runs stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc	🟢 success
Stateless tests	Runs stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc	🔴 failure
Stress test	Runs stateless functional tests concurrently from several clients to detect concurrency-related errors	🟢 success
Style Check	Runs a set of checks to keep the code style clean. If some of tests failed, see the related log from the report	🟢 success
Unit tests	Runs the unit tests for different release types	🟢 success
Upgrade check	Runs stress tests on server version from last release and then tries to upgrade it to the version from the PR. It checks if the new server can successfully startup without any errors, crashes or sanitizer asserts	🟢 success

rschu1ze · 2023-05-31T17:04:11Z

Note to myself: archive the old protobuf repo.

baibaichen · 2023-06-03T01:55:53Z

This version has an issue, see protocolbuffers/protobuf#9378. it's better to upgrade to newer version.

alexey-milovidov · 2023-06-03T02:54:06Z

@baibaichen, does it affect the correctness?

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20230603) * Fix Build since ClickHouse/ClickHouse#50400 * Fix Build since ClickHouse/ClickHouse#49539 * Workaround protoc's issue(protocolbuffers/protobuf#9378). --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>

baibaichen · 2023-06-03T03:49:34Z

@alexey-milovidov I am not clear how it affects correctness, we workaround it with -Wno-shadow-field, and basic UTs show no correctness issue.

But, it is definitely an issue.

alexey-milovidov · 2023-06-03T04:17:29Z

We include the 3rd-party libraries as -isystem, so it does not matter for us.

* Bump protobuf to v3.18.x (ref: ClickHouse/ClickHouse#50400) * Bump protobuf to v3.19.6 (ref: ClickHouse/ClickHouse#55963) * Bump protobuf to v3.19.6 (ref: ClickHouse/ClickHouse#50920) * Update contribe/orc (ref: ClickHouse/ClickHouse#53324) * Bump protobuf to v21.9 (ref: ClickHouse/ClickHouse#56014) * Removed unused code in google-protobuf-cmake/CMakeLists.txt (ref: ClickHouse/ClickHouse#56102) * Bump gRPC to v1.55.4 and protobuf to v22.5 (ref: ClickHouse/ClickHouse#56664) * Bump gRPC to v1.59 and protobuf to v24.4 (ref: ClickHouse/ClickHouse#56853) * enable functions in readonly mode (ref: ClickHouse/ClickHouse#42708) * Introduce more fields for in-source function documentation (ref: ClickHouse/ClickHouse#49300) * Add ability to convert timeplusd table structure to CapnProto/Protobuf format schema (ref: ClickHouse/ClickHouse#52278) * Well known protos (ref: ClickHouse/ClickHouse#56741) * Update protobuf to v25.1 (ref: ClickHouse/ClickHouse#58020) * fixed unit_tests_dbms build * Avoid ignoring errors of execute_process() (set COMMAND_ERROR_IS_FATAL=ANY) (ref: ClickHouse/ClickHouse#68267) * fixed reigsterFunction * fixed error after rebase

rschu1ze added 4 commits May 31, 2023 16:41

Add google-protobuf submodule

8c1f579

Switch protobuf to v3.18.x

8c3e256

Move protobuf entry in .gitmodules

7d8c1ff

Switch build to google-protobuf-cmake

ab6fe94

robot-clickhouse-ci-2 added pr-improvement Pull request with some product improvements submodule changed At least one submodule changed in this PR. labels May 31, 2023

rschu1ze changed the title ~~Bump protobuf~~ Bump protobuf to v3.18.x May 31, 2023

rschu1ze added 2 commits May 31, 2023 17:01

Remove old protobuf

57c88e6

Remove file deleted upstream from build description

f57c510

Add new source file

2e2f98c

alexey-milovidov approved these changes Jun 1, 2023

View reviewed changes

alexey-milovidov self-assigned this Jun 1, 2023

Include msan fix in protobuf

9490cd4

rschu1ze marked this pull request as ready for review June 1, 2023 13:16

alexey-milovidov merged commit eb5985e into master Jun 2, 2023

alexey-milovidov deleted the bump-protobuf branch June 2, 2023 02:01

baibaichen added a commit to Kyligence/gluten that referenced this pull request Jun 3, 2023

Fix Build since ClickHouse/ClickHouse#50400

473c0bf

baibaichen mentioned this pull request Jul 1, 2023

[CH] Refactor: Recover warning check apache/gluten#2168

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump protobuf to v3.18.x#50400

Bump protobuf to v3.18.x#50400
alexey-milovidov merged 8 commits intomasterfrom
bump-protobuf

rschu1ze commented May 31, 2023 •

edited

Loading

Uh oh!

robot-clickhouse-ci-2 commented May 31, 2023 •

edited by robot-ch-test-poll4

Loading

Uh oh!

rschu1ze commented May 31, 2023

Uh oh!

baibaichen commented Jun 3, 2023

Uh oh!

alexey-milovidov commented Jun 3, 2023

Uh oh!

baibaichen commented Jun 3, 2023 •

edited

Loading

Uh oh!

alexey-milovidov commented Jun 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

rschu1ze commented May 31, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changelog category (leave one):

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Uh oh!

robot-clickhouse-ci-2 commented May 31, 2023 • edited by robot-ch-test-poll4 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rschu1ze commented May 31, 2023

Uh oh!

baibaichen commented Jun 3, 2023

Uh oh!

alexey-milovidov commented Jun 3, 2023

Uh oh!

baibaichen commented Jun 3, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexey-milovidov commented Jun 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rschu1ze commented May 31, 2023 •

edited

Loading

robot-clickhouse-ci-2 commented May 31, 2023 •

edited by robot-ch-test-poll4

Loading

baibaichen commented Jun 3, 2023 •

edited

Loading