From 7137ddb70cecf089eebb12a31fbea1ba04f67899 Mon Sep 17 00:00:00 2001 From: Oleg Doronin Date: Tue, 24 Sep 2024 00:12:50 +0000 Subject: [PATCH 1/3] MEMBERNAME has been renamed to MEMBER_NAME --- .../proxy_service/kqp_proxy_service_impl.h | 2 +- ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp | 28 +++++++++---------- ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp | 2 +- .../ut/kqp_workload_service_ut.cpp | 8 +++--- .../resource_pool_classifier_settings.cpp | 6 ++-- .../resource_pool_classifier_settings.h | 2 +- .../resource_pool_classifier_settings_ut.cpp | 8 +++--- ydb/library/yql/sql/v1/sql_ut.cpp | 8 +++--- ydb/library/yql/sql/v1/sql_ut_antlr4.cpp | 8 +++--- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h b/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h index b55c8e67d2e5..edd542bb06a2 100644 --- a/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h +++ b/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h @@ -425,7 +425,7 @@ class TResourcePoolsCache { const i64 Rank; TClassifierInfo(const NResourcePool::TClassifierSettings& classifierSettings) - : Membername(classifierSettings.Membername) + : Membername(classifierSettings.MemberName) , PoolId(classifierSettings.ResourcePool) , Rank(classifierSettings.Rank) {} diff --git a/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp index ec81be006de5..c4af0c0931a0 100644 --- a/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp +++ b/ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp @@ -6938,7 +6938,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) { checkDisabled(R"( ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier SET (RANK = 1, RESOURCE_POOL = "test"), - RESET (MEMBERNAME); + RESET (MEMBER_NAME); )"); // DROP RESOURCE POOL CLASSIFIER @@ -6972,7 +6972,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) { const auto& alterSql = R"( ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier SET (RANK = 1, RESOURCE_POOL = "test"), - RESET (MEMBERNAME); + RESET (MEMBER_NAME); )"; const auto& dropSql = "DROP RESOURCE POOL CLASSIFIER MyResourcePoolClassifier;"; @@ -7057,7 +7057,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) { result = session.ExecuteSchemeQuery(TStringBuilder() << R"( CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH ( RESOURCE_POOL="test", - MEMBERNAME=")" << BUILTIN_ACL_METADATA << R"(" + MEMBER_NAME=")" << BUILTIN_ACL_METADATA << R"(" );)").GetValueSync(); UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR); UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), TStringBuilder() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << BUILTIN_ACL_METADATA); @@ -7103,7 +7103,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) { result = session.ExecuteSchemeQuery(R"( CREATE RESOURCE POOL CLASSIFIER ClassifierRankAuto WITH ( RESOURCE_POOL="test_pool", - MEMBERNAME="test@user" + MEMBER_NAME="test@user" );)").GetValueSync(); UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR); UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), "The rank could not be set automatically, the maximum rank of the resource pool classifier is too high: 9223372036854775807"); @@ -7151,21 +7151,21 @@ Y_UNIT_TEST_SUITE(KqpScheme) { CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH ( RANK=20, RESOURCE_POOL="test_pool", - MEMBERNAME="test@user" + MEMBER_NAME="test@user" );)"; auto result = session.ExecuteSchemeQuery(query).GetValueSync(); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); - UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); + UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); // Auto rank query = R"( CREATE RESOURCE POOL CLASSIFIER AnotherResourcePoolClassifier WITH ( RESOURCE_POOL="test_pool", - MEMBERNAME="another@user" + MEMBER_NAME="another@user" );)"; result = session.ExecuteSchemeQuery(query).GetValueSync(); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); - UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"},{\"rank\":1020,\"name\":\"AnotherResourcePoolClassifier\",\"config\":{\"membername\":\"another@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); + UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"},{\"rank\":1020,\"name\":\"AnotherResourcePoolClassifier\",\"config\":{\"member_name\":\"another@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); } Y_UNIT_TEST(DoubleCreateResourcePoolClassifier) { @@ -7228,11 +7228,11 @@ Y_UNIT_TEST_SUITE(KqpScheme) { { auto query = R"( ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier - SET (MEMBERNAME = "test@user") + SET (MEMBER_NAME = "test@user") )"; auto result = session.ExecuteSchemeQuery(query).GetValueSync(); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); - UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); + UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); } // Create another pool @@ -7244,18 +7244,18 @@ Y_UNIT_TEST_SUITE(KqpScheme) { );)"; auto result = session.ExecuteSchemeQuery(query).GetValueSync(); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); - UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"},{\"rank\":42,\"name\":\"AnotherResourcePoolClassifier\",\"config\":{\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); + UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"},{\"rank\":42,\"name\":\"AnotherResourcePoolClassifier\",\"config\":{\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); } // Test reset { auto query = R"( ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier - RESET (RANK, MEMBERNAME); + RESET (RANK, MEMBER_NAME); )"; auto result = session.ExecuteSchemeQuery(query).GetValueSync(); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString()); - UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":1042,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"},{\"rank\":42,\"name\":\"AnotherResourcePoolClassifier\",\"config\":{\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); + UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":1042,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"},{\"rank\":42,\"name\":\"AnotherResourcePoolClassifier\",\"config\":{\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}"); } } @@ -7273,7 +7273,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) { auto query = R"( ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier SET (RESOURCE_POOL = "test", RANK = 100), - RESET (MEMBERNAME); + RESET (MEMBER_NAME); )"; auto result = session.ExecuteSchemeQuery(query).GetValueSync(); UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString()); diff --git a/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp b/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp index cfb632aad18f..b80a0d21decb 100644 --- a/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp +++ b/ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp @@ -284,7 +284,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) { ); CREATE RESOURCE POOL CLASSIFIER MyPoolClassifier WITH ( RESOURCE_POOL="MyPool", - MEMBERNAME=")" << userSID << R"(" + MEMBER_NAME=")" << userSID << R"(" ); GRANT ALL ON `/Root` TO `)" << userSID << R"(`; )"; diff --git a/ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp b/ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp index cad50ad143da..1813f8b41500 100644 --- a/ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp +++ b/ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp @@ -623,7 +623,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) { ); CREATE RESOURCE POOL CLASSIFIER )" << classifierId << R"( WITH ( RESOURCE_POOL=")" << poolId << R"(", - MEMBERNAME=")" << userSID << R"(" + MEMBER_NAME=")" << userSID << R"(" ); )"); } @@ -726,7 +726,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) { CREATE RESOURCE POOL CLASSIFIER )" << classifierId << R"( WITH ( RANK="1", RESOURCE_POOL=")" << NResourcePool::DEFAULT_POOL_ID << R"(", - MEMBERNAME=")" << settings.UserSID_ << R"(" + MEMBER_NAME=")" << settings.UserSID_ << R"(" ); )"); @@ -766,12 +766,12 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) { ); CREATE RESOURCE POOL CLASSIFIER first_classifier WITH ( RESOURCE_POOL=")" << poolId << R"(", - MEMBERNAME=")" << firstSID << R"(", + MEMBER_NAME=")" << firstSID << R"(", RANK=1 ); CREATE RESOURCE POOL CLASSIFIER second_classifier WITH ( RESOURCE_POOL=")" << NResourcePool::DEFAULT_POOL_ID << R"(", - MEMBERNAME=")" << secondSID << R"(", + MEMBER_NAME=")" << secondSID << R"(", RANK=2 ); )"); diff --git a/ydb/core/resource_pools/resource_pool_classifier_settings.cpp b/ydb/core/resource_pools/resource_pool_classifier_settings.cpp index 34ce0e30e0ed..fe2c7586d9a0 100644 --- a/ydb/core/resource_pools/resource_pool_classifier_settings.cpp +++ b/ydb/core/resource_pools/resource_pool_classifier_settings.cpp @@ -34,15 +34,15 @@ std::unordered_map TClassifierSettings: std::unordered_map properties = { {"rank", &Rank}, {"resource_pool", &ResourcePool}, - {"membername", &Membername} + {"member_name", &MemberName} }; return properties; } void TClassifierSettings::Validate() const { - NACLib::TUserToken token(Membername, TVector{}); + NACLib::TUserToken token(MemberName, TVector{}); if (token.IsSystemUser()) { - throw yexception() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << Membername; + throw yexception() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << MemberName; } } diff --git a/ydb/core/resource_pools/resource_pool_classifier_settings.h b/ydb/core/resource_pools/resource_pool_classifier_settings.h index 2decfc1a581a..3e1311d9ac8c 100644 --- a/ydb/core/resource_pools/resource_pool_classifier_settings.h +++ b/ydb/core/resource_pools/resource_pool_classifier_settings.h @@ -31,7 +31,7 @@ struct TClassifierSettings : public TSettingsBase { i64 Rank = -1; // -1 = max rank + CLASSIFIER_RANK_OFFSET TString ResourcePool = DEFAULT_POOL_ID; - TString Membername = ""; + TString MemberName = ""; }; } // namespace NKikimr::NResourcePool diff --git a/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp b/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp index a91933a96603..97949a982893 100644 --- a/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp +++ b/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp @@ -33,21 +33,21 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifierTest) { std::visit(TClassifierSettings::TParser{"test_pool"}, propertiesMap["resource_pool"]); UNIT_ASSERT_VALUES_EQUAL(settings.ResourcePool, "test_pool"); - std::visit(TClassifierSettings::TParser{"test@user"}, propertiesMap["membername"]); - UNIT_ASSERT_VALUES_EQUAL(settings.Membername, "test@user"); + std::visit(TClassifierSettings::TParser{"test@user"}, propertiesMap["member_name"]); + UNIT_ASSERT_VALUES_EQUAL(settings.MemberName, "test@user"); } Y_UNIT_TEST(SettingsExtracting) { TClassifierSettings settings; settings.Rank = 123; settings.ResourcePool = "test_pool"; - settings.Membername = "test@user"; + settings.MemberName = "test@user"; auto propertiesMap = settings.GetPropertiesMap(); TClassifierSettings::TExtractor extractor; UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["rank"]), "123"); UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["resource_pool"]), "test_pool"); - UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["membername"]), "test@user"); + UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["member_name"]), "test@user"); } Y_UNIT_TEST(SettingsValidation) { diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp index 515f54273201..a4bb92f7840e 100644 --- a/ydb/library/yql/sql/v1/sql_ut.cpp +++ b/ydb/library/yql/sql/v1/sql_ut.cpp @@ -7206,14 +7206,14 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) { CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH ( RANK=20, RESOURCE_POOL='wgUserQueries', - MEMBERNAME='yandex_query@abc' + MEMBER_NAME='yandex_query@abc' ); )sql"); UNIT_ASSERT_C(res.Root, res.Issues.ToString()); TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { if (word == "Write") { - UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"membername" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#"); + UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"member_name" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#"); UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("createObject")); } }; @@ -7243,7 +7243,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) { NYql::TAstParseResult res = SqlToYql(R"sql( USE plato; ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier - SET (RANK = 30, Weight = 5, MEMBERNAME = "test@user"), + SET (RANK = 30, Weight = 5, MEMBER_NAME = "test@user"), RESET (Resource_Pool); )sql"); UNIT_ASSERT_C(res.Root, res.Issues.ToString()); @@ -7251,7 +7251,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) { TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { if (word == "Write") { UNIT_ASSERT_STRING_CONTAINS(line, R"#(('mode 'alterObject))#"); - UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"membername" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#"); + UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"member_name" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#"); UNIT_ASSERT_STRING_CONTAINS(line, R"#('('resetFeatures '('"resource_pool")))#"); } }; diff --git a/ydb/library/yql/sql/v1/sql_ut_antlr4.cpp b/ydb/library/yql/sql/v1/sql_ut_antlr4.cpp index 8b9154edd480..e92d157c06bf 100644 --- a/ydb/library/yql/sql/v1/sql_ut_antlr4.cpp +++ b/ydb/library/yql/sql/v1/sql_ut_antlr4.cpp @@ -7203,14 +7203,14 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) { CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH ( RANK=20, RESOURCE_POOL='wgUserQueries', - MEMBERNAME='yandex_query@abc' + MEMBER_NAME='yandex_query@abc' ); )sql"); UNIT_ASSERT_C(res.Root, res.Issues.ToString()); TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { if (word == "Write") { - UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"membername" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#"); + UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"member_name" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#"); UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("createObject")); } }; @@ -7240,7 +7240,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) { NYql::TAstParseResult res = SqlToYql(R"sql( USE plato; ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier - SET (RANK = 30, Weight = 5, MEMBERNAME = "test@user"), + SET (RANK = 30, Weight = 5, MEMBER_NAME = "test@user"), RESET (Resource_Pool); )sql"); UNIT_ASSERT_C(res.Root, res.Issues.ToString()); @@ -7248,7 +7248,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) { TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { if (word == "Write") { UNIT_ASSERT_STRING_CONTAINS(line, R"#(('mode 'alterObject))#"); - UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"membername" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#"); + UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"member_name" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#"); UNIT_ASSERT_STRING_CONTAINS(line, R"#('('resetFeatures '('"resource_pool")))#"); } }; From c3bf4b66cfd4470b0713ed032b7eaa3ee11876a4 Mon Sep 17 00:00:00 2001 From: Oleg Doronin Date: Tue, 24 Sep 2024 06:25:16 +0000 Subject: [PATCH 2/3] build has been fixed --- .../resource_pools/resource_pool_classifier_settings_ut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp b/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp index 97949a982893..fb9b15bd6872 100644 --- a/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp +++ b/ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp @@ -52,8 +52,8 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifierTest) { Y_UNIT_TEST(SettingsValidation) { TClassifierSettings settings; - settings.Membername = BUILTIN_ACL_METADATA; - UNIT_ASSERT_EXCEPTION_CONTAINS(settings.Validate(), yexception, TStringBuilder() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << settings.Membername); + settings.MemberName = BUILTIN_ACL_METADATA; + UNIT_ASSERT_EXCEPTION_CONTAINS(settings.Validate(), yexception, TStringBuilder() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << settings.MemberName); } } From 7fa63ba29e114bbfc8331adf13d9ced908ffe20c Mon Sep 17 00:00:00 2001 From: Oleg Doronin Date: Tue, 24 Sep 2024 17:13:42 +0000 Subject: [PATCH 3/3] small cleanup --- ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h b/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h index edd542bb06a2..d10289009104 100644 --- a/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h +++ b/ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h @@ -420,12 +420,12 @@ class TLocalSessionsRegistry { class TResourcePoolsCache { struct TClassifierInfo { - const TString Membername; + const TString MemberName; const TString PoolId; const i64 Rank; TClassifierInfo(const NResourcePool::TClassifierSettings& classifierSettings) - : Membername(classifierSettings.MemberName) + : MemberName(classifierSettings.MemberName) , PoolId(classifierSettings.ResourcePool) , Rank(classifierSettings.Rank) {} @@ -593,7 +593,7 @@ class TResourcePoolsCache { TString poolId = ""; i64 rank = -1; for (const auto& [_, classifier] : databaseInfo.RankToClassifierInfo) { - if (classifier.Membername != userSID) { + if (classifier.MemberName != userSID) { continue; }