Skip to content

Commit c9008f7

Browse files
Merge pull request ClickHouse#80385 from jkartseva/plain-rw-encrypted-empty-path
Add a test for encrypted plain_rewritable disk with empty path
2 parents ecb85c5 + 2f13f28 commit c9008f7

File tree

4 files changed

+44
-0
lines changed

4 files changed

+44
-0
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<clickhouse>
2+
<storage_configuration>
3+
<disks>
4+
<disk_s3_plain_rewritable_03517>
5+
<type>object_storage</type>
6+
<object_storage_type>s3</object_storage_type>
7+
<metadata_type>plain_rewritable</metadata_type>
8+
<endpoint>http://localhost:11111/test/common/</endpoint>
9+
<access_key_id>clickhouse</access_key_id>
10+
<secret_access_key>clickhouse</secret_access_key>
11+
</disk_s3_plain_rewritable_03517>
12+
<disk_cache_03517>
13+
<type>cache</type>
14+
<disk>disk_s3_plain_rewritable_03517</disk>
15+
<path>disks/cache_03517/</path>
16+
<max_size>1Mi</max_size>
17+
<cache_on_write_operations>1</cache_on_write_operations>
18+
</disk_cache_03517>
19+
<disk_encrypted_03517>
20+
<type>encrypted</type>
21+
<disk>disk_cache_03517</disk>
22+
<key>1234567812345678</key>
23+
</disk_encrypted_03517>
24+
</disks>
25+
</storage_configuration>
26+
</clickhouse>

tests/config/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ if [[ "$EXPORT_S3_STORAGE_POLICIES" == "1" ]]; then
255255
fi
256256
ln -sf $SRC_PATH/config.d/storage_conf_02963.xml $DEST_SERVER_PATH/config.d/
257257
ln -sf $SRC_PATH/config.d/storage_conf_02961.xml $DEST_SERVER_PATH/config.d/
258+
ln -sf $SRC_PATH/config.d/storage_conf_03517.xml $DEST_SERVER_PATH/config.d/
258259
ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/users.d/
259260
ln -sf $SRC_PATH/users.d/s3_cache_new.xml $DEST_SERVER_PATH/users.d/
260261
fi
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
1
2+
2
3+
3
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
-- Tags: no-fasttest, no-shared-merge-tree
2+
-- Tag no-fasttest: requires S3
3+
-- Tag no-shared-merge-tree: does not support replication
4+
5+
DROP TABLE IF EXISTS t0 SYNC;
6+
7+
CREATE TABLE t0 (c0 Int32) ENGINE = MergeTree() ORDER BY c0
8+
SETTINGS disk='disk_encrypted_03517';
9+
10+
INSERT INTO t0 VALUES (1), (2), (3);
11+
12+
SELECT * FROM t0;
13+
14+
DROP TABLE t0;

0 commit comments

Comments
 (0)