Skip to content

Commit 006631d

Browse files
doroolegdorooleg
authored
Merge 7fa63ba into 5807f62 
2 parents 5807f62 + 7fa63ba commit 006631d

9 files changed

+40
-40
lines changed

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

+3-3
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

+14-14
Original file line numberDiff line numberDiff line change
@@ -6938,7 +6938,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
69386938
checkDisabled(R"(
69396939
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
69406940
SET (RANK = 1, RESOURCE_POOL = "test"),
6941-
RESET (MEMBERNAME);
6941+
RESET (MEMBER_NAME);
69426942
)");
69436943

69446944
// DROP RESOURCE POOL CLASSIFIER
@@ -6972,7 +6972,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
69726972
const auto& alterSql = R"(
69736973
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
69746974
SET (RANK = 1, RESOURCE_POOL = "test"),
6975-
RESET (MEMBERNAME);
6975+
RESET (MEMBER_NAME);
69766976
)";
69776977

69786978
const auto& dropSql = "DROP RESOURCE POOL CLASSIFIER MyResourcePoolClassifier;";
@@ -7057,7 +7057,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
70577057
result = session.ExecuteSchemeQuery(TStringBuilder() << R"(
70587058
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
70597059
RESOURCE_POOL="test",
7060-
MEMBERNAME=")" << BUILTIN_ACL_METADATA << R"("
7060+
MEMBER_NAME=")" << BUILTIN_ACL_METADATA << R"("
70617061
);)").GetValueSync();
70627062
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
70637063
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) {
71037103
result = session.ExecuteSchemeQuery(R"(
71047104
CREATE RESOURCE POOL CLASSIFIER ClassifierRankAuto WITH (
71057105
RESOURCE_POOL="test_pool",
7106-
MEMBERNAME="test@user"
7106+
MEMBER_NAME="test@user"
71077107
);)").GetValueSync();
71087108
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), EStatus::GENERIC_ERROR);
71097109
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) {
71517151
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
71527152
RANK=20,
71537153
RESOURCE_POOL="test_pool",
7154-
MEMBERNAME="test@user"
7154+
MEMBER_NAME="test@user"
71557155
);)";
71567156
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
71577157
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
7158-
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
7158+
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
71597159

71607160
// Auto rank
71617161
query = R"(
71627162
CREATE RESOURCE POOL CLASSIFIER AnotherResourcePoolClassifier WITH (
71637163
RESOURCE_POOL="test_pool",
7164-
MEMBERNAME="another@user"
7164+
MEMBER_NAME="another@user"
71657165
);)";
71667166
result = session.ExecuteSchemeQuery(query).GetValueSync();
71677167
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
7168-
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\"}]}");
7168+
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\"}]}");
71697169
}
71707170

71717171
Y_UNIT_TEST(DoubleCreateResourcePoolClassifier) {
@@ -7228,11 +7228,11 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
72287228
{
72297229
auto query = R"(
72307230
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
7231-
SET (MEMBERNAME = "test@user")
7231+
SET (MEMBER_NAME = "test@user")
72327232
)";
72337233
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
72347234
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
7235-
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"membername\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
7235+
UNIT_ASSERT_VALUES_EQUAL(FetchResourcePoolClassifiers(kikimr), "{\"resource_pool_classifiers\":[{\"rank\":20,\"name\":\"MyResourcePoolClassifier\",\"config\":{\"member_name\":\"test@user\",\"resource_pool\":\"test_pool\"},\"database\":\"\\/Root\"}]}");
72367236
}
72377237

72387238
// Create another pool
@@ -7244,18 +7244,18 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
72447244
);)";
72457245
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
72467246
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
7247-
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\"}]}");
7247+
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\"}]}");
72487248
}
72497249

72507250
// Test reset
72517251
{
72527252
auto query = R"(
72537253
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
7254-
RESET (RANK, MEMBERNAME);
7254+
RESET (RANK, MEMBER_NAME);
72557255
)";
72567256
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
72577257
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
7258-
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\"}]}");
7258+
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\"}]}");
72597259
}
72607260
}
72617261

@@ -7273,7 +7273,7 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
72737273
auto query = R"(
72747274
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
72757275
SET (RESOURCE_POOL = "test", RANK = 100),
7276-
RESET (MEMBERNAME);
7276+
RESET (MEMBER_NAME);
72777277
)";
72787278
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
72797279
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());

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

+1-1
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

+4-4
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

+3-3
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

+1-1
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

+6-6
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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7206,14 +7206,14 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) {
72067206
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
72077207
RANK=20,
72087208
RESOURCE_POOL='wgUserQueries',
7209-
MEMBERNAME='yandex_query@abc'
7209+
MEMBER_NAME='yandex_query@abc'
72107210
);
72117211
)sql");
72127212
UNIT_ASSERT_C(res.Root, res.Issues.ToString());
72137213

72147214
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
72157215
if (word == "Write") {
7216-
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"membername" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#");
7216+
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"member_name" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#");
72177217
UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("createObject"));
72187218
}
72197219
};
@@ -7243,15 +7243,15 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) {
72437243
NYql::TAstParseResult res = SqlToYql(R"sql(
72447244
USE plato;
72457245
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
7246-
SET (RANK = 30, Weight = 5, MEMBERNAME = "test@user"),
7246+
SET (RANK = 30, Weight = 5, MEMBER_NAME = "test@user"),
72477247
RESET (Resource_Pool);
72487248
)sql");
72497249
UNIT_ASSERT_C(res.Root, res.Issues.ToString());
72507250

72517251
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
72527252
if (word == "Write") {
72537253
UNIT_ASSERT_STRING_CONTAINS(line, R"#(('mode 'alterObject))#");
7254-
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"membername" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#");
7254+
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"member_name" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#");
72557255
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('resetFeatures '('"resource_pool")))#");
72567256
}
72577257
};

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -7203,14 +7203,14 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) {
72037203
CREATE RESOURCE POOL CLASSIFIER MyResourcePoolClassifier WITH (
72047204
RANK=20,
72057205
RESOURCE_POOL='wgUserQueries',
7206-
MEMBERNAME='yandex_query@abc'
7206+
MEMBER_NAME='yandex_query@abc'
72077207
);
72087208
)sql");
72097209
UNIT_ASSERT_C(res.Root, res.Issues.ToString());
72107210

72117211
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
72127212
if (word == "Write") {
7213-
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"membername" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#");
7213+
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('('"member_name" '"yandex_query@abc") '('"rank" (Int32 '"20")) '('"resource_pool" '"wgUserQueries"))#");
72147214
UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("createObject"));
72157215
}
72167216
};
@@ -7240,15 +7240,15 @@ Y_UNIT_TEST_SUITE(ResourcePoolClassifier) {
72407240
NYql::TAstParseResult res = SqlToYql(R"sql(
72417241
USE plato;
72427242
ALTER RESOURCE POOL CLASSIFIER MyResourcePoolClassifier
7243-
SET (RANK = 30, Weight = 5, MEMBERNAME = "test@user"),
7243+
SET (RANK = 30, Weight = 5, MEMBER_NAME = "test@user"),
72447244
RESET (Resource_Pool);
72457245
)sql");
72467246
UNIT_ASSERT_C(res.Root, res.Issues.ToString());
72477247

72487248
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
72497249
if (word == "Write") {
72507250
UNIT_ASSERT_STRING_CONTAINS(line, R"#(('mode 'alterObject))#");
7251-
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"membername" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#");
7251+
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('features '('('"member_name" '"test@user") '('"rank" (Int32 '"30")) '('"weight" (Int32 '"5")))))#");
72527252
UNIT_ASSERT_STRING_CONTAINS(line, R"#('('resetFeatures '('"resource_pool")))#");
72537253
}
72547254
};

0 commit comments

Comments
 (0)