Skip to content

Commit 18fd55f

Browse files
authored
Merge pull request ClickHouse#78881 from ClickHouse/fix-table-attach
Fix table attach in stress test
2 parents 896c367 + a72c2a5 commit 18fd55f

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<clickhouse>
2+
<storage_configuration>
3+
<disks>
4+
<local_plain_rewritable_03008>
5+
<type>object_storage</type>
6+
<object_storage_type>local</object_storage_type>
7+
<path>disks/local_plain_rewritable/</path>
8+
<metadata_type>plain_rewritable</metadata_type>
9+
</local_plain_rewritable_03008>
10+
</disks>
11+
</storage_configuration>
12+
</clickhouse>

tests/config/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ ln -sf $SRC_PATH/config.d/handlers.yaml $DEST_SERVER_PATH/config.d/
105105
ln -sf $SRC_PATH/config.d/threadpool_writer_pool_size.yaml $DEST_SERVER_PATH/config.d/
106106
ln -sf $SRC_PATH/config.d/serverwide_trace_collector.xml $DEST_SERVER_PATH/config.d/
107107
ln -sf $SRC_PATH/config.d/rocksdb.xml $DEST_SERVER_PATH/config.d/
108+
ln -sf $SRC_PATH/config.d/storage_conf_03008.xml $DEST_SERVER_PATH/config.d/
108109

109110
# Not supported with fasttest.
110111
if [ "$FAST_TEST" != "1" ]; then

tests/queries/0_stateless/03008_local_plain_rewritable.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@ ${CLICKHOUSE_CLIENT} --query "drop table if exists 03008_test_local_mt sync"
1111
${CLICKHOUSE_CLIENT} -m --query "
1212
create table 03008_test_local_mt (a Int32, b Int64, c Int64)
1313
engine = MergeTree() partition by intDiv(a, 1000) order by tuple(a, b)
14-
settings disk = disk(
15-
name = 03008_local_plain_rewritable,
16-
type = object_storage,
17-
object_storage_type = local,
18-
metadata_type = plain_rewritable,
19-
path = 'disks/local_plain_rewritable/')
14+
settings disk = 'local_plain_rewritable_03008'
2015
"
2116

2217
${CLICKHOUSE_CLIENT} -m --query "
@@ -32,7 +27,7 @@ select (*) from 03008_test_local_mt order by tuple(a, b) limit 10;
3227
${CLICKHOUSE_CLIENT} --query "optimize table 03008_test_local_mt final;"
3328

3429
${CLICKHOUSE_CLIENT} -m --query "
35-
alter table 03008_test_local_mt modify setting disk = '03008_local_plain_rewritable', old_parts_lifetime = 3600;
30+
alter table 03008_test_local_mt modify setting disk = 'local_plain_rewritable_03008', old_parts_lifetime = 3600;
3631
select engine_full from system.tables WHERE database = currentDatabase() AND name = '03008_test_local_mt';
3732
" | grep -c "old_parts_lifetime = 3600"
3833

0 commit comments

Comments
 (0)