From 49fa25295661b04d3ccc6b9be8d0254e7f317c38 Mon Sep 17 00:00:00 2001 From: Arthur Passos Date: Thu, 16 Oct 2025 19:35:33 -0300 Subject: [PATCH 1/3] Update 03572_export_replicated_merge_tree_part_to_object_storage.sh --- ...rt_replicated_merge_tree_part_to_object_storage.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh index a691d4bdf37a..142664954bff 100755 --- a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh +++ b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh @@ -7,13 +7,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) rmt_table="rmt_table_${RANDOM}" s3_table="s3_table_${RANDOM}" -rmt_table_roundtrip="rmt_table_roundtrip_${RANDOM}" query() { $CLICKHOUSE_CLIENT --query "$1" } -query "DROP TABLE IF EXISTS $rmt_table, $s3_table, $rmt_table_roundtrip" +query "DROP TABLE IF EXISTS $rmt_table, $s3_table" query "CREATE TABLE $rmt_table (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table', 'replica1') PARTITION BY year ORDER BY tuple()" query "CREATE TABLE $s3_table (id UInt64, year UInt16) ENGINE = S3(s3_conn, filename='$s3_table', format=Parquet, partition_strategy='hive') PARTITION BY year" @@ -35,10 +34,4 @@ query "ALTER TABLE $rmt_table EXPORT PART '$part_2020' TO TABLE $s3_table SETTIN query "SELECT * FROM $s3_table ORDER BY id" -query "CREATE TABLE $rmt_table_roundtrip (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table_roundtrip', 'replica1') PARTITION BY year ORDER BY tuple()" -query "INSERT INTO $rmt_table_roundtrip SELECT * FROM $s3_table" - -echo "---- Data in roundtrip ReplicatedMergeTree table (should match s3_table)" -query "SELECT * FROM $rmt_table_roundtrip ORDER BY id" - -query "DROP TABLE IF EXISTS $rmt_table, $s3_table, $rmt_table_roundtrip" +query "DROP TABLE IF EXISTS $rmt_table, $s3_table" From bae236a62c2810ca201e16e1446cf7de2b8c7eed Mon Sep 17 00:00:00 2001 From: Arthur Passos Date: Thu, 16 Oct 2025 19:42:30 -0300 Subject: [PATCH 2/3] last fixes --- .../03572_export_merge_tree_part_to_object_storage.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh index 6f2d6415f4e8..e17bd4115bc2 100755 --- a/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh +++ b/tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# Tags: no-fasttest + CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) # shellcheck source=../shell_config.sh . "$CURDIR"/../shell_config.sh From 9377bc2869750cd41618c33754b94205306cffb9 Mon Sep 17 00:00:00 2001 From: Arthur Passos Date: Fri, 17 Oct 2025 08:46:00 -0300 Subject: [PATCH 3/3] forgot about this as well --- ...rt_replicated_merge_tree_part_to_object_storage.reference | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference index 07f1ec6376a6..991a5901ae6e 100644 --- a/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference +++ b/tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference @@ -9,8 +9,3 @@ 2 2020 3 2020 4 2021 ----- Data in roundtrip ReplicatedMergeTree table (should match s3_table) -1 2020 -2 2020 -3 2020 -4 2021