Merge branch 'releases/25.3.14' into backports/releases/25.3.14/82900

zvonand · web-flow · commit f30643152146 · 2026-06-15T20:04:07.000+02:00
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
@@ -444,7 +444,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester
-      commit: b8e6b17fdd6f6c0db1234c23eca5294c9400a196
+      commit: release
       arch: release
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -455,7 +455,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-regression-tester-aarch64
-      commit: b8e6b17fdd6f6c0db1234c23eca5294c9400a196
+      commit: release
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
@@ -210,11 +210,11 @@ ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs_)
         outputs.push_back(&addInput(input.name, input.type));
 }
 
-ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)
+ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_, bool duplicate_const_columns)
 {
     for (const auto & input : inputs_)
     {
-        if (input.column && isColumnConst(*input.column))
+        if (input.column && isColumnConst(*input.column) && duplicate_const_columns)
         {
             addInput(input);
 
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
@@ -115,7 +115,7 @@ class ActionsDAG
     ActionsDAG & operator=(ActionsDAG &&) = default;
     ActionsDAG & operator=(const ActionsDAG &) = delete;
     explicit ActionsDAG(const NamesAndTypesList & inputs_);
-    explicit ActionsDAG(const ColumnsWithTypeAndName & inputs_);
+    explicit ActionsDAG(const ColumnsWithTypeAndName & inputs_, bool duplicate_const_columns = true);
 
     const Nodes & getNodes() const { return nodes; }
     static Nodes detachNodes(ActionsDAG && dag) { return std::move(dag.nodes); }
diff --git a/src/Planner/PlannerExpressionAnalysis.cpp b/src/Planner/PlannerExpressionAnalysis.cpp
@@ -125,7 +125,9 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
     Names aggregation_keys;
 
     ActionsAndProjectInputsFlagPtr before_aggregation_actions = std::make_shared<ActionsAndProjectInputsFlag>();
-    before_aggregation_actions->dag = ActionsDAG(input_columns);
+    /// Here it is OK to materialize const columns: if column is used in GROUP BY, it may be expected to become non-const
+    /// See https://github.com/ClickHouse/ClickHouse/issues/70655 for example
+    before_aggregation_actions->dag = ActionsDAG(input_columns, false);
     before_aggregation_actions->dag.getOutputs().clear();
 
     std::unordered_set<std::string_view> before_aggregation_actions_output_node_names;
diff --git a/src/Storages/MergeTree/Compaction/MergePredicates/DistributedMergePredicate.h b/src/Storages/MergeTree/Compaction/MergePredicates/DistributedMergePredicate.h
@@ -76,6 +76,9 @@ class DistributedMergePredicate : public IMergePredicate
         if (left.info.partition_id != right.info.partition_id)
             return std::unexpected(PreformattedMessage::create("Parts {} and {} belong to different partitions", left.name, right.name));
 
+        if (left.is_in_volume_where_merges_avoid || right.is_in_volume_where_merges_avoid)
+            return std::unexpected(PreformattedMessage::create("One of parts ({}, {}) lies on volume where merges should be avoided", left.name, right.name));
+
         int64_t left_max_block = left.info.max_block;
         int64_t right_min_block = right.info.min_block;
         chassert(left_max_block < right_min_block);
diff --git a/src/Storages/MergeTree/Compaction/MergePredicates/MergeTreeMergePredicate.cpp b/src/Storages/MergeTree/Compaction/MergePredicates/MergeTreeMergePredicate.cpp
@@ -16,6 +16,9 @@ std::expected<void, PreformattedMessage> MergeTreeMergePredicate::canMergeParts(
     if (left.info.partition_id != right.info.partition_id)
         return std::unexpected(PreformattedMessage::create("Parts {} and {} belong to different partitions", left.name, right.name));
 
+    if (left.is_in_volume_where_merges_avoid || right.is_in_volume_where_merges_avoid)
+        return std::unexpected(PreformattedMessage::create("One of parts ({}, {}) lies on volume where merges should be avoided", left.name, right.name));
+
     if (left.projection_names != right.projection_names)
         return std::unexpected(PreformattedMessage::create(
                 "Parts have different projection sets: {{}} in {} and {{}} in {}",
diff --git a/src/Storages/MergeTree/Compaction/MergeSelectors/TTLMergeSelector.cpp b/src/Storages/MergeTree/Compaction/MergeSelectors/TTLMergeSelector.cpp
@@ -147,6 +147,9 @@ time_t TTLRowDeleteMergeSelector::getTTLForPart(const PartProperties & part) con
 
 bool TTLRowDeleteMergeSelector::canConsiderPart(const PartProperties & part) const
 {
+    if (part.is_in_volume_where_merges_avoid)
+        return false;
+
     if (!part.general_ttl_info.has_value())
         return false;
 
@@ -165,6 +168,9 @@ time_t TTLRecompressMergeSelector::getTTLForPart(const PartProperties & part) co
 
 bool TTLRecompressMergeSelector::canConsiderPart(const PartProperties & part) const
 {
+    if (part.is_in_volume_where_merges_avoid)
+        return false;
+
     if (!part.recompression_ttl_info.has_value())
         return false;
 
diff --git a/src/Storages/MergeTree/Compaction/PartProperties.cpp b/src/Storages/MergeTree/Compaction/PartProperties.cpp
@@ -66,13 +66,15 @@ std::set<std::string> getCalculatedProjectionNames(const MergeTreeDataPartPtr &
 PartProperties buildPartProperties(
     const MergeTreeDataPartPtr & part,
     const StorageMetadataPtr & metadata_snapshot,
+    const StoragePolicyPtr & storage_policy,
     time_t current_time)
 {
     return PartProperties{
         .name = part->name,
         .info = part->info,
         .projection_names = getCalculatedProjectionNames(part),
         .all_ttl_calculated_if_any = part->checkAllTTLCalculated(metadata_snapshot),
+        .is_in_volume_where_merges_avoid = !part->shallParticipateInMerges(storage_policy),
         .size = part->getExistingBytesOnDisk(),
         .age = current_time - part->modification_time,
         .general_ttl_info = buildGeneralTTLInfo(metadata_snapshot, part),
diff --git a/src/Storages/MergeTree/Compaction/PartProperties.h b/src/Storages/MergeTree/Compaction/PartProperties.h
@@ -2,6 +2,8 @@
 
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 
+#include <Disks/IStoragePolicy.h>
+
 #include <Core/UUID.h>
 
 #include <optional>
@@ -18,6 +20,7 @@ struct PartProperties
     const std::set<std::string> projection_names = {};
 
     const bool all_ttl_calculated_if_any = false;
+    const bool is_in_volume_where_merges_avoid = false;
 
     /// Size of data part in bytes.
     const size_t size = 0;
@@ -50,6 +53,7 @@ using PartsRangeView = std::span<const PartProperties>;
 PartProperties buildPartProperties(
     const MergeTreeDataPartPtr & part,
     const StorageMetadataPtr & metadata_snapshot,
+    const StoragePolicyPtr & storage_policy,
     time_t current_time);
 
 }
diff --git a/src/Storages/MergeTree/Compaction/PartsCollectors/Common.cpp b/src/Storages/MergeTree/Compaction/PartsCollectors/Common.cpp
@@ -6,7 +6,10 @@ namespace DB
 {
 
 PartsRanges constructPartsRanges(
-    std::vector<MergeTreeDataPartsVector> && ranges, const StorageMetadataPtr & metadata_snapshot, const time_t & current_time)
+    std::vector<MergeTreeDataPartsVector> && ranges,
+    const StorageMetadataPtr & metadata_snapshot,
+    const StoragePolicyPtr & storage_policy,
+    const time_t & current_time)
 {
     PartsRanges properties_ranges;
     properties_ranges.reserve(ranges.size());
@@ -17,7 +20,7 @@ PartsRanges constructPartsRanges(
         properties_ranges.reserve(range.size());
 
         for (const auto & part : range)
-            properties_range.push_back(buildPartProperties(part, metadata_snapshot, current_time));
+            properties_range.push_back(buildPartProperties(part, metadata_snapshot, storage_policy, current_time));
 
         properties_ranges.push_back(std::move(properties_range));
     }
diff --git a/src/Storages/MergeTree/Compaction/PartsCollectors/Common.h b/src/Storages/MergeTree/Compaction/PartsCollectors/Common.h
@@ -55,7 +55,10 @@ std::expected<void, PreformattedMessage> checkAllPartsSatisfyPredicate(const std
 }
 
 PartsRanges constructPartsRanges(
-    std::vector<MergeTreeDataPartsVector> && ranges, const StorageMetadataPtr & metadata_snapshot, const time_t & current_time);
+    std::vector<MergeTreeDataPartsVector> && ranges,
+    const StorageMetadataPtr & metadata_snapshot,
+    const StoragePolicyPtr & storage_policy,
+    const time_t & current_time);
 
 MergeTreeDataPartsVector filterByPartitions(
     MergeTreeDataPartsVector && parts, const std::optional<PartitionIdsHint> & partitions_to_keep);
diff --git a/src/Storages/MergeTree/Compaction/PartsCollectors/MergeTreePartsCollector.cpp b/src/Storages/MergeTree/Compaction/PartsCollectors/MergeTreePartsCollector.cpp
@@ -75,9 +75,7 @@ MergeTreeDataPartsVector collectInitial(const MergeTreeData & data, const MergeT
 
 auto constructPreconditionsPredicate(const StoragePolicyPtr & storage_policy, const MergeTreeTransactionPtr & tx, const MergeTreeMergePredicatePtr & merge_pred)
 {
-    bool has_volumes_with_disabled_merges = storage_policy->hasAnyVolumeWithDisabledMerges();
-
-    auto predicate = [storage_policy, tx, merge_pred, has_volumes_with_disabled_merges](const MergeTreeDataPartPtr & part) -> std::expected<void, PreformattedMessage>
+    auto predicate = [storage_policy, tx, merge_pred](const MergeTreeDataPartPtr & part) -> std::expected<void, PreformattedMessage>
     {
         if (tx)
         {
@@ -91,9 +89,6 @@ auto constructPreconditionsPredicate(const StoragePolicyPtr & storage_policy, co
                 return std::unexpected(PreformattedMessage::create("Part {} is locked for removal", part->name));
         }
 
-        if (has_volumes_with_disabled_merges && !part->shallParticipateInMerges(storage_policy))
-            return std::unexpected(PreformattedMessage::create("Merges for part's {} volume are disabled", part->name));
-
         chassert(merge_pred);
         return merge_pred->canUsePartInMerges(part);
     };
@@ -133,7 +128,7 @@ PartsRanges MergeTreePartsCollector::grabAllPossibleRanges(
 {
     auto parts = filterByPartitions(collectInitial(storage, tx), partitions_hint);
     auto ranges = splitPartsByPreconditions(std::move(parts), storage_policy, tx, merge_pred, series_log);
-    return constructPartsRanges(std::move(ranges), metadata_snapshot, current_time);
+    return constructPartsRanges(std::move(ranges), metadata_snapshot, storage_policy, current_time);
 }
 
 std::expected<PartsRange, PreformattedMessage> MergeTreePartsCollector::grabAllPartsInsidePartition(
@@ -146,7 +141,7 @@ std::expected<PartsRange, PreformattedMessage> MergeTreePartsCollector::grabAllP
     if (auto result = checkAllParts(parts, storage_policy, tx, merge_pred); !result)
         return std::unexpected(std::move(result.error()));
 
-    auto ranges = constructPartsRanges({std::move(parts)}, metadata_snapshot, current_time);
+    auto ranges = constructPartsRanges({std::move(parts)}, metadata_snapshot, storage_policy, current_time);
     chassert(ranges.size() == 1);
 
     return std::move(ranges.front());
diff --git a/src/Storages/MergeTree/Compaction/PartsCollectors/ReplicatedMergeTreePartsCollector.cpp b/src/Storages/MergeTree/Compaction/PartsCollectors/ReplicatedMergeTreePartsCollector.cpp
@@ -15,14 +15,8 @@ MergeTreeDataPartsVector collectInitial(const MergeTreeData & data)
 
 auto constructPreconditionsPredicate(const StoragePolicyPtr & storage_policy, const ReplicatedMergeTreeMergePredicatePtr & merge_pred)
 {
-    bool has_volumes_with_disabled_merges = storage_policy->hasAnyVolumeWithDisabledMerges();
-
-    auto predicate = [storage_policy, merge_pred, has_volumes_with_disabled_merges](const MergeTreeDataPartPtr & part) -> std::expected<void, PreformattedMessage>
+    auto predicate = [storage_policy, merge_pred](const MergeTreeDataPartPtr & part) -> std::expected<void, PreformattedMessage>
     {
-        if (has_volumes_with_disabled_merges && !part->shallParticipateInMerges(storage_policy))
-            return std::unexpected(PreformattedMessage::create("Merges for part's {} volume are disabled", part->name));
-
-        chassert(merge_pred);
         return merge_pred->canUsePartInMerges(part);
     };
 
@@ -60,7 +54,7 @@ PartsRanges ReplicatedMergeTreePartsCollector::grabAllPossibleRanges(
 {
     auto parts = filterByPartitions(collectInitial(storage), partitions_hint);
     auto ranges = splitPartsByPreconditions(std::move(parts), storage_policy, merge_pred, series_log);
-    return constructPartsRanges(std::move(ranges), metadata_snapshot, current_time);
+    return constructPartsRanges(std::move(ranges), metadata_snapshot, storage_policy, current_time);
 }
 
 std::expected<PartsRange, PreformattedMessage> ReplicatedMergeTreePartsCollector::grabAllPartsInsidePartition(
@@ -73,7 +67,7 @@ std::expected<PartsRange, PreformattedMessage> ReplicatedMergeTreePartsCollector
     if (auto result = checkAllParts(parts, storage_policy, merge_pred); !result)
         return std::unexpected(std::move(result.error()));
 
-    auto ranges = constructPartsRanges({std::move(parts)}, metadata_snapshot, current_time);
+    auto ranges = constructPartsRanges({std::move(parts)}, metadata_snapshot, storage_policy, current_time);
     chassert(ranges.size() == 1);
 
     return std::move(ranges.front());
diff --git a/tests/integration/test_filesystem_cache/config.d/filesystem_caches_path.xml b/tests/integration/test_filesystem_cache/config.d/filesystem_caches_path.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <filesystem_caches_path>/var/log/clickhouse/fs-cache/</filesystem_caches_path>
+</clickhouse>
diff --git a/tests/integration/test_no_merges_volume_ttl/__init__.py b/tests/integration/test_no_merges_volume_ttl/__init__.py
diff --git a/tests/integration/test_no_merges_volume_ttl/configs/storage_config.xml b/tests/integration/test_no_merges_volume_ttl/configs/storage_config.xml
@@ -0,0 +1,25 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <with_merges>
+                <path>/with_merges/</path>
+            </with_merges>
+            <no_merges>
+                <path>/no_merges/</path>
+            </no_merges>
+        </disks>
+        <policies>
+            <hot_cold_separation_policy>
+                <volumes>
+                    <with_merges>
+                        <disk>with_merges</disk>
+                    </with_merges>
+                    <no_merges>
+                        <disk>no_merges</disk>
+                        <prefer_not_to_merge>true</prefer_not_to_merge>
+                    </no_merges>
+                </volumes>
+            </hot_cold_separation_policy>
+        </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/integration/test_no_merges_volume_ttl/test.py b/tests/integration/test_no_merges_volume_ttl/test.py
@@ -0,0 +1,80 @@
+import pytest
+import time
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/storage_config.xml"],
+    tmpfs=["/with_merges:size=200M", "/no_merges:size=200M"],
+)
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def wait_parts_count(table, expected_number_of_parts):
+    for i in range(100):
+        print(f"Waiting {expected_number_of_parts} for table {table}. Iteration: {i}")
+        parts_count = int(node.query(f"select count() from system.parts where table = '{table}' and active"))
+
+        if parts_count == expected_number_of_parts:
+            break
+
+        time.sleep(1)
+
+    assert int(node.query(f"select count() from system.parts where table = '{table}' and active")) == expected_number_of_parts
+
+
+def test_no_merges_volume_ttl_merge(start_cluster):
+    node.query("create table t (time DateTime) engine = MergeTree order by tuple() ttl time settings storage_policy='hot_cold_separation_policy', merge_with_ttl_timeout=0")
+    table_uuid = node.query("select uuid from system.tables where table = 't'").strip()
+
+    node.query("system stop merges t")
+    node.query("insert into t values (now() - interval 1 day)")
+    assert node.query("select path from system.parts where table = 't' and active").strip() == f"/with_merges/store/{table_uuid[:3]}/{table_uuid}/all_1_1_0/"
+    assert int(node.query("select count() from t").strip()) == 1
+
+    node.query("alter table t move partition () to volume 'no_merges'")
+    assert node.query("select path from system.parts where table = 't' and active").strip() == f"/no_merges/store/{table_uuid[:3]}/{table_uuid}/all_1_1_0/"
+    assert int(node.query("select count() from t").strip()) == 1
+
+    node.query("system start merges t")
+    wait_parts_count("t", 0)
+
+    assert int(node.query("select count() from t").strip()) == 0
+    node.query("drop table t sync")
+
+
+def test_no_merges_volume_no_regular_merges(start_cluster):
+    node.query("create table t (a UInt64) engine = MergeTree order by tuple() settings storage_policy='hot_cold_separation_policy'")
+
+    node.query("system stop merges t")
+    node.query("insert into t select number from numbers(50) settings max_block_size=1, min_insert_block_size_bytes=1")
+    assert int(node.query("select count() from t").strip()) == 50
+    assert int(node.query("select count() from system.parts where table = 't' and active").strip()) == 50
+
+    node.query("alter table t move partition () to volume 'no_merges'")
+    assert int(node.query("select count() from t").strip()) == 50
+    assert int(node.query("select count() from system.parts where table = 't' and active").strip()) == 50
+
+    node.query("system start merges t")
+    node.query("optimize table t")
+    node.query("optimize table t")
+    node.query("optimize table t")
+    node.query("optimize table t")
+    node.query("optimize table t final")
+    node.query("optimize table t final")
+    node.query("optimize table t final")
+    node.query("optimize table t final")
+
+    assert int(node.query("select count() from t").strip()) == 50
+    assert int(node.query("select count() from system.parts where table = 't' and active").strip()) == 50
+    node.query("drop table t sync")
diff --git a/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.reference b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.reference
@@ -3,4 +3,4 @@ iphone	1
 iphone	1
 iphone	1
 
-iphone	1
+\N	1
diff --git a/tests/queries/0_stateless/03447_grouping_sets_analyzer_const_columns.reference b/tests/queries/0_stateless/03447_grouping_sets_analyzer_const_columns.reference
@@ -0,0 +1,27 @@
+Const column in grouping set, analyzer on:
+0	0	value	0	1
+0	0	value	1	1
+0	0	value	2	1
+0	0	value	3	1
+1	0		0	1
+1	0		1	1
+1	0		2	1
+1	0		3	1
+Non-const column in grouping set, analyzer on:
+0	0	value	0	1
+0	0	value	1	1
+0	0	value	2	1
+0	0	value	3	1
+1	0		0	1
+1	0		1	1
+1	0		2	1
+1	0		3	1
+Const column in grouping set, analyzer off:
+0	0	value	0	1
+0	0	value	1	1
+0	0	value	2	1
+0	0	value	3	1
+1	0		0	1
+1	0		1	1
+1	0		2	1
+1	0		3	1
diff --git a/tests/queries/0_stateless/03447_grouping_sets_analyzer_const_columns.sql b/tests/queries/0_stateless/03447_grouping_sets_analyzer_const_columns.sql

Original file line number	Diff line number	Diff line change
`@@ -210,11 +210,11 @@ ActionsDAG::ActionsDAG(const NamesAndTypesList & inputs_)`
`210`	`210`	`outputs.push_back(&addInput(input.name, input.type));`
`211`	`211`	`}`
`212`	`212`
`213`		`-ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_)`
	`213`	`+ActionsDAG::ActionsDAG(const ColumnsWithTypeAndName & inputs_, bool duplicate_const_columns)`
`214`	`214`	`{`
`215`	`215`	`for (const auto & input : inputs_)`
`216`	`216`	`{`
`217`		`- if (input.column && isColumnConst(*input.column))`
	`217`	`+ if (input.column && isColumnConst(*input.column) && duplicate_const_columns)`
`218`	`218`	`{`
`219`	`219`	`addInput(input);`
`220`	`220`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,10 @@ namespace DB`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`PartsRanges constructPartsRanges(`
`9`		`- std::vector<MergeTreeDataPartsVector> && ranges, const StorageMetadataPtr & metadata_snapshot, const time_t & current_time)`
	`9`	`+ std::vector<MergeTreeDataPartsVector> && ranges,`
	`10`	`+ const StorageMetadataPtr & metadata_snapshot,`
	`11`	`+ const StoragePolicyPtr & storage_policy,`
	`12`	`+ const time_t & current_time)`
`10`	`13`	`{`
`11`	`14`	`PartsRanges properties_ranges;`
`12`	`15`	`properties_ranges.reserve(ranges.size());`
`@@ -17,7 +20,7 @@ PartsRanges constructPartsRanges(`
`17`	`20`	`properties_ranges.reserve(range.size());`
`18`	`21`
`19`	`22`	`for (const auto & part : range)`
`20`		`- properties_range.push_back(buildPartProperties(part, metadata_snapshot, current_time));`
	`23`	`+ properties_range.push_back(buildPartProperties(part, metadata_snapshot, storage_policy, current_time));`
`21`	`24`
`22`	`25`	`properties_ranges.push_back(std::move(properties_range));`
`23`	`26`	`}`