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

Use upstream repo for apache datasketches #55787

Merged
merged 2 commits into from
Oct 23, 2023

Conversation

nickitat
Copy link
Member

Changelog category (leave one):

  • Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Use upstream repo for apache datasketches.


We created our own fork but till this time it contains only one bug fix that is now exists in the upstream.

@robot-clickhouse robot-clickhouse added pr-improvement Pull request with some product improvements submodule changed At least one submodule changed in this PR. labels Oct 18, 2023
@robot-clickhouse
Copy link
Member

robot-clickhouse commented Oct 18, 2023

This is an automated comment for commit 91ae411 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
CI runningA meta-check that indicates the running CI. Normally, it's in success or pending state. The failed status indicates some problems with the PR✅ success
ClickHouse build checkBuilds 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 checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help✅ success
Docker image for serversThe 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. 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 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
Mergeable CheckChecks if all other necessary checks are successful✅ 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
Push to DockerhubThe check for building and pushing the CI related docker images to docker hub✅ success
SQLTestThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
SQLancerFuzzing tests that detect logical bugs with SQLancer tool✅ success
SqllogicRun clickhouse on the sqllogic test set against sqlite and checks that all statements are passed✅ success
Stateful testsRuns stateful 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
Check nameDescriptionStatus
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ failure

@Algunenano Algunenano self-assigned this Oct 18, 2023
@Algunenano Algunenano self-requested a review October 18, 2023 14:03
Copy link
Member

@Algunenano Algunenano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. We also included an update (ClickHouse/datasketches-cpp#3) which was fixed in apache/datasketches-cpp#301 and included in the fork. This code was later rewritten (apache/datasketches-cpp#309) so the 4.1.x branch should be ok (if the sanitizers don't complain about it).

@alexey-milovidov
Copy link
Member

Tests have failed.

@nickitat nickitat merged commit 3320b12 into ClickHouse:master Oct 23, 2023
@rschu1ze
Copy link
Member

This PR introduces a side effect for which I like to post a workaround.

In detail, if one clones a fresh ClickHouse repository and checks out an old branch that does not have this PR yet, for example one of the v23.9 tags, then the checkout will fail:

$ git switch --create v23.9.6.20-stable

fatal: failed to unpack tree object 7abd49bb2e72bf9a5029993d31dcb1872da88292
error: Submodule 'contrib/datasketches-cpp' could not be updated.
error: Cannot update submodule:
        contrib/datasketches-cpp
Aborting

This is because the old repository location (https://github.com/ClickHouse/datasketches-cpp) is not registered as a remote in the submodule. To fix this, do that:

$ cd contrib/datasketches-cpp
$ git remote add ClickHouse https://github.com/ClickHouse/datasketches-cpp.git
$ git fetch ClickHouse
$ cd ..
$ git switch --create v23.9.6.20-stable

@Algunenano
Copy link
Member

You can also checkout the branch/tag and update the submodules, for example:

git checkout v23.3.11.5-lts
git submodule sync && git submodule update --init --recursive

This works everytime for me. and in fact is part of the build command I use whenever submodules are updated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-improvement Pull request with some product improvements submodule changed At least one submodule changed in this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants