Update protobuf to v25.1 by mkmkme · Pull Request #58020 · ClickHouse/ClickHouse

mkmkme · 2023-12-19T06:50:08Z

Protobuf v25.1 deprecates syntax() and makes it inaccessible. Instead, the attributes corresponding to a feature should be used. This commit addresses this.

Changelog category (leave one):

Not for changelog (changelog entry is not required)

robot-ch-test-poll · 2023-12-19T07:49:06Z

This is an automated comment for commit 3c35f14 with description of existing statuses. It's updated for the latest CI running

❌ Click here to open a full report in a separate page

Check name	Description	Status
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
Mergeable Check	Checks if all other necessary checks are successful	❌ failure
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	❌ failure

Successful checks

Check name	Description	Status
A Sync	There's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS	✅ success
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
ClickBench	Runs [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table	✅ success
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 keeper image	The check to build and optionally push the mentioned image to docker hub	✅ success
Docker server image	The check to build and optionally push the mentioned image to docker hub	✅ success
Docs check	Builds and tests the documentation	✅ 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	✅ success
PR Check	There's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS	✅ success
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
Stateful tests	Runs stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc	✅ 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

The new version deprecates `syntax()` and makes it inaccessible. Instead, the attributes corresponding to a feature should be used. This commit addresses this.

rschu1ze

One additional question: There are lots of .proto files in the repository (e.g. under tests/). Should we migrate them from syntax v2/v3 to editions - basically to make everything future-proof?

src/Formats/ProtobufSerializer.cpp

rschu1ze · 2024-03-05T19:50:03Z

src/Formats/ProtobufSerializer.cpp

        if (google_wrappers_special_treatment && isGoogleWrapperField(field_descriptor))
            return false;
-        return field_descriptor.message_type() || (field_descriptor.file()->syntax() == google::protobuf::FileDescriptor::SYNTAX_PROTO3);
+        return field_descriptor.message_type() || !field_descriptor.has_presence();


(I don't really understand the change but that's okay)

mkmkme · 2024-03-06T12:33:39Z

One additional question: There are lots of .proto files in the repository (e.g. under tests/). Should we migrate them from syntax v2/v3 to editions - basically to make everything future-proof?

We can. But I would also keep the files with explicit syntax for now to check that backwards compatibility is not broken. WDYT?

rschu1ze · 2024-03-07T10:14:53Z

Yes, let's keep the v2 and v3 tests for backwards compatibility (forget about my previous idea of converting them all to editions).

There are actually not that many tests for protobuf. Many of them test with the same protobuf file in v2 and v3 syntaxes. Maybe it is possible to add tests with protobuf file as editions=2023 for them?

mkmkme · 2024-03-07T10:51:14Z

Sure, I can add them!

rschu1ze

Lgtm, thanks! (please just fix the style check)

…-25.1

* 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