Skip to content

Commit

Permalink
MEMBERNAME has been renamed to MEMBER_NAME (ydb-platform#9666) (ydb-p…
Browse files Browse the repository at this point in the history 
…latform#9827)
  • Loading branch information
@dorooleg
dorooleg authored Sep 27, 2024
1 parent b87553f commit c7bd3d0
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{}
Expand Down Expand Up @@ -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;
}

Expand Down
28 changes: 14 additions & 14 deletions ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6612,7 +6612,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
Expand Down Expand Up @@ -6646,7 +6646,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;";
Expand Down Expand Up @@ -6731,7 +6731,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);
Expand Down Expand Up @@ -6777,7 +6777,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");
Expand Down Expand Up @@ -6825,21 +6825,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) {
Expand Down Expand Up @@ -6902,11 +6902,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
Expand All @@ -6918,18 +6918,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\"}]}");
}
}

Expand All @@ -6947,7 +6947,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());
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"(`;
)";
Expand Down
8 changes: 4 additions & 4 deletions ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"("
);
)");
}
Expand Down Expand Up @@ -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"("
);
)");

Expand Down Expand Up @@ -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
);
)");
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/resource_pools/resource_pool_classifier_settings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ std::unordered_map<TString, TClassifierSettings::TProperty> TClassifierSettings:
std::unordered_map<TString, TProperty> properties = {
{"rank", &Rank},
{"resource_pool", &ResourcePool},
{"membername", &Membername}
{"member_name", &MemberName}
};
return properties;
}

void TClassifierSettings::Validate() const {
NACLib::TUserToken token(Membername, TVector<NACLib::TSID>{});
NACLib::TUserToken token(MemberName, TVector<NACLib::TSID>{});
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;
}
}

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/resource_pools/resource_pool_classifier_settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions ydb/core/resource_pools/resource_pool_classifier_settings_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,27 @@ 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) {
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);
}
}

Expand Down
8 changes: 4 additions & 4 deletions ydb/library/yql/sql/v1/sql_ut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6949,14 +6949,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"));
}
};
Expand Down Expand Up @@ -6986,15 +6986,15 @@ 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());

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")))#");
}
};
Expand Down

0 comments on commit c7bd3d0

Please sign in to comment.