Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update zlib-ng from 2.0.2 to 2.1.7 #64489

Merged
merged 7 commits into from
Aug 6, 2024
Merged

Update zlib-ng from 2.0.2 to 2.1.7 #64489

merged 7 commits into from
Aug 6, 2024

Conversation

al13n321
Copy link
Member

@al13n321 al13n321 commented May 27, 2024

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

Fixes #63319

ClickHouse/zlib-ng#17 should be merged first

The actual fix appears to be zlib-ng/zlib-ng#1071 - it simplifies the compressed-size-upper-bound estimate to stop trying to be clever and tight (the bug was that it was underestimated), and just overestimates by ~14%. Instead of cherry-picking it, this PR updates the whole library because I assume that's better (?). (From resolving conflicts I got the impression that there was some reasonable cleanup refactoring done there, so I'm guessing this library has not peaked yet!)

@robot-ch-test-poll4 robot-ch-test-poll4 added pr-not-for-changelog This PR should not be mentioned in the changelog submodule changed At least one submodule changed in this PR. labels May 27, 2024
@robot-ch-test-poll4
Copy link
Contributor

robot-ch-test-poll4 commented May 27, 2024

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

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

Successful checks
Check nameDescriptionStatus
AST fuzzerRuns randomly generated queries to catch program errors. The build type is optionally given in parenthesis. If it fails, ask a maintainer for help✅ success
BuildsThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ success
Compatibility checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help✅ success
Docker keeper imageThe check to build and optionally push the mentioned image to docker hub✅ success
Docker server imageThe check to build and optionally push the mentioned image to docker hub✅ success
Fast testNormally 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 testsChecks 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. Integration 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 packagesChecks that the built packages are installable in a clear environment✅ success
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests✅ success
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests✅ success
Stateful testsRuns stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc✅ success
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc✅ success
Stress testRuns stateless functional tests concurrently from several clients to detect concurrency-related errors✅ success
Style checkRuns a set of checks to keep the code style clean. If some of tests failed, see the related log from the report✅ success
Unit testsRuns the unit tests for different release types✅ success
Upgrade checkRuns 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

@al13n321 al13n321 marked this pull request as ready for review May 28, 2024 19:02
@rschu1ze rschu1ze self-assigned this May 28, 2024
@rschu1ze
Copy link
Member

PPC and FreeBSD builds are broken.

Side note and not blocking this PR: our zlib-ng fork, in particular branch clickhouse-new (here) has a quite messy history. We actually have a guideline for the integration of 3rd party libraries (I just updated it here: #64573). To clean this up, it is perhaps an option to create a branch clickhouse/2.1.6 and pick the existing patches into it? To lower maintenance burden, we might also want to upstream these patches.

@al13n321 al13n321 changed the title Update zlib-ng from 2.0.2 to 2.1.6 Update zlib-ng from 2.0.2 to 2.1.7 Jun 20, 2024
@al13n321
Copy link
Member Author

New contrib update PR: ClickHouse/zlib-ng#17 that cherry-picks our patches onto a clean upstream. This PR points to that now.

@al13n321
Copy link
Member Author

al13n321 commented Aug 6, 2024

Waiting on ClickHouse/zlib-ng#18 , plz review.

@rschu1ze
Copy link
Member

rschu1ze commented Aug 6, 2024

New contrib update PR: ClickHouse/zlib-ng#17 that cherry-picks our patches onto a clean upstream. This PR points to that now.

Kind of unrelated to this PR: I count > 10 custom patches in zlib, going back to 2021. Sounds odd to me, we should contribute them back to upstream instead of dragging them from update to update ...

@rschu1ze rschu1ze added this pull request to the merge queue Aug 6, 2024
Merged via the queue into master with commit 26b6225 Aug 6, 2024
206 checks passed
@rschu1ze rschu1ze deleted the zup branch August 6, 2024 19:53
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-synced-to-cloud The PR is synced to the cloud repo label Aug 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-not-for-changelog This PR should not be mentioned in the changelog pr-synced-to-cloud The PR is synced to the cloud repo submodule changed At least one submodule changed in this PR.
Projects
None yet
4 participants