Merged
Conversation
Contributor
clickhouse-gh
bot
added
pr-improvement
thevar1able
force-pushed
the
bump-google-protobuf
branch
from
9ebca2a to
18b09eb
Compare
rschu1ze
approved these changes
Jun 18, 2025
| private: | ||
| // Overrides google::protobuf::compiler::MultiFileErrorCollector: | ||
| void AddError(const String & filename, int line, int column, const String & message) override | ||
| void RecordError(absl::string_view filename, int line, int column, absl::string_view message) override |
Member
There was a problem hiding this comment.
Google eating its own dogfood.
|
|
||
| add_dependencies(_hdfs3 protoc) | ||
| target_compile_options(_hdfs3 PRIVATE | ||
| -include "${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src/google/protobuf/stubs/port.h" |
Member
There was a problem hiding this comment.
So this header-includes a file, right? Not very pretty to do this via CMake. What is the reason for that? Is it because 3rd-party deps can't include headers from other 3rd party deps? Maybe you can try with target_include_directories instead?
Member
Author
There was a problem hiding this comment.
The issue is that orc and hdfs used to include stubs/port.h from protobuf transitively (so they imported just the protobuf-related headers), but are also relying on google::protobuf::uint8 (or similar) types. After the update the stubs/port.h header containing those types does not come transitively anymore, so I had to force-include it with compiler flags.
| target_include_directories(_orc SYSTEM BEFORE PUBLIC | ||
| ${ORC_INCLUDE_DIR} | ||
| "${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src/orc/c++/include") | ||
| target_compile_options(_orc PRIVATE |
robot-clickhouse-ci-2
added
the
pr-synced-to-cloud
robot-ch-test-poll
added a commit
that referenced
this pull request
Jun 26, 2025
Cherry pick #81976 to 25.6: Bump `google-protobuf` to v31.1
robot-clickhouse
added a commit
that referenced
this pull request
Jun 26, 2025
robot-clickhouse-ci-1
added
the
pr-backports-created-cloud
robot-ch-test-poll4
added
the
pr-backports-created
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 26, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 27, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 28, 2025
baibaichen
pushed a commit
to Kyligence/gluten
that referenced
this pull request
Jun 29, 2025
baibaichen
pushed a commit
to apache/gluten
that referenced
this pull request
Jun 29, 2025
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250629) * Fix Build due to ClickHouse/ClickHouse#80931 * Fix Build due to ClickHouse/ClickHouse#81976 * Fix Build due to ClickHouse/ClickHouse#82508 * Try to Fix issue caused by ClickHouse/ClickHouse#81754 see ClickHouse/ClickHouse#82379 * Fix UT due to ClickHouse/ClickHouse#82358 --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang chen <[email protected]>
robot-clickhouse
added
the
pr-must-backport-synced
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
6 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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Use
google-protobufv31.1