Skip to content

Revert "Query condition cache: introduce selectivity threshold"#87498

Merged
Algunenano merged 10 commits intoClickHouse:masterfrom
rschu1ze:revert-86076
Sep 25, 2025
Merged

Revert "Query condition cache: introduce selectivity threshold"#87498
Algunenano merged 10 commits intoClickHouse:masterfrom
rschu1ze:revert-86076

Conversation

@rschu1ze
Copy link
Copy Markdown
Member

@rschu1ze rschu1ze commented Sep 23, 2025 •
edited
Loading

Reverts #86076

See #86076 (comment)

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

@clickhouse-gh
Copy link
Copy Markdown
Contributor

clickhouse-gh bot commented Sep 23, 2025 •
edited
Loading

Workflow [PR], commit [4a74032]

Summary: ⏳

job_name test_name status info comment
Docs check error

@clickhouse-gh clickhouse-gh bot added the pr-not-for-changelog This PR should not be mentioned in the changelog label Sep 23, 2025
@rschu1ze rschu1ze changed the title Revert "Query condition cache: introduce selectivity threshold" Revert "Query condition cache: introduce selectivity threshold" (#86076) Sep 23, 2025
@rschu1ze rschu1ze changed the title Revert "Query condition cache: introduce selectivity threshold" (#86076) Revert "Query condition cache: introduce selectivity threshold" Sep 23, 2025
@pamarcos pamarcos self-requested a review September 24, 2025 16:26
@pamarcos pamarcos self-assigned this Sep 24, 2025
pamarcos
pamarcos approved these changes Sep 24, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@pamarcos pamarcos left a comment

Choose a reason for hiding this comment

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

test_storage_delta is really on fire today

@rschu1ze
Copy link
Copy Markdown
Member Author

rschu1ze commented Sep 24, 2025

Sorry, there was a problem in SettingsChangesHistory. Needed to push a fixup commit.

@rschu1ze
Copy link
Copy Markdown
Member Author

rschu1ze commented Sep 24, 2025

Stateless tests (amd_binary, ParallelReplicas, s3 storage, parallel):

Stateless tests (amd_tsan, parallel, 2/2)

  • 03602_alter_update_nullable_json: timeout, happens extremely rarely in CI (once since 1 Jan)

Integration tests

@rschu1ze rschu1ze added this pull request to the merge queue Sep 24, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 24, 2025
@qoega qoega enabled auto-merge September 25, 2025 05:07
@qoega
Copy link
Copy Markdown
Member

qoega commented Sep 25, 2025

Still not merged

@rschu1ze
Copy link
Copy Markdown
Member Author

rschu1ze commented Sep 25, 2025

What the heck

@qoega qoega added this pull request to the merge queue Sep 25, 2025
@Algunenano Algunenano removed this pull request from the merge queue due to a manual request Sep 25, 2025
@Algunenano
Copy link
Copy Markdown
Member

Algunenano commented Sep 25, 2025 

Found std::shared_mutex './src/Interpreters/Cache/QueryConditionCache.h:        std::shared_mutex mutex; /// (*)'. Please use DB::SharedMutex instead

@Algunenano
Copy link
Copy Markdown
Member

Algunenano commented Sep 25, 2025

Fixed it. I'll merge it as soon as fast test pass

@Algunenano Algunenano added this pull request to the merge queue Sep 25, 2025
Merged via the queue into ClickHouse:master with commit ebbc48b Sep 25, 2025
15 of 25 checks passed
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added the pr-synced-to-cloud The PR is synced to the cloud repo label Sep 25, 2025
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 mentioned this pull request Sep 25, 2025
Merged
robot-clickhouse-ci-1 added a commit that referenced this pull request Sep 25, 2025
@robot-clickhouse-ci-1
Merge pull request #87633 from ClickHouse/cherrypick/25.9/87498
02fc69f 
Cherry pick #87498 to 25.9: Revert "Query condition cache: introduce selectivity threshold"
robot-clickhouse added a commit that referenced this pull request Sep 25, 2025
@robot-clickhouse
Backport #87498 to 25.9: Revert "Query condition cache: introduce sel…
4988846 
…ectivity threshold"
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 mentioned this pull request Sep 25, 2025
Merged
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud deprecated label, NOOP pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR labels Sep 25, 2025
clickhouse-gh bot added a commit that referenced this pull request Sep 25, 2025
@clickhouse-gh
Merge pull request #87634 from ClickHouse/backport/25.9/87498
38ba3d1 
Backport #87498 to 25.9: Revert "Query condition cache: introduce selectivity threshold"
@shankar-iyer shankar-iyer mentioned this pull request Oct 16, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pamarcos pamarcos pamarcos approved these changes

Assignees

@pamarcos pamarcos

Labels

pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud deprecated label, NOOP pr-must-backport-synced The `*-must-backport` labels are synced into the cloud Sync PR 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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@rschu1ze @qoega @Algunenano @pamarcos @robot-clickhouse-ci-1 @robot-clickhouse-ci-2