Skip to content

Commit c7bd3d0

Browse files
doroolegdorooleg
authored
MEMBERNAME has been renamed to MEMBER_NAME (#9666) (#9827)
1 parent b87553f commit c7bd3d0

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

‎ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,12 +420,12 @@ class TLocalSessionsRegistry {
420420

421421
class TResourcePoolsCache {
422422
struct TClassifierInfo {
423-
const TString Membername;
423+
const TString MemberName;
424424
const TString PoolId;
425425
const i64 Rank;
426426

427427
TClassifierInfo(const NResourcePool::TClassifierSettings& classifierSettings)
428-
: Membername(classifierSettings.Membername)
428+
: MemberName(classifierSettings.MemberName)
429429
, PoolId(classifierSettings.ResourcePool)
430430
, Rank(classifierSettings.Rank)
431431
{}
@@ -593,7 +593,7 @@ class TResourcePoolsCache {
593593
TString poolId = "";
594594
i64 rank = -1;
595595
for (const auto& [_, classifier] : databaseInfo.RankToClassifierInfo) {
596-
if (classifier.Membername != userSID) {
596+
if (classifier.MemberName != userSID) {
597597
continue;
598598
}
599599

‎ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6612,7 +6612,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
66126612
checkDisabled(R"(
66136613
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
66146614
SET (RANK = 1, RESOURCE_POOL = "test"),
6615-
RESET (MEMBERNAME);
6615+
RESET (MEMBER_NAME);
66166616
)");
66176617

66186618
// DROP RESOURCE POOL CLASSIFIER
@@ -6646,7 +6646,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
66466646
const auto& alterSql = R"(
66476647
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
66486648
SET (RANK = 1, RESOURCE_POOL = "test"),
6649-
RESET (MEMBERNAME);
6649+
RESET (MEMBER_NAME);
66506650
)";
66516651

66526652
const auto& dropSql = "DROP RESOURCE POOL CLASSIFIER MyResourcePoolClassifier;";
@@ -6731,7 +6731,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
67316731
result = session.ExecuteSchemeQuery(TStringBuilder() << R"(
67326732
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
67336733
RESOURCE_POOL="test",
6734-
MEMBERNAME=")" << BUILTIN_ACL_METADATA << R"("
6734+
MEMBER_NAME=")" << BUILTIN_ACL_METADATA << R"("
67356735
);)").GetValueSync();
67366736
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
67376737
UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), TStringBuilder() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << BUILTIN_ACL_METADATA);
@@ -6777,7 +6777,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
67776777
result = session.ExecuteSchemeQuery(R"(
67786778
CREATE RESOURCE POOL CLASSIFIER ClassifierRankAuto WITH (
67796779
RESOURCE_POOL="test_pool",
6780-
MEMBERNAME="test@user"
6780+
MEMBER_NAME="test@user"
67816781
);)").GetValueSync();
67826782
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
67836783
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");
@@ -6825,21 +6825,21 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
68256825
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
68266826
RANK=20,
68276827
RESOURCE_POOL="test_pool",
6828-
MEMBERNAME="test@user"
6828+
MEMBER_NAME="test@user"
68296829
);)";
68306830
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
68316831
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
6832-
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
6832+
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
68336833

68346834
// Auto rank
68356835
query = R"(
68366836
CREATE RESOURCE POOL CLASSIFIER AnotherResourcePoolClassifier WITH (
68376837
RESOURCE_POOL="test_pool",
6838-
MEMBERNAME="another@user"
6838+
MEMBER_NAME="another@user"
68396839
);)";
68406840
result = session.ExecuteSchemeQuery(query).GetValueSync();
68416841
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
6842-
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\"}]}");
6842+
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\"}]}");
68436843
}
68446844

68456845
Y_UNIT_TEST(DoubleCreateResourcePoolClassifier) {
@@ -6902,11 +6902,11 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
69026902
{
69036903
auto query = R"(
69046904
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
6905-
SET (MEMBERNAME = "test@user")
6905+
SET (MEMBER_NAME = "test@user")
69066906
)";
69076907
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
69086908
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
6909-
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
6909+
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
69106910
}
69116911

69126912
// Create another pool
@@ -6918,18 +6918,18 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
69186918
);)";
69196919
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
69206920
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
6921-
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\"}]}");
6921+
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\"}]}");
69226922
}
69236923

69246924
// Test reset
69256925
{
69266926
auto query = R"(
69276927
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
6928-
RESET (RANK, MEMBERNAME);
6928+
RESET (RANK, MEMBER_NAME);
69296929
)";
69306930
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
69316931
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
6932-
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\"}]}");
6932+
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\"}]}");
69336933
}
69346934
}
69356935

@@ -6947,7 +6947,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
69476947
auto query = R"(
69486948
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
69496949
SET (RESOURCE_POOL = "test", RANK = 100),
6950-
RESET (MEMBERNAME);
6950+
RESET (MEMBER_NAME);
69516951
)";
69526952
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
69536953
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());

‎ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
284284
);
285285
CREATE RESOURCE POOL CLASSIFIER MyPoolClassifier WITH (
286286
RESOURCE_POOL="MyPool",
287-
MEMBERNAME=")" << userSID << R"("
287+
MEMBER_NAME=")" << userSID << R"("
288288
);
289289
GRANT ALL ON `/Root` TO `)" << userSID << R"(`;
290290
)";

‎ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) {
623623
);
624624
CREATE RESOURCE POOL CLASSIFIER )" << classifierId << R"( WITH (
625625
RESOURCE_POOL=")" << poolId << R"(",
626-
MEMBERNAME=")" << userSID << R"("
626+
MEMBER_NAME=")" << userSID << R"("
627627
);
628628
)");
629629
}
@@ -726,7 +726,7 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) {
726726
CREATE RESOURCE POOL CLASSIFIER )" << classifierId << R"( WITH (
727727
RANK="1",
728728
RESOURCE_POOL=")" << NResourcePool::DEFAULT_POOL_ID << R"(",
729-
MEMBERNAME=")" << settings.UserSID_ << R"("
729+
MEMBER_NAME=")" << settings.UserSID_ << R"("
730730
);
731731
)");
732732

@@ -766,12 +766,12 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifiersDdl) {
766766
);
767767
CREATE RESOURCE POOL CLASSIFIER first_classifier WITH (
768768
RESOURCE_POOL=")" << poolId << R"(",
769-
MEMBERNAME=")" << firstSID << R"(",
769+
MEMBER_NAME=")" << firstSID << R"(",
770770
RANK=1
771771
);
772772
CREATE RESOURCE POOL CLASSIFIER second_classifier WITH (
773773
RESOURCE_POOL=")" << NResourcePool::DEFAULT_POOL_ID << R"(",
774-
MEMBERNAME=")" << secondSID << R"(",
774+
MEMBER_NAME=")" << secondSID << R"(",
775775
RANK=2
776776
);
777777
)");

‎ydb/core/resource_pools/resource_pool_classifier_settings.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ std::unordered_map<TString, TClassifierSettings::TProperty> TClassifierSettings:
3434
std::unordered_map<TString, TProperty> properties = {
3535
{"rank", &Rank},
3636
{"resource_pool", &ResourcePool},
37-
{"membername", &Membername}
37+
{"member_name", &MemberName}
3838
};
3939
return properties;
4040
}
4141

4242
void TClassifierSettings::Validate() const {
43-
NACLib::TUserToken token(Membername, TVector<NACLib::TSID>{});
43+
NACLib::TUserToken token(MemberName, TVector<NACLib::TSID>{});
4444
if (token.IsSystemUser()) {
45-
throw yexception() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << Membername;
45+
throw yexception() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << MemberName;
4646
}
4747
}
4848

‎ydb/core/resource_pools/resource_pool_classifier_settings.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct TClassifierSettings : public TSettingsBase {
3131

3232
i64 Rank = -1; // -1 = max rank + CLASSIFIER_RANK_OFFSET
3333
TString ResourcePool = DEFAULT_POOL_ID;
34-
TString Membername = "";
34+
TString MemberName = "";
3535
};
3636

3737
} // namespace NKikimr::NResourcePool

‎ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifierTest) {
3333
std::visit(TClassifierSettings::TParser{"test_pool"}, propertiesMap["resource_pool"]);
3434
UNIT_ASSERT_VALUES_EQUAL(settings.ResourcePool, "test_pool");
3535

36-
std::visit(TClassifierSettings::TParser{"test@user"}, propertiesMap["membername"]);
37-
UNIT_ASSERT_VALUES_EQUAL(settings.Membername, "test@user");
36+
std::visit(TClassifierSettings::TParser{"test@user"}, propertiesMap["member_name"]);
37+
UNIT_ASSERT_VALUES_EQUAL(settings.MemberName, "test@user");
3838
}
3939

4040
Y_UNIT_TEST(SettingsExtracting) {
4141
TClassifierSettings settings;
4242
settings.Rank = 123;
4343
settings.ResourcePool = "test_pool";
44-
settings.Membername = "test@user";
44+
settings.MemberName = "test@user";
4545
auto propertiesMap = settings.GetPropertiesMap();
4646

4747
TClassifierSettings::TExtractor extractor;
4848
UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["rank"]), "123");
4949
UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["resource_pool"]), "test_pool");
50-
UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["membername"]), "test@user");
50+
UNIT_ASSERT_VALUES_EQUAL(std::visit(extractor, propertiesMap["member_name"]), "test@user");
5151
}
5252

5353
Y_UNIT_TEST(SettingsValidation) {
5454
TClassifierSettings settings;
55-
settings.Membername = BUILTIN_ACL_METADATA;
56-
UNIT_ASSERT_EXCEPTION_CONTAINS(settings.Validate(), yexception, TStringBuilder() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << settings.Membername);
55+
settings.MemberName = BUILTIN_ACL_METADATA;
56+
UNIT_ASSERT_EXCEPTION_CONTAINS(settings.Validate(), yexception, TStringBuilder() << "Invalid resource pool classifier configuration, cannot create classifier for system user " << settings.MemberName);
5757
}
5858
}
5959

‎ydb/library/yql/sql/v1/sql_ut.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6949,14 +6949,14 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) {
69496949
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
69506950
RANK=20,
69516951
RESOURCE_POOL='wgUserQueries',
6952-
MEMBERNAME='yandex_query@abc'
6952+
MEMBER_NAME='yandex_query@abc'
69536953
);
69546954
)sql");
69556955
UNIT_ASSERT_C(res.Root, res.Issues.ToString());
69566956

69576957
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
69586958
if (word == "Write") {
6959-
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"membername" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#");
6959+
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"member_name" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#");
69606960
UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("createObject"));
69616961
}
69626962
};
@@ -6986,15 +6986,15 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) {
69866986
NYql::TAstParseResult res = SqlToYql(R"sql(
69876987
USE plato;
69886988
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
6989-
SET (RANK = 30, Weight = 5, MEMBERNAME = "test@user"),
6989+
SET (RANK = 30, Weight = 5, MEMBER_NAME = "test@user"),
69906990
RESET (Resource_Pool);
69916991
)sql");
69926992
UNIT_ASSERT_C(res.Root, res.Issues.ToString());
69936993

69946994
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
69956995
if (word == "Write") {
69966996
UNIT_ASSERT_STRING_CONTAINS(line, R"#(('mode 'alterObject))#");
6997-
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"membername" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#");
6997+
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"member_name" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#");
69986998
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('resetFeatures '('"resource_pool")))#");
69996999
}
70007000
};

0 commit comments

Comments
 (0)