Merge branch 'master' into no-sentry

Author: alexey-milovidov

tests/integration/test_refreshable_mat_view_replicated/test.py

@@ -412,10 +412,12 @@ def test_real_wait_refresh(
         expected_rows += 2
         expect_rows(expected_rows, table=tgt)
 
+    is_close = lambda x, y: x is not None and y is not None and abs(x.timestamp() - y.timestamp()) <= 3
+
     rmv2 = get_rmv_info(
         node,
         "test_rmv",
-        condition=lambda x: x["last_refresh_time"] == rmv["next_refresh_time"],
+        condition=lambda x: is_close(x["last_refresh_time"], rmv["next_refresh_time"]),
         # wait for refresh a little bit more than 10 seconds
         max_attempts=30,
         delay=0.5,
@@ -438,8 +440,8 @@ def test_real_wait_refresh(
 
     assert rmv2["exception"] is None
     assert rmv2["status"] in ["Scheduled", "Running"]
-    assert rmv2["last_success_time"] == rmv["next_refresh_time"]
-    assert rmv2["last_refresh_time"] == rmv["next_refresh_time"]
+    assert is_close(rmv2["last_success_time"], rmv["next_refresh_time"])
+    assert is_close(rmv2["last_refresh_time"], rmv["next_refresh_time"])
     assert rmv2["retry"] == 0 and rmv22["retry"] == 0
 
     for n in nodes:

tests/integration/test_refreshable_mv/test.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, QueryRuntimeException
 from helpers.network import PartitionManager
 from helpers.test_tools import assert_eq_with_retry, assert_logs_contain
 
@@ -354,8 +354,13 @@ def test_pause(started_cluster, cleanup):
     assert node2.query("select * from re.a") == "1\n"
     node2.query("system stop replicated view re.a")
     node1.restart_clickhouse() # just to guarantee that it notices the new znode
+    try:
+        node2.query("system wait view re.a")
+    except QueryRuntimeException as ex:
+        # If the node1.restart_clickhouse() interrupted a refresh, the error message (with substring
+        # "cancelled") is written to keeper, then thrown by "system wait view". That's normal.
+        assert "cancelled" in str(ex)
     node2.query(
-        "system wait view re.a;"
         "truncate table re.src;"
         "insert into re.src values (2);")
     time.sleep(3)
@@ -415,6 +420,8 @@ def do_test_backup(to_table):
 
     assert node1.query(tables_exist_query) == "2\n"
     assert node2.query(tables_exist_query) == "2\n"
+    node1.query(f'SYSTEM SYNC REPLICA re.{target}')
+    node2.query(f'SYSTEM SYNC REPLICA re.{target}')
     assert node1.query(f'SELECT * FROM re.{target}') == '1\n'
     assert node2.query(f'SELECT * FROM re.{target}') == '1\n'
 

tests/queries/0_stateless/03460_alter_materialized_view_on_cluster.reference

@@ -0,0 +1,42 @@
+-- Tags: no-replicated-database
+-- ^ due to the usage of ON CLUSTER queries
+
+SET distributed_ddl_output_mode = 'none', enable_analyzer = true;
+
+drop table if exists source, mview;
+
+CREATE TABLE source
+(
+    timestamp DateTime,
+    card_id UInt64,
+    _id String
+)
+ENGINE = MergeTree Partition by toYYYYMM(timestamp)
+ORDER BY _id TTL toDateTime(timestamp + toIntervalDay(7));
+
+CREATE MATERIALIZED VIEW mview on cluster test_shard_localhost
+ENGINE =  SummingMergeTree ORDER BY (day, card_id)
+as SELECT
+    toDate(timestamp) AS day,
+    card_id,
+    count(*) AS card_view
+FROM source GROUP BY (day, card_id);
+
+DROP TABLE mview;
+
+CREATE MATERIALIZED VIEW mview on cluster test_shard_localhost
+(
+    day Date,
+    card_id UInt64,
+    card_view Int64
+)
+ENGINE =  SummingMergeTree ORDER BY (day, card_id)
+as SELECT
+    toDate(timestamp) AS day,
+    card_id,
+    count(*) AS card_view
+FROM source GROUP BY (day, card_id);
+
+alter table source on cluster test_shard_localhost MODIFY SETTING ttl_only_drop_parts = 1;
+
+drop table if exists mview, source;