Click house/v22.5 #4

rschu1ze · 2023-11-12T14:45:47Z

No description provided.

…ig-22 Fix declared dependencies for pkg-config

Without any weak ordering, btree_map fails to compile on windows 2022. Closes protocolbuffers#12289 PiperOrigin-RevId: 527019995

Fix btree issues in map tests

…2584) * Mark update script executable * Squashed 'third_party/utf8_range/' changes from 72c943dea..cd1507d14 cd1507d14 Fix typo in pkg-config file to properly link the utf8_range libraries 3f179d134 Add pkg-config file declaring Abseil dependency of utf8_range git-subtree-dir: third_party/utf8_range git-subtree-split: cd1507d1479815fbcd8ff24dc05a978a62098bae

Without this, certain failures will be silently ignored. PiperOrigin-RevId: 527718574

fix(libprotoc): export useful symbols from .so

…am repositories. Taken from https://github.com/protocolbuffers/upb/blob/main/bazel/protobuf.patch#L42 Fixes protocolbuffers#12620. PiperOrigin-RevId: 528586464

We found last week that Clang's support for `musttail` on 32-bit Linux does not seem to work reliably, so let's disable it for now. PiperOrigin-RevId: 528817403

…sttail-22 Turn off `clang::musttail` on i386

…e version specified in protobuf_deps. PiperOrigin-RevId: 528838071

Cherrypick changes for 22.4

Update UPB dep for 22.4 release

* Bump Abseil submodule to 20230125.3 * Fix gtest installation setup with submodules

PiperOrigin-RevId: 529429609

This partially addresses protocolbuffers#12201 Closes protocolbuffers#12660 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#12660 from mkruskal-google:absl-update ce07c45 PiperOrigin-RevId: 529456996

…2305041802 22.x 202305041802

These more closely follow the standard practices of our users, where dependencies are pre-installed instead of using our provided sub-modules. This will prevent issues such as protocolbuffers#12201 from reoccuring. Additionally, this cl bumps our Abseil dependency to the latest release, and fixes a GTest issue that went previously unnoticed. PiperOrigin-RevId: 529490402

This should fix protocolbuffers#12374, protocolbuffers#12375, and protocolbuffers#12450. The `protobuf_PROTOC_EXEC` variable is not defined, and I think `protobuf::protoc` is what we should be using instead. PiperOrigin-RevId: 525591320

…ixes-22 Cherrypick cmake fixes to 22.x

This also downgrades our tests to use cmake 3.10, compatible with our support window. Closes protocolbuffers#12672 PiperOrigin-RevId: 529840763

Note: gcc only supports docker images down to 9.5, and the 7.3 image is very old and problematic. A follow-up change might enable testing for GCC 7.3, which is our minimal supported version PiperOrigin-RevId: 529885733

…es-22 Backport increased C++ test coverage + fixes

When the protobuf libraries have been compiled as shared libraries the users of the library need to add `-DPROTOBUF_USE_DLLS` to their build line. Otherwise some symbols are missing. Fixes protocolbuffers#12699 FWIW, I am not sure this is an ideal fix. It may be better to fix the headers such that no macros change the ABI. Closes protocolbuffers#12700 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#12700 from coryan:fix-define-protobuf-use-dlls-in-pkg-config-file 13c792e PiperOrigin-RevId: 530116678

My sketch to fix protocolbuffers#12672 was wrong. This works for realsies. Closes protocolbuffers#12698 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#12698 from coryan:fix-cmake-typo-in-string-join-workaround 182d2e2 PiperOrigin-RevId: 530116824

On Wndows, `size_t` is 64-bits, and `int` is 32-bits. That makes conversions from `size_t` to `int` potentially lossy, and they generate warnings. In this case an `int` variable was assigned to `size_t` and then passed to functions consuming `int`. Seems simpler to use `auto` and avoid these problems altogether. Closes protocolbuffers#12701 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#12701 from coryan:fix-warnings-repeated-field-warnings-in-msvc b1ec34d PiperOrigin-RevId: 530134611

Warnings in header files can be a problem for consumers that enable `/WX` (or `-Werror`). In this case, using `... & -align` produces a warning (C4146) with MSVC. The fix is to use equivalent expression `... & ~(align - 1)`, which was already used in the same file. Fixes protocolbuffers#12675 Closes protocolbuffers#12697 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#12697 from coryan:fix-msvc-warnings-in-arena-align 835f3b4 PiperOrigin-RevId: 530137165

Cherry pick various portability fixes from mainline

This crash was due to the fact that we were passing `nullptr` as a `const char*` parameter and relying on that implicitly converting into an empty `absl::string_view`. `absl::string_view` supports that functionality, but starting with C++17 its behavior changes since it's just a type alias for `std::string_view`. `std::string_view` does not have any special conversion for nullptr and so we were just getting crashes. PiperOrigin-RevId: 530431663

…104-fix Fix crash in protocolbuffers#12104 (cherry-pick)

CLAassistant · 2023-11-12T14:45:55Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 9 committers have signed the CLA.

✅ rschu1ze
❌ mkruskal-google
❌ deannagarcia
❌ acozzette
❌ coryan
❌ protobuf-github-bot
❌ protobuf-team-bot
❌ zhangskz
❌ fowles
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

==500166==WARNING: MemorySanitizer: use-of-uninitialized-value #0 0xdd383e in google::protobuf::compiler::DiskSourceTree::OpenDiskFile(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) build_msan/./contrib/protobuf/src/google/protobuf/compiler/importer.cc:504:7 #1 0xdd1eb2 in google::protobuf::compiler::DiskSourceTree::DiskFileToVirtualFile(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*) build_msan/./contrib/protobuf/src/google/protobuf/compiler/importer.cc:431:51 #2 0x540619 in google::protobuf::compiler::CommandLineInterface::MakeProtoProtoPathRelative(google::protobuf::compiler::DiskSourceTree*, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*, google::protobuf::DescriptorDatabase*) build_msan/./contrib/protobuf/src/google/protobuf/compiler/command_line_interface.cc:1362:24 #3 0x5314fb in google::protobuf::compiler::CommandLineInterface::MakeInputsBeProtoPathRelative(google::protobuf::compiler::DiskSourceTree*, google::protobuf::DescriptorDatabase*) build_msan/./contrib/protobuf/src/google/protobuf/compiler/command_line_interface.cc:1415:10 #4 0x5314fb in google::protobuf::compiler::CommandLineInterface::InitializeDiskSourceTree(google::protobuf::compiler::DiskSourceTree*, google::protobuf::DescriptorDatabase*) build_msan/./contrib/protobuf/src/google/protobuf/compiler/command_line_interface.cc:1168:8 #5 0x52541f in google::protobuf::compiler::CommandLineInterface::Run(int, char const* const*) build_msan/./contrib/protobuf/src/google/protobuf/compiler/command_line_interface.cc:1026:10 #6 0x50f5d6 in google::protobuf::compiler::ProtobufMain(int, char**) build_msan/./contrib/protobuf/src/google/protobuf/compiler/main.cc:104:14 protocolbuffers#7 0x50fe58 in main build_msan/./contrib/protobuf/src/google/protobuf/compiler/main.cc:112:10 protocolbuffers#8 0x7f817143db24 in __libc_start_main (/usr/lib/libc.so.6+0x27b24) protocolbuffers#9 0x48904d in _start (/mnt/ch/ClickHouse/build_msan/contrib/protobuf-cmake/protoc+0x48904d) Uninitialized value was created by an allocation of 'sb' in the stack frame of function '_ZN6google8protobuf8compiler14DiskSourceTree12OpenDiskFileERKNSt3__112basic_stringIcNS3_11char_traitsIcEENS3_9allocatorIcEEEE' #0 0xdd3320 in google::protobuf::compiler::DiskSourceTree::OpenDiskFile(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) build_msan/./contrib/protobuf/src/google/protobuf/compiler/importer.cc:492 SUMMARY: MemorySanitizer: use-of-uninitialized-value build_msan/./contrib/protobuf/src/google/protobuf/compiler/importer.cc:504:7 in google::protobuf::compiler::DiskSourceTree::OpenDiskFile(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&) Exiting

mkruskal-google and others added 30 commits April 24, 2023 11:22

Fix declared dependencies for pkg-config

2c55945

Merge pull request protocolbuffers#12542 from protocolbuffers/pkgconf…

09a8d61

…ig-22 Fix declared dependencies for pkg-config

Fix btree issue in map tests.

d379c08

Without any weak ordering, btree_map fails to compile on windows 2022. Closes protocolbuffers#12289 PiperOrigin-RevId: 527019995

Switch to protobuf-ci for new test

94c33e3

Merge pull request protocolbuffers#12553 from protocolbuffers/btree-22

2d48c60

Fix btree issues in map tests

Add -ex switch to all docker bash commands. (protocolbuffers#12602)

238d250

Without this, certain failures will be silently ignored. PiperOrigin-RevId: 527718574

fix(libprotoc): export useful symbols from .so

860fbf1

Merge pull request protocolbuffers#12622 from deannagarcia/22.x

91d1bcb

fix(libprotoc): export useful symbols from .so

Fix bug in _internal_copy_files where the rule would fail in downstre…

8b81deb

…am repositories. Taken from https://github.com/protocolbuffers/upb/blob/main/bazel/protobuf.patch#L42 Fixes protocolbuffers#12620. PiperOrigin-RevId: 528586464

Turn off clang::musttail on i386

5381f40

We found last week that Clang's support for `musttail` on 32-bit Linux does not seem to work reliably, so let's disable it for now. PiperOrigin-RevId: 528817403

Merge pull request protocolbuffers#12634 from acozzette/cherrypick-mu…

177411a

…sttail-22 Turn off `clang::musttail` on i386

Update abseil dependency and reorder dependencies to ensure we use th…

8c4152a

…e version specified in protobuf_deps. PiperOrigin-RevId: 528838071

Fix merge

2399885

Merge pull request protocolbuffers#12633 from deannagarcia/22.x

5855833

Cherrypick changes for 22.4

Update UPB dep

4683ec7

Merge pull request protocolbuffers#12648 from deannagarcia/22.x

1cd98b9

Update UPB dep for 22.4 release

Updating version.json and repo version numbers to: 22.4

40e1dac

Updating version.json to: 22.5-dev

149c852

Bump Abseil submodule to 20230125.3 (protocolbuffers#12660)

1b918d6

* Bump Abseil submodule to 20230125.3 * Fix gtest installation setup with submodules

Internal change

5729669

PiperOrigin-RevId: 529429609

Bump Abseil submodule to 20230125.3 (protocolbuffers#12660)

2880a20

This partially addresses protocolbuffers#12201 Closes protocolbuffers#12660 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#12660 from mkruskal-google:absl-update ce07c45 PiperOrigin-RevId: 529456996

Merge pull request protocolbuffers#12664 from protocolbuffers/22.x-20…

2c94c8d

…2305041802 22.x 202305041802

Explicitly include GTest package in examples

5191c3b

Merge pull request protocolbuffers#12668 from protocolbuffers/cmake-f…

dbb9f9b

…ixes-22 Cherrypick cmake fixes to 22.x

Avoid using string(JOIN..., which requires cmake 3.12

0ce610e

This also downgrades our tests to use cmake 3.10, compatible with our support window. Closes protocolbuffers#12672 PiperOrigin-RevId: 529840763

Add missing cstdint header

9daf5fb

Add tests for GCC support window.

9d53a69

Note: gcc only supports docker images down to 9.5, and the 7.3 image is very old and problematic. A follow-up change might enable testing for GCC 7.3, which is our minimal supported version PiperOrigin-RevId: 529885733

mkruskal-google and others added 11 commits May 5, 2023 23:03

Merge pull request protocolbuffers#12694 from protocolbuffers/cpp-fix…

8d6dfdc

…es-22 Backport increased C++ test coverage + fixes

Merge pull request protocolbuffers#12703 from fowles/22.x

040a7cf

Cherry pick various portability fixes from mainline

Merge pull request protocolbuffers#12725 from acozzette/cherrypick-12…

74b12eb

…104-fix Fix crash in protocolbuffers#12104 (cherry-pick)

Updating version.json and repo version numbers to: 22.5

121b66d

Remove submodules

4f273f3

Fix includes

474e651

rschu1ze closed this Nov 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Click house/v22.5 #4

Click house/v22.5 #4

rschu1ze commented Nov 12, 2023

CLAassistant commented Nov 12, 2023 •

edited

Loading

Click house/v22.5 #4

Click house/v22.5 #4

Conversation

rschu1ze commented Nov 12, 2023

CLAassistant commented Nov 12, 2023 • edited Loading

CLAassistant commented Nov 12, 2023 •

edited

Loading