Merge pull request ClickHouse#80660 from Algunenano/metadata_path

Handle missing slash in metadata_path when printing system.tables

Author: Algunenano

src/Storages/MergeTree/MergeTreeData.cpp

@@ -8134,7 +8134,7 @@ bool MergeTreeData::canUseAdaptiveGranularity() const
 
 String MergeTreeData::getFullPathOnDisk(const DiskPtr & disk) const
 {
-    return disk->getPath() + relative_data_path;
+    return fs::path(disk->getPath()) / relative_data_path;
 }
 
 

tests/integration/test_merge_tree_s3/configs/config.d/storage_conf.xml

@@ -7,6 +7,7 @@
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>ClickHouse_Minio_P@ssw0rd</secret_access_key>
                 <s3_max_single_part_upload_size>33554432</s3_max_single_part_upload_size>
+                <metadata_path>/var/lib/clickhouse/disks/custom_path</metadata_path>
             </s3>
             <unstable_s3>
                 <type>s3</type>

tests/integration/test_merge_tree_s3/test.py

@@ -1,3 +1,4 @@
+import ast
 import logging
 import os
 import time
@@ -1064,3 +1065,21 @@ def test_s3_disk_heavy_write_check_mem(cluster, broken_s3, node_name):
     assert int(result) > 0.8 * memory
 
     check_no_objects_after_drop(cluster, node_name=node_name)
+
+
+@pytest.mark.parametrize("node_name", ["node"])
+def test_metadata_path_works_correctly(cluster, node_name):
+    node = cluster.instances[node_name]
+    table = "s3_test_metadata_path"
+    create_table(node, table)
+
+    response = node.query(f"SELECT data_paths FROM system.tables WHERE name='{table}'")
+    data_paths = ast.literal_eval(response)
+    assert len(data_paths) >= 1, list
+
+    # Verifies that trailing slash is added correctly: https://github.com/ClickHouse/ClickHouse/issues/80647
+    found = False
+    for path in data_paths:
+        found = found or "/custom_path/" in path
+    assert found, data_paths
+    node.query(f"DROP TABLE IF EXISTS {table}")