Skip to content

Fix SYSTEM DROP FILESYSTEM CACHE ON CLUSTER #1130

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.

Sign up for GitHub

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

Merged
Enmk merged 4 commits into from
Nov 13, 2025
Merged

Fix SYSTEM DROP FILESYSTEM CACHE ON CLUSTER #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b53fc06
Fix SYSTEM DROP FILESYSTEM CACHE 'cache' ON CLUSTER 'cluster'
ianton-ru Nov 10, 2025
7061fbc
Add test
ianton-ru Nov 10, 2025
d5d5672
Merge branch 'antalya-25.8' into bugfix/antalya-25.8/system_drop_file…
ianton-ru Nov 10, 2025
aebebf5
Fix test
ianton-ru Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Parsers/ASTSystemQuery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,13 @@ void ASTSystemQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & setti

print_keyword("SYSTEM") << " ";
print_keyword(typeToString(type));
if (!cluster.empty())

std::unordered_set<Type> queries_with_on_cluster_at_end = {
Copy link
Collaborator

@ilejn ilejn Nov 12, 2025

Choose a reason for hiding this comment

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

Does not really matter,
but 'static const' seem reasonable here.

Type::DROP_FILESYSTEM_CACHE,
Type::SYNC_FILESYSTEM_CACHE,
};

if (!queries_with_on_cluster_at_end.contains(type) && !cluster.empty())
formatOnCluster(ostr, settings);

switch (type)
Expand Down Expand Up @@ -519,6 +525,9 @@ void ASTSystemQuery::formatImpl(WriteBuffer & ostr, const FormatSettings & setti
case Type::END:
throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown SYSTEM command");
}

if (queries_with_on_cluster_at_end.contains(type) && !cluster.empty())
formatOnCluster(ostr, settings);
}


Expand Down
2 changes: 2 additions & 0 deletions tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
localhost 9000 0 0 0
localhost 9000 0 0 0
31 changes: 31 additions & 0 deletions tests/queries/0_stateless/03643_system_drop_filesystem_cache_on_cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/env bash
# Tags: no-fasttest, no-parallel, no-object-storage, no-random-settings

# set -x

CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CUR_DIR"/../shell_config.sh


disk_name="${CLICKHOUSE_TEST_UNIQUE_NAME}"
$CLICKHOUSE_CLIENT -m --query """
DROP TABLE IF EXISTS test;
CREATE TABLE test (a Int32, b String)
ENGINE = MergeTree() ORDER BY tuple()
SETTINGS disk = disk(name = '$disk_name', type = cache, max_size = '100Ki', path = ${CLICKHOUSE_TEST_UNIQUE_NAME}, disk = s3_disk);
INSERT INTO test SELECT 1, 'test';
"""

$CLICKHOUSE_CLIENT --query """
Copy link
Collaborator

@mkmkme mkmkme Nov 11, 2025

Choose a reason for hiding this comment

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

Offtopic: Huh TIL this kind of strings is used in shell queries is used in ClickHouse. Three double quotes are not actually supported in bash. Effectively it creates an empty line, then appends a "multi-line" string (in quotes because the newline is replaced with a space), then appends another empty line here.

So it's effectively the same as writing

$CLICKHOUSE_CLIENT --query "
SYSTEM SYNC FILESYSTEM CACHE '$disk_name' ON CLUSTER 'test_shard_localhost';
"

No need to change anything, though. I can see it's used quite a lot in those tests.

Copy link
Author

@ianton-ru ianton-ru Nov 12, 2025

Choose a reason for hiding this comment

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

I have copied part of code from other test with triple quotas. Try to do not forgive this next time.
Thanks!

SYSTEM SYNC FILESYSTEM CACHE '$disk_name' ON CLUSTER 'test_shard_localhost';
"""

$CLICKHOUSE_CLIENT --query """
SYSTEM DROP FILESYSTEM CACHE '$disk_name' ON CLUSTER 'test_shard_localhost';
"""

$CLICKHOUSE_CLIENT --query """
DROP TABLE IF EXISTS test;
"""
Loading