YDB FQ: distinguish dedicated and serverless YDBs via storageConfig…

… section (#6703)
ydb-platform · Jul 15, 2024 · e1cde29 · e1cde29
1 parent a240aa7
commit e1cde29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ydb/core/fq/libs/actors/database_resolver.cpp b/ydb/core/fq/libs/actors/database_resolver.cpp
@@ -319,7 +319,7 @@ class TDatabaseResolver: public TActor<TDatabaseResolver>
             // There are two kinds of managed YDBs: serverless and dedicated.
             // While working with dedicated databases, we have to use underlay network.
             // That's why we add `u-` prefix to database fqdn.
-            if (databaseInfo.GetMap().contains("dedicatedDatabase")) {
+            if (databaseInfo.GetMap().contains("storageConfig")) {
                 endpoint = "u-" + endpoint;
                 host = "u-" + host;
             }
@@ -335,7 +335,7 @@ class TDatabaseResolver: public TActor<TDatabaseResolver>
         {
             auto ret = ydbParser(databaseInfo, mdbEndpointGenerator, useTls, protocol);
             // TODO: Take explicit field from MVP
-            bool isDedicatedDb  = databaseInfo.GetMap().contains("dedicatedDatabase");
+            bool isDedicatedDb  = databaseInfo.GetMap().contains("storageConfig");
             if (!isDedicatedDb && ret.Endpoint.StartsWith("ydb.")) {
                 // Replace "ydb." -> "yds."
                 ret.Endpoint[2] = 's';

diff --git a/ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp b/ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp
@@ -243,7 +243,7 @@ Y_UNIT_TEST_SUITE(TDatabaseResolverTests) {
             R"(
                 {
                     "endpoint":"grpcs://lb.etnbrtlini51k7cinbdr.ydb.mdb.yandexcloud.net:2135/?database=/ru-central1/b1gtl2kg13him37quoo6/etn021us5r9rhld1vgbh", 
-                    "dedicatedDatabase":{"resuorcePresetId": "medium"}
+                    "storageConfig":{"storageSizeLimit":107374182400}
                 })",
             NYql::TDatabaseResolverResponse::TDatabaseDescription{
                 TString{"u-lb.etnbrtlini51k7cinbdr.ydb.mdb.yandexcloud.net:2135"},
@@ -286,7 +286,7 @@ Y_UNIT_TEST_SUITE(TDatabaseResolverTests) {
             R"(
                 {
                     "endpoint":"grpcs://lb.etn021us5r9rhld1vgbh.ydb.mdb.yandexcloud.net:2135/?database=/ru-central1/b1g7jdjqd07qg43c4fmp/etn021us5r9rhld1vgbh",
-                    "dedicatedDatabase":{"resourcePresetId": "medium"}
+                    "storageConfig":{"storageSizeLimit":107374182400}
                 })",
             NYql::TDatabaseResolverResponse::TDatabaseDescription{
                 TString{"u-lb.etn021us5r9rhld1vgbh.ydb.mdb.yandexcloud.net:2135"},