Skip to content

Commit 427e640

Browse files
authored
Merge pull request #1087 from Altinity/fp_antalya_25_8_export_mt_part
Fixes that did not get merged on time
2 parents 3b85aca + 9377bc2 commit 427e640

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

tests/queries/0_stateless/03572_export_merge_tree_part_to_object_storage.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
# Tags: no-fasttest
4+
35
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
46
# shellcheck source=../shell_config.sh
57
. "$CURDIR"/../shell_config.sh

tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.reference

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,3 @@
99
2 2020
1010
3 2020
1111
4 2021
12-
---- Data in roundtrip ReplicatedMergeTree table (should match s3_table)
13-
1 2020
14-
2 2020
15-
3 2020
16-
4 2021

tests/queries/0_stateless/03572_export_replicated_merge_tree_part_to_object_storage.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
77

88
rmt_table="rmt_table_${RANDOM}"
99
s3_table="s3_table_${RANDOM}"
10-
rmt_table_roundtrip="rmt_table_roundtrip_${RANDOM}"
1110

1211
query() {
1312
$CLICKHOUSE_CLIENT --query "$1"
1413
}
1514

16-
query "DROP TABLE IF EXISTS $rmt_table, $s3_table, $rmt_table_roundtrip"
15+
query "DROP TABLE IF EXISTS $rmt_table, $s3_table"
1716

1817
query "CREATE TABLE $rmt_table (id UInt64, year UInt16) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/$rmt_table', 'replica1') PARTITION BY year ORDER BY tuple()"
1918
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
3534

3635
query "SELECT * FROM $s3_table ORDER BY id"
3736

38-
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()"
39-
query "INSERT INTO $rmt_table_roundtrip SELECT * FROM $s3_table"
40-
41-
echo "---- Data in roundtrip ReplicatedMergeTree table (should match s3_table)"
42-
query "SELECT * FROM $rmt_table_roundtrip ORDER BY id"
43-
44-
query "DROP TABLE IF EXISTS $rmt_table, $s3_table, $rmt_table_roundtrip"
37+
query "DROP TABLE IF EXISTS $rmt_table, $s3_table"

0 commit comments

Comments
 (0)