Merge pull request ClickHouse#88383 from ClickHouse/local-start-from-server-directory

Allow clickhouse-local to start from the clickhouse-server directory.

Author: alexey-milovidov

programs/local/LocalServer.cpp

@@ -312,7 +312,13 @@ static DatabasePtr createClickHouseLocalDatabaseOverlay(const String & name_, Co
 
     fs::path existing_path_symlink = fs::weakly_canonical(context->getPath()) / "metadata" / "default";
     if (FS::isSymlinkNoThrow(existing_path_symlink))
-        default_database_uuid = parse<UUID>(FS::readSymlink(existing_path_symlink).filename());
+    {
+        auto symlink_path = FS::readSymlink(existing_path_symlink);
+        /// If symlink ends with '/':
+        if (!symlink_path.has_filename() && symlink_path.has_parent_path())
+            symlink_path = symlink_path.parent_path();
+        default_database_uuid = parse<UUID>(symlink_path.filename());
+    }
     else
         default_database_uuid = UUIDHelpers::generateV4();
 

src/QueryPipeline/RemoteQueryExecutor.h

@@ -31,7 +31,6 @@ class RemoteQueryExecutorReadContext;
 
 class ParallelReplicasReadingCoordinator;
 
-/// This is the same type as StorageS3Source::IteratorWrapper
 using TaskIterator = std::function<ClusterFunctionReadTaskResponsePtr(size_t)>;
 
 /// This class allows one to launch queries on remote replicas of one shard and get results

tests/queries/0_stateless/03661_local_can_start_with_server_directory.reference

@@ -0,0 +1,4 @@
+Starting clickhouse-server
+Waiting for clickhouse-server to start
+1
+1

tests/queries/0_stateless/03661_local_can_start_with_server_directory.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CLICKHOUSE_PORT_TCP=50111
+CLICKHOUSE_DATABASE=default
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+echo "Starting clickhouse-server"
+
+$CLICKHOUSE_BINARY server -- --tcp_port "$CLICKHOUSE_PORT_TCP" --path "${CLICKHOUSE_TMP}/" > "${CLICKHOUSE_TMP}/server.log" 2>&1 &
+PID=$!
+
+echo "Waiting for clickhouse-server to start"
+
+for i in {1..30}; do
+    sleep 1
+    $CLICKHOUSE_CLIENT --query "SELECT 1" 2>/dev/null && break
+    if [[ $i == 30 ]]; then
+        cat "${CLICKHOUSE_TMP}/server.log"
+        exit 1
+    fi
+done
+
+# Make sure the directory for the default database is created:
+$CLICKHOUSE_CLIENT --query "CREATE TABLE test (x UInt8) ORDER BY ()"
+
+kill $PID
+wait
+
+$CLICKHOUSE_LOCAL --path "${CLICKHOUSE_TMP}/" --query "
+    SELECT uuid = '$(basename $(readlink ${CLICKHOUSE_TMP}/metadata/default))' FROM system.databases WHERE name = 'default'
+" || cat "${CLICKHOUSE_TMP}/server.log"