Repository navigation
Carry the ClickHouse patches onto 1.11.907 - #40
Merged
thevar1able merged 40 commits intoOct 8, 2026
Merged
Conversation
(cherry picked from commit b77a377)
because it was moved to ClickHouse main repository. (cherry picked from commit 08e2fc1)
(cherry picked from commit 1ddae3d)
…ation in PocoHTTPClient). (cherry picked from commit 9a8a562)
(cherry picked from commit 08093eb)
(cherry picked from commit 9fe2ba3)
(cherry picked from commit f741bca)
(cherry picked from commit 2afffa0)
http://domain.com/?delete instead of http://domain.com?delete Reason: uri is correct (https://tools.ietf.org/html/rfc7230#section-2.7.3), but nginx did not accept it correctly (https://github.com/nginx/nginx/blob/master/src/http/ngx_http_parse.c#L438) (cherry picked from commit 6d2641f)
(cherry picked from commit 1fd7a88)
…configuration Write warnings as debug message (cherry picked from commit 4cab611)
(cherry picked from commit 8ad0d08)
(cherry picked from commit fcb26b6)
(cherry picked from commit 447a129)
(cherry picked from commit 97f4e45)
(cherry picked from commit a9d2d18)
(cherry picked from commit 22e5b20)
(cherry picked from commit bbe9462)
(cherry picked from commit 7690656)
…in your clients" I've seen tons of "Encountered enum member CRC64NVME which is not modeled in your clients" messages Idealy we need to update aws-sdk, but it will take time, and it cannot be backported. (cherry picked from commit 4e178cd)
(cherry picked from commit fb2f65b)
(cherry picked from commit 8fa8b4d)
(cherry picked from commit 26846ebb114ef852b3e4ffb86c98eb6d925d7202) (cherry picked from commit 91b848e)
(cherry picked from commit 28ebb06)
(cherry picked from commit 1302f28)
(cherry picked from commit 5a0985e)
(cherry picked from commit 56f888e)
(cherry picked from commit ed20239)
(cherry picked from commit 908d160)
(cherry picked from commit 3aa121c)
(cherry picked from commit 79ab8a7)
(cherry picked from commit 05a48d2)
generated/src/aws-cpp-sdk-s3/include/aws/s3/model/AbortMultipartUploadResult.h:25:7: error: Value assigned to field 'm_HttpResponseCode' in implicit constructor is uninitialized [clang-analyzer-core.uninitialized.Assign,-warnings-as-errors]
25 | class AbortMultipartUploadResult {
| ^
/ClickHouse/src/IO/tests/gtest_writebuffer_s3.cpp:402:9: note: Taking false branch
402 | if (injections)
| ^
/ClickHouse/src/IO/tests/gtest_writebuffer_s3.cpp:414:16: note: Calling constructor for 'Outcome<Aws::S3::Model::AbortMultipartUploadResult, Aws::S3::S3Error>'
414 | return Aws::S3::Model::AbortMultipartUploadOutcome(result);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/ClickHouse/contrib/aws/src/aws-cpp-sdk-core/include/aws/core/utils/Outcome.h:34:35: note: Calling implicit copy constructor for 'AbortMultipartUploadResult'
34 | Outcome(const R& r) : result(r), error(), success(true)
| ^~~~~~~~~
/ClickHouse/contrib/aws/generated/src/aws-cpp-sdk-s3/include/aws/s3/model/AbortMultipartUploadResult.h:25:7: note: Value assigned to field 'm_HttpResponseCode' in implicit constructor is uninitialized
25 | class AbortMultipartUploadResult {
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
(cherry picked from commit 22f694a)
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
14 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.
Rebases the ClickHouse patches onto upstream
1.11.907(base taga9f0ffcc2766, fork branchClickHouse/1.11.907head732656d5a007), from the previous pin1.11.771+ 40 commits.All 40 commits are carried via
git cherry-pick -xwith original authors preserved: EC2-metadata disabling, the Pocostd::iostreamresult-stream check, removal of thecrt/aws-crt-cppsubmodule, non-empty-path URIs,QpsLimitExceeded/TotalQpsLimitExceeded/AuthenticationRequerederror codes, retry-strategy initialisation, MinIO compatibility errors,ContentLengthHasBeenSet(), logging and sanitizer tweaks.Three obsolete hunks were dropped because
1.11.907already contains the newer equivalent:CoreErrors.cpp: theTooManyRequestsExceptionmapping (upstream now usesRetryableType::RETRYABLE_THROTTLING; the ClickHouseQpsLimitExceededentries were re-expressed in that form).ClientConfiguration.cpp: theInitRetryStrategy(Aws::String)overload and the conflict markers committed in56f888eb66(upstream ships the overload andResolveRetryMode).Conflicts were limited to those two files plus the
crt/aws-crt-cppgitlink removal; the resulting tree is marker-free.Note for the ClickHouse bump:
1.11.907requires aws-crt-cpp 0.43.8 APIs (BddEngine.h,ProxyEnvVarOptions,ScheduledTask, …), socontrib/awsmoves together with theaws-crt-cpp/aws-c-*chain, not alone.Once merged, ClickHouse's
contrib/awssubmodule is bumped to this branch head.