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

Fix filtering by virtual columns with OR filter in query (resubmit) #55678

Merged
merged 2 commits into from Oct 17, 2023

Conversation

azat
Copy link
Collaborator

@azat azat commented Oct 16, 2023

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

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

Fix filtering by virtual columns with OR filter in query (_part* filtering for MergeTree, _path/_file for various File/HDFS/... engines, _table for Merge)

The problem with the initial implementation #52653 was:

  • OR can have multiple arguments

  • It simply not correct to assume that if there are two arguments this is OK.
    Consider the following example:

    "WHERE (column_not_from_partition_by = 1) OR false OR false"

    Will be converted to:

    "WHERE false OR false"

And it will simply read nothing.

Yes, we could apply some optimization for bool, but this will not always
work, since to optimize things like "0 = 1" we need to execute it.

And the only way to make handle this correctly (with ability to ignore
some commands during filtering) is to make is_constant() function return
has it use something from the input block, so that we can be sure, that
we have some sensible, and not just "false".

Plus we cannot simply ignore the difference of the input and output
arguments of handling OR, we need to add always-true (1/true) if the
size is different, since otherwise it could break invariants (see
comment in the code).

P.S. analyzer does not have this bug, since it execute expression as
whole, and this is what filterBlockWithQuery() should do actually
instead, but this will be a more complex patch.

Resubmits: #55418 (due to the test failure it got reverted, this had been addressed in this PR, see last patch) (cc @alexey-milovidov )
Reverts: #55657 (cc @antonio2368 )
Fixes: #54779 (cc @slanderous-mambo )
Fixes: #55288 (cc @allen12921)

The problem with the initial implementation ClickHouse#52653 was:
- OR can have multiple arguments
- It simply not correct to assume that if there are two arguments this is OK.
  Consider the following example:

    "WHERE (column_not_from_partition_by = 1) OR false OR false"

  Will be converted to:

    "WHERE false OR false"

And it will simply read nothing.

Yes, we could apply some optimization for bool, but this will not always
work, since to optimize things like "0 = 1" we need to execute it.

And the only way to make handle this correctly (with ability to ignore
some commands during filtering) is to make is_constant() function return
has it use something from the input block, so that we can be sure, that
we have some sensible, and not just "false".

Plus we cannot simply ignore the difference of the input and output
arguments of handling OR, we need to add always-true (1/true) if the
size is different, since otherwise it could break invariants (see
comment in the code).

This includes (but not limited to):
- _part* filtering for MergeTree
- _path/_file for various File/HDFS/... engines
- _table for Merge
- ...

P.S. analyzer does not have this bug, since it execute expression as
whole, and this is what filterBlockWithQuery() should do actually
instead, but this will be a more complex patch.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
(cherry picked from commit b107712)
After the previous patch "x OR 1" will not execute "x", and because of
this test_system_merges::test_mutation_simple started to fail since
"sleep" function did not executed.

Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-bugfix Pull request with bugfix, not backported by default label Oct 16, 2023
@robot-ch-test-poll1
Copy link
Contributor

robot-ch-test-poll1 commented Oct 16, 2023

This is an automated comment for commit b0fbd79 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
Bugfix validate checkChecks that either a new test (functional or integration) or there some changed tests that fail with the binary built on master branch✅ 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
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
Mergeable CheckChecks if all other necessary checks are successful❌ failure
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ failure

@azat
Copy link
Collaborator Author

azat commented Oct 16, 2023

Stateless tests (release) — fail: 1, passed: 5739, skipped: 5

  • 00002_log_and_exception_messages_formatting - @tavplubix zero exceptions had been changed, maybe you will be interested

@alexey-milovidov
Copy link
Member

@azat a test has failed.

@azat
Copy link
Collaborator Author

azat commented Oct 17, 2023

@alexey-milovidov it is unrelated (see the comment above)

@alexey-milovidov alexey-milovidov merged commit 79eccfb into ClickHouse:master Oct 17, 2023
273 of 275 checks passed
@alexey-milovidov alexey-milovidov self-assigned this Oct 17, 2023
@alexey-milovidov alexey-milovidov added the pr-must-backport Pull request should be backported intentionally. Use this label with great care! label Oct 17, 2023
@azat azat deleted the fix-OR-resubmit branch October 17, 2023 19:15
robot-clickhouse-ci-2 added a commit that referenced this pull request Oct 17, 2023
…eeaf7d3cf0ceb3af619fb45962a09

Cherry pick #55678 to 23.7: Fix filtering by virtual columns with OR filter in query (resubmit)
robot-clickhouse added a commit that referenced this pull request Oct 17, 2023
robot-clickhouse-ci-2 added a commit that referenced this pull request Oct 17, 2023
…eeaf7d3cf0ceb3af619fb45962a09

Cherry pick #55678 to 23.8: Fix filtering by virtual columns with OR filter in query (resubmit)
robot-clickhouse added a commit that referenced this pull request Oct 17, 2023
robot-clickhouse-ci-2 added a commit that referenced this pull request Oct 17, 2023
…eeaf7d3cf0ceb3af619fb45962a09

Cherry pick #55678 to 23.9: Fix filtering by virtual columns with OR filter in query (resubmit)
robot-clickhouse added a commit that referenced this pull request Oct 17, 2023
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Oct 17, 2023
alexey-milovidov added a commit that referenced this pull request Oct 18, 2023
Backport #55678 to 23.9: Fix filtering by virtual columns with OR filter in query (resubmit)
alexey-milovidov added a commit that referenced this pull request Oct 18, 2023
Backport #55678 to 23.8: Fix filtering by virtual columns with OR filter in query (resubmit)
alexey-milovidov added a commit that referenced this pull request Oct 18, 2023
Backport #55678 to 23.7: Fix filtering by virtual columns with OR filter in query (resubmit)
amosbird added a commit to amosbird/ClickHouse that referenced this pull request Dec 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-bugfix Pull request with bugfix, not backported by default pr-must-backport Pull request should be backported intentionally. Use this label with great care!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't get query result with mutiple OR 0 = 1 conditions WHERE-clause with two ORs doesn't evaluate to true
4 participants