compute id has been supported (#9556)

2 files changed, 3 insertions, 1 deletions

diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
index f5abb10cfb..60ed347d82 100644
--- a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
+++ b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
@@ -289,7 +289,7 @@ public:
     void FillRequest(TEvYdbCompute::TEvCreateDatabaseRequest::TPtr& ev, const NConfig::TComputeDatabaseConfig& config) {
         NYdb::NFq::TScope scope(ev.Get()->Get()->Scope);
         ev.Get()->Get()->BasePath = config.GetControlPlaneConnection().GetDatabase();
-        const TString databaseName = Config.GetYdb().GetControlPlane().GetDatabasePrefix() + scope.ParseFolder();
+        const TString databaseName = TStringBuilder{} << Config.GetYdb().GetControlPlane().GetDatabasePrefix() << (config.GetId() ? config.GetId() + "_"  : TString{}) << scope.ParseFolder();
         ev.Get()->Get()->Path = config.GetTenant() ? config.GetTenant() + "/" + databaseName: databaseName;
     }
 
diff --git a/ydb/core/fq/libs/config/protos/compute.proto b/ydb/core/fq/libs/config/protos/compute.proto
index d8b0d1022f..7ce620b59e 100644
--- a/ydb/core/fq/libs/config/protos/compute.proto
+++ b/ydb/core/fq/libs/config/protos/compute.proto
@@ -43,6 +43,7 @@ message TWorkloadManagerConfig {
 }
 
 message TComputeDatabaseConfig {
+    string Id = 7;
     TYdbStorageConfig ControlPlaneConnection = 1;
     TYdbStorageConfig SchemeConnection = 6;
     TYdbStorageConfig ExecutionConnection = 3;
@@ -58,6 +59,7 @@ message TDatabaseMapping {
 
 message TYdbComputeControlPlane {
     message TSingle {
+        string Id = 3;
         TYdbStorageConfig Connection = 1;
         TWorkloadManagerConfig WorkloadManagerConfig = 2;
     }