Merge pull request ClickHouse#86979 from ClickHouse/backport/25.8/86845

Backport ClickHouse#86845 to 25.8: Fix TimeSeries engine table breaking creation of new replica in Replicated Database

Author: clickhouse-gh[bot]

src/Databases/DatabaseReplicated.cpp

@@ -931,7 +931,11 @@ ASTPtr DatabaseReplicated::tryGetCreateOrAttachTableQuery(const String & name, C
 {
     auto res = tryGetCreateTableQuery(name, local_context);
     auto & create = res->as<ASTCreateQuery &>();
-    create.attach = create.is_materialized_view_with_inner_table();
+    create.attach = false;
+    if (create.is_materialized_view_with_inner_table())
+        create.attach = true;
+    if (create.storage && create.storage->engine && (create.storage->engine->name == "TimeSeries"))
+        create.attach = true;
     return res;
 }
 
@@ -1731,7 +1735,13 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadata(const String & table_name, con
 
     create.setDatabase(getDatabaseName());
     create.setTable(table_name);
-    create.attach = create.is_materialized_view_with_inner_table();
+    create.attach = false;
+
+    /// In both cases we need to set attach = true to avoid creating inner table(s) twice.
+    if (create.is_materialized_view_with_inner_table())
+        create.attach = true;
+    if (create.storage && create.storage->engine && (create.storage->engine->name == "TimeSeries"))
+        create.attach = true;
 
     return ast;
 }

tests/integration/test_replicated_database/test.py

@@ -1727,3 +1727,35 @@ def test_implicit_index(started_cluster):
         "CREATE DATABASE implicit_index ENGINE = Replicated('/clickhouse/databases/implicit_index', 'shard1', 'replica2');"
         "SYSTEM SYNC DATABASE REPLICA implicit_index;"
     )
+
+
+def test_timeseries(started_cluster):
+    for node in [competing_node, main_node, dummy_node]:
+        node.query("DROP DATABASE IF EXISTS ts_db SYNC")
+
+    competing_node.query(
+        "CREATE DATABASE ts_db ENGINE = Replicated('/clickhouse/databases/ts_db', '{shard}', '{replica}');"
+    )
+
+    main_node.query(
+        """
+        CREATE DATABASE ts_db ENGINE = Replicated('/clickhouse/databases/ts_db', '{shard}', '{replica}');
+        CREATE TABLE ts_db.table ENGINE = TimeSeries SETTINGS store_min_time_and_max_time = false
+        DATA ENGINE = ReplicatedMergeTree ORDER BY (id, timestamp)
+        TAGS ENGINE = ReplicatedAggregatingMergeTree PRIMARY KEY metric_name ORDER BY (metric_name, id)
+        METRICS ENGINE = ReplicatedReplacingMergeTree ORDER BY metric_family_name;
+        """,
+        settings={"allow_experimental_time_series_table": 1}
+    )
+
+    dummy_node.query(
+        "CREATE DATABASE ts_db ENGINE = Replicated('/clickhouse/databases/ts_db', '{shard}', '{replica}');"
+    )
+
+    for node in [competing_node, main_node, dummy_node]:
+        assert node.query(
+            """
+            SYSTEM SYNC DATABASE REPLICA ts_db;
+            SELECT count() FROM system.tables WHERE database='ts_db';
+            """, timeout=10
+        ) == "4\n", f"Node {node.name} failed"