Merge 2bcc7af into 32ef7a0

Author: skywalker-jpg

ydb/core/fq/libs/actors/database_resolver.cpp

@@ -419,6 +419,42 @@ class TDatabaseResolver: public TActor<TDatabaseResolver>
 
             endpoint = mdbEndpointGenerator->ToEndpoint(params);
 
+            return TDatabaseDescription{"", endpoint.first, endpoint.second, "", useTls};
+        };
+        Parsers[NYql::EDatabaseType::Greenplum] = [](
+            NJson::TJsonValue& databaseInfo,
+            const NYql::IMdbEndpointGenerator::TPtr& mdbEndpointGenerator,
+            bool useTls,
+            NConnector::NApi::EProtocol protocol) {
+            NYql::IMdbEndpointGenerator::TEndpoint endpoint;
+            TString aliveHost;
+
+            for (const auto& host : databaseInfo.GetMap().at("hosts").GetArraySafe()) {
+                const auto& hostMap = host.GetMap();
+
+                if (hostMap.at("health").GetString() != "ALIVE" || hostMap.at("type").GetString() != "MASTER") {
+                    // Host is not alive or not master, skip it
+                    continue;
+                }
+
+                // If the host is alive, add it to the list of alive hosts
+                aliveHost = hostMap.at("name").GetString();
+                break;
+            }
+
+            if (aliveHost == "") {
+                ythrow TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "No ALIVE Greenplum hosts found";
+            }
+
+            NYql::IMdbEndpointGenerator::TParams params = {
+                .DatabaseType = NYql::EDatabaseType::Greenplum,
+                .MdbHost = aliveHost,
+                .UseTls = useTls,
+                .Protocol = protocol,
+            };
+
+            endpoint = mdbEndpointGenerator->ToEndpoint(params);
+
             return TDatabaseDescription{"", endpoint.first, endpoint.second, "", useTls};
         };
     }

ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp

@@ -474,6 +474,38 @@ Y_UNIT_TEST_SUITE(TDatabaseResolverTests) {
                 issues
             );
     }
+    Y_UNIT_TEST(Greenplum_MasterNode) {
+        Test(
+            NYql::EDatabaseType::Greenplum,
+            NYql::NConnector::NApi::EProtocol::NATIVE,
+            "https://mdb.api.cloud.yandex.net:443/managed-greenplum/v1/clusters/etn021us5r9rhld1vgbh/master-hosts",
+            "200",
+            R"({
+                "hosts": [
+                {
+                 "resources": {
+                 "resourcePresetId": "s3-c8-m32",
+                 "diskSize": "395136991232",
+                "diskTypeId": "local-ssd"
+                },
+                "assignPublicIp": false,
+                "name": "rc1d-51jc89m9q72vcdkn.mdb.yandexcloud.net",
+                "clusterId": "c9qfrvbs21vo0a56s5hm",
+                "zoneId": "ru-central1-d",
+                "type": "MASTER",
+                "health": "ALIVE",
+                "subnetId": "fl8vtt2td9qbtlqdj5ji"
+                }
+                ]
+            })",
+        NYql::TDatabaseResolverResponse::TDatabaseDescription{
+            TString{""},
+                    TString{"rc1d-51jc89m9q72vcdkn.db.yandex.net"},
+                    6432,
+                    TString(""),
+                    true},
+                {});
+        }
 
     Y_UNIT_TEST(DataStreams_PermissionDenied) {
         NYql::TIssues issues{

ydb/core/fq/libs/db_id_async_resolver_impl/mdb_endpoint_generator.cpp

@@ -16,6 +16,8 @@ namespace NFq {
     // Managed PostgreSQL provides the only port both for secure and insecure connections
     constexpr ui32 POSTGRESQL_PORT = 6432;
 
+    constexpr ui32 GREENPLUM_PORT = 6432;
+
     // TMdbEndpointGeneratorLegacy implements behavior required by YQL legacy ClickHouse provider
     class TMdbEndpointGeneratorLegacy: public NYql::IMdbEndpointGenerator {
         TEndpoint ToEndpoint(const NYql::IMdbEndpointGenerator::TParams& params) const override {
@@ -71,7 +73,15 @@ namespace NFq {
                         case NYql::NConnector::NApi::EProtocol::NATIVE:
                             return TEndpoint(fixedHost, POSTGRESQL_PORT);
                         default:
-                            ythrow yexception() << "Unexpected protocol for PostgreSQL: " << NYql::NConnector::NApi::EProtocol_Name(params.Protocol);
+                            ythrow yexception() << "Unexpected protocol for PostgreSQL " << NYql::NConnector::NApi::EProtocol_Name(params.Protocol);
+                    }
+                case NYql::EDatabaseType::Greenplum:
+                    // https://cloud.yandex.ru/docs/managed-postgresql/operations/connect
+                    switch (params.Protocol) {
+                        case NYql::NConnector::NApi::EProtocol::NATIVE:
+                            return TEndpoint(fixedHost, GREENPLUM_PORT);
+                        default:
+                            ythrow yexception() << "Unexpected protocol for Greenplum: " << NYql::NConnector::NApi::EProtocol_Name(params.Protocol);
                     }
                 default:
                     ythrow yexception() << "Unexpected database type: " << ToString(params.DatabaseType);