Skip to content

Revert support for 'IN' in cluster requests #1160

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 3 commits into from
Nov 24, 2025
Merged

Revert support for 'IN' in cluster requests #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d94c05
Revert support for 'IN' in cluster requests
ianton-ru Nov 21, 2025
f350ed1
Merge branch 'antalya-25.8' into bugfix/antalya-25.8/revert_in_for_cl…
ianton-ru Nov 21, 2025
0b1db60
Merge branch 'antalya-25.8' into bugfix/antalya-25.8/revert_in_for_cl…
mkmkme Nov 24, 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
2 changes: 1 addition & 1 deletion src/Storages/IStorageCluster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ QueryProcessingStage::Enum IStorageCluster::getQueryProcessingStage(
"object_storage_cluster_join_mode!='allow' is not supported without allow_experimental_analyzer=true");

auto info = getQueryTreeInfo(query_info.query_tree, context);
if (info.has_join || info.has_cross_join || info.has_local_columns_in_where)
if (info.has_join || info.has_cross_join /*|| info.has_local_columns_in_where*/)
return QueryProcessingStage::Enum::FetchColumns;
}

Expand Down
67 changes: 35 additions & 32 deletions tests/integration/test_database_iceberg/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@ def test_cluster_joins(started_cluster):
FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` AS t1
JOIN {CATALOG_NAME}.`{root_namespace}.{table_name_2}` AS t2
ON t1.tag=t2.id
WHERE t1.tag < 10 AND t2.id < 20
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
Expand All @@ -733,29 +734,30 @@ def test_cluster_joins(started_cluster):

assert res == "Jack\tSparrow\nJohn\tDow\n"

res = node.query(
f"""
SELECT name
FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
WHERE tag in (
SELECT id
FROM {CATALOG_NAME}.`{root_namespace}.{table_name_2}`
)
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
object_storage_cluster_join_mode='local'
"""
)

assert res == "Jack\nJohn\n"
#res = node.query(
# f"""
# SELECT name
# FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
# WHERE tag in (
# SELECT id
# FROM {CATALOG_NAME}.`{root_namespace}.{table_name_2}`
# )
# ORDER BY ALL
# SETTINGS
# object_storage_cluster='cluster_simple',
# object_storage_cluster_join_mode='local'
# """
#)

#assert res == "Jack\nJohn\n"

res = node.query(
f"""
SELECT t1.name,t2.second_name
FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` AS t1
JOIN `{table_name_local}` AS t2
ON t1.tag=t2.id
WHERE t1.tag < 10 AND t2.id < 20
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
Expand All @@ -765,28 +767,29 @@ def test_cluster_joins(started_cluster):

assert res == "Jack\tBlack\nJohn\tSilver\n"

res = node.query(
f"""
SELECT name
FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
WHERE tag in (
SELECT id
FROM `{table_name_local}`
)
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
object_storage_cluster_join_mode='local'
"""
)

assert res == "Jack\nJohn\n"
#res = node.query(
# f"""
# SELECT name
# FROM {CATALOG_NAME}.`{root_namespace}.{table_name}`
# WHERE tag in (
# SELECT id
# FROM `{table_name_local}`
# )
# ORDER BY ALL
# SETTINGS
# object_storage_cluster='cluster_simple',
# object_storage_cluster_join_mode='local'
# """
#)

#assert res == "Jack\nJohn\n"

res = node.query(
f"""
SELECT t1.name,t2.second_name
FROM {CATALOG_NAME}.`{root_namespace}.{table_name}` AS t1
CROSS JOIN `{table_name_local}` AS t2
WHERE t1.tag < 10 AND t2.id < 20
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
Expand Down
26 changes: 13 additions & 13 deletions tests/integration/test_s3_cluster/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,19 +1163,19 @@ def test_joins(started_cluster):
res = list(map(str.split, result5.splitlines()))
assert len(res) == 6

result6 = node.query(
f"""
SELECT name FROM
s3Cluster('cluster_simple',
'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
WHERE value IN (SELECT id FROM join_table)
ORDER BY name
SETTINGS object_storage_cluster_join_mode='local';
"""
)
res = list(map(str.split, result6.splitlines()))
assert len(res) == 25
#result6 = node.query(
# f"""
# SELECT name FROM
# s3Cluster('cluster_simple',
# 'http://minio1:9001/root/data/{{clickhouse,database}}/*', 'minio', '{minio_secret_key}', 'CSV',
# 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
# WHERE value IN (SELECT id FROM join_table)
# ORDER BY name
# SETTINGS object_storage_cluster_join_mode='local';
# """
#)
#res = list(map(str.split, result6.splitlines()))
#assert len(res) == 25


def test_graceful_shutdown(started_cluster):
Expand Down
63 changes: 33 additions & 30 deletions tests/integration/test_storage_iceberg/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3623,6 +3623,7 @@ def execute_spark_query(query: str, table_name):
FROM {creation_expression} AS t1
JOIN {creation_expression_2} AS t2
ON t1.tag=t2.id
WHERE t1.tag < 10 AND t2.id < 20
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
Expand All @@ -3632,29 +3633,30 @@ def execute_spark_query(query: str, table_name):

assert res == "jack\tsparrow\njohn\tdow\n"

res = instance.query(
f"""
SELECT name
FROM {creation_expression}
WHERE tag in (
SELECT id
FROM {creation_expression_2}
)
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
object_storage_cluster_join_mode='local'
"""
)
#res = instance.query(
# f"""
# SELECT name
# FROM {creation_expression}
# WHERE tag in (
# SELECT id
# FROM {creation_expression_2}
# )
# ORDER BY ALL
# SETTINGS
# object_storage_cluster='cluster_simple',
# object_storage_cluster_join_mode='local'
# """
#)

assert res == "jack\njohn\n"
#assert res == "jack\njohn\n"

res = instance.query(
f"""
SELECT t1.name,t2.second_name
FROM {creation_expression} AS t1
JOIN `{TABLE_NAME_LOCAL}` AS t2
ON t1.tag=t2.id
WHERE t1.tag < 10 AND t2.id < 20
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
Expand All @@ -3664,28 +3666,29 @@ def execute_spark_query(query: str, table_name):

assert res == "jack\tblack\njohn\tsilver\n"

res = instance.query(
f"""
SELECT name
FROM {creation_expression}
WHERE tag in (
SELECT id
FROM `{TABLE_NAME_LOCAL}`
)
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
object_storage_cluster_join_mode='local'
"""
)
#res = instance.query(
# f"""
# SELECT name
# FROM {creation_expression}
# WHERE tag in (
# SELECT id
# FROM `{TABLE_NAME_LOCAL}`
# )
# ORDER BY ALL
# SETTINGS
# object_storage_cluster='cluster_simple',
# object_storage_cluster_join_mode='local'
# """
#)

assert res == "jack\njohn\n"
#assert res == "jack\njohn\n"

res = instance.query(
f"""
SELECT t1.name,t2.second_name
FROM {creation_expression} AS t1
CROSS JOIN `{TABLE_NAME_LOCAL}` AS t2
WHERE t1.tag < 10 AND t2.id < 20
ORDER BY ALL
SETTINGS
object_storage_cluster='cluster_simple',
Expand Down
Loading