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

Shrink blocks in HashJoin on consuming half of maximum memory #54584

Merged
merged 8 commits into from Sep 16, 2023

Conversation

vdimir
Copy link
Member

@vdimir vdimir commented Sep 13, 2023

Changelog category (leave one):

  • Improvement

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

  • HashJoin tries to shrink internal buffers consuming half of maximal available memory (set by max_bytes_in_join)

Followup #50112 (comment)


SET max_bytes_in_join = '2G';

SELECT UserID, h1.Referer, h1.URL, h2.URL
FROM datasets.hits_v1 AS h1
INNER JOIN datasets.hits_v1 AS h2 ON h1.UserID = h2.UserID AND h1.URL = h2.Referer
WHERE h1.URL != '' AND h2.URL != '' AND h1.Referer != '' AND h2.Referer != ''
ORDER BY UserID ASC
LIMIT 1
<Debug> HashJoin: Shrinking stored blocks table after 954.20 MiB of 1.86 GiB consumed
<Debug> HashJoin: Shrinked stored blocks 193.78 MiB freed, new memory consumption is 760.42 MiB
...
<Debug> MemoryTracker: Peak memory usage (for query): 1.03 GiB.

While with SET max_bytes_in_join = '20G':

<Debug> MemoryTracker: Peak memory usage (for query): 1.24 GiB.

@robot-ch-test-poll2 robot-ch-test-poll2 added pr-improvement Pull request with some product improvements pr-status-⏳ PR with some pending statuses labels Sep 13, 2023
@robot-ch-test-poll2
Copy link
Contributor

robot-ch-test-poll2 commented Sep 13, 2023

This is an automated comment for commit 404ea84 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
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

@robot-ch-test-poll4 robot-ch-test-poll4 added pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 13, 2023
@vdimir vdimir force-pushed the vdimir/hash_join_shrink_blocks branch from 156ea25 to ed8c325 Compare September 13, 2023 13:21
@robot-ch-test-poll3 robot-ch-test-poll3 added pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 13, 2023
@robot-ch-test-poll1 robot-ch-test-poll1 added pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 13, 2023
@@ -879,6 +882,28 @@ bool HashJoin::addBlockToJoin(const Block & source_block_, bool check_limits)
}
}

auto max_total_bytes = table_join->sizeLimits().max_bytes;
Copy link
Member

Choose a reason for hiding this comment

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

But it will work only if the limit for JOIN size is defined. Let's also take max_memory_usage into account. Also, let's use the current memory usage for the query.

Copy link
Member

Choose a reason for hiding this comment

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

For comparison, see how we do it for external GROUP BY.

Copy link
Member Author

@vdimir vdimir Sep 14, 2023

Choose a reason for hiding this comment

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

How to combine this two metrics?
We can compare memory tracker delta with max_memory_usage and current_bytes_in_join with max_bytes_in_join separately (as I did in 0d51fc7).
Or compare max(memory_tracker_delta, current_bytes_in_join) and min(max_memory_usage, max_bytes_in_join).

@alexey-milovidov alexey-milovidov self-assigned this Sep 14, 2023
@robot-clickhouse robot-clickhouse added pr-status-⏳ PR with some pending statuses pr-status-❌ PR with some error/faliure statuses and removed pr-status-❌ PR with some error/faliure statuses pr-status-⏳ PR with some pending statuses labels Sep 14, 2023
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 14, 2023
@robot-ch-test-poll1 robot-ch-test-poll1 added pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 14, 2023
@robot-ch-test-poll4 robot-ch-test-poll4 added pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 14, 2023
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 14, 2023
@alexey-milovidov
Copy link
Member

This will be good:

memory_tracker_delta >= 0.5 * max_memory_usage
|| current_bytes_in_join >= 0.5 * max_bytes_in_join

@vdimir vdimir force-pushed the vdimir/hash_join_shrink_blocks branch from 1930608 to 404ea84 Compare September 15, 2023 10:30
@robot-ch-test-poll3 robot-ch-test-poll3 added pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 15, 2023
@robot-ch-test-poll1 robot-ch-test-poll1 added pr-status-✅ PR with only success statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 15, 2023
@alexey-milovidov alexey-milovidov merged commit c86ddf4 into master Sep 16, 2023
274 checks passed
@alexey-milovidov alexey-milovidov deleted the vdimir/hash_join_shrink_blocks branch September 16, 2023 05:08
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 pr-status-✅ PR with only success statuses
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants