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

Provide fallback to Python/Spark-like splitting in splitBy*() functions #54518

Merged
merged 7 commits into from Sep 22, 2023

Conversation

rschu1ze
Copy link
Member

@rschu1ze rschu1ze commented Sep 11, 2023

Added a setting splitby_max_substrings_includes_remaining_string which controls if functions splitBy*() with max_substring argument > 0 include the remaining string in the result array (Python/Spark semantics) or not. To keep existing use cases working, I did not touch the default behavior, i.e. splitby_max_substrings_includes_remaining_string by default is 0.

For reference, please see the discussions

Changelog category (leave one):

  • Improvement

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

Added a setting "splitby_max_substrings_includes_remaining_string" which controls if functions "splitBy*()" with argument "max_substring" > 0 include the remaining string (if any) in the result array (Python/Spark semantics) or not. The default behavior does not change.

@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-improvement Pull request with some product improvements label Sep 11, 2023
@robot-clickhouse-ci-2
Copy link
Contributor

robot-clickhouse-ci-2 commented Sep 11, 2023

This is an automated comment for commit 774c4b5 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
Docs CheckBuilds and tests the documentation✅ 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
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
Check nameDescriptionStatus
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests❌ failure

@jhenhapl

This comment was marked as outdated.

@antonio2368 antonio2368 self-assigned this Sep 12, 2023
@rschu1ze rschu1ze marked this pull request as draft September 12, 2023 21:28
@rschu1ze

This comment was marked as outdated.

@robot-ch-test-poll4 robot-ch-test-poll4 added the pr-status-⏳ PR with some pending statuses label Sep 13, 2023
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 13, 2023
@robot-clickhouse robot-clickhouse added pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 13, 2023
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 13, 2023
@robot-clickhouse robot-clickhouse 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-poll3 robot-ch-test-poll3 added pr-status-✅ PR with only success statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 14, 2023
@robot-clickhouse robot-clickhouse added pr-status-❌ PR with some error/faliure statuses and removed pr-status-✅ PR with only success statuses labels Sep 14, 2023
@robot-ch-test-poll1 robot-ch-test-poll1 added submodule changed At least one submodule changed in this PR. pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 17, 2023
@rschu1ze rschu1ze marked this pull request as ready for review September 17, 2023 16:25
@robot-ch-test-poll robot-ch-test-poll added pr-status-✅ PR with only success statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 17, 2023
@robot-clickhouse robot-clickhouse added pr-status-❌ PR with some error/faliure statuses and removed pr-status-✅ PR with only success statuses labels Sep 17, 2023
contrib/sysroot Outdated Show resolved Hide resolved
@antonio2368

This comment was marked as outdated.

@robot-ch-test-poll2 robot-ch-test-poll2 added pr-status-⏳ PR with some pending statuses and removed submodule changed At least one submodule changed in this PR. pr-status-❌ PR with some error/faliure statuses labels Sep 18, 2023
@robot-clickhouse robot-clickhouse added pr-status-✅ PR with only success statuses and removed pr-status-⏳ PR with some pending statuses labels Sep 18, 2023
docs/en/operations/settings/settings.md Outdated Show resolved Hide resolved
@@ -38,6 +38,8 @@ The behavior of parameter `max_substrings` changed starting with ClickHouse v22.
For example,
- in v22.10: `SELECT splitByChar('=', 'a=b=c=d', 2); -- ['a','b','c=d']`
- in v22.11: `SELECT splitByChar('=', 'a=b=c=d', 2); -- ['a','b']`

The previous behavior can be restored by setting [splitby_max_substring_behavior](../../operations/settings/settings.md#splitby-max-substring-behavior) = 'python'.
Copy link
Member

Choose a reason for hiding this comment

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

we can probably use the compatibility setting to set it to correct behaviour and mention here that it can be used also.

Copy link
Member Author

Choose a reason for hiding this comment

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

Will check.

Copy link
Member Author

Choose a reason for hiding this comment

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

The new behavior with splitby_max_substrings_includes_remaining_string = 1 doesn't match 100% the pre-v22.11 behavior (one needs to adjust max_substrings argument by 1). But I feel that's an acceptable compromise which reduces implementation complexity and understanding for users. So I better refrain from compatibility settings, to keep surprises minimal.

src/Functions/FunctionsStringArray.h Outdated Show resolved Hide resolved
Comment on lines 718 to 748
if (max_splits)
{
switch (max_substring_behavior)
{
case MaxSubstringBehavior::LikeClickHouse:
{
if (splits == *max_splits)
return false;
break;
}
case MaxSubstringBehavior::LikeSpark:
{
if (splits == *max_splits - 1)
{
token_end = end;
pos = nullptr;
return true;
}
break;
}
case MaxSubstringBehavior::LikePython:
{
if (splits == *max_splits)
{
token_end = end;
pos = nullptr;
return true;
}
break;
}
}
Copy link
Member

Choose a reason for hiding this comment

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

similar chunk seems to be repeated often

Copy link
Member Author

Choose a reason for hiding this comment

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

This will hopefully become simpler.

Copy link
Member Author

Choose a reason for hiding this comment

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

There are some subtle differences between places where the chunk is used. Can't pull it out easily. It is much simpler in the last commit, guess we can keep it as is.

@robot-clickhouse robot-clickhouse added pr-status-❌ PR with some error/faliure statuses and removed pr-status-✅ PR with only success statuses labels Sep 18, 2023
@rschu1ze rschu1ze changed the title Provide fallback to Python-like splitting in splitBy*() functions Provide fallback to Python/Spark-like splitting in splitBy*() functions Sep 18, 2023
@robot-ch-test-poll1 robot-ch-test-poll1 added pr-status-⏳ PR with some pending statuses and removed pr-status-❌ PR with some error/faliure statuses labels Sep 19, 2023
@robot-ch-test-poll robot-ch-test-poll added pr-status-✅ PR with only success statuses pr-status-❌ PR with some error/faliure statuses and removed pr-status-⏳ PR with some pending statuses pr-status-✅ PR with only success statuses labels Sep 19, 2023
@rschu1ze rschu1ze merged commit be1e92a into ClickHouse:master Sep 22, 2023
286 of 287 checks passed
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 some error/faliure statuses
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants