Skip to content

Commit 9403e3b

Browse files
committed
fix issues
1 parent bcddff7 commit 9403e3b

13 files changed

+175
-185
lines changed

ydb/core/kqp/gateway/kqp_ic_gateway.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,8 @@ namespace {
688688
};
689689

690690
struct TModifyPermissionsWrapper : public TThrRefBase {
691-
using TMethod = std::function<void(NYql::TModifyPermissionsSettings::EAction action, THashSet<TString>&& permissions, THashSet<TString>&& roles, TVector<TString>&& pathes)>;
692-
TMethod ModifyPermissionsForPathes;
691+
using TMethod = std::function<void(NYql::TModifyPermissionsSettings::EAction action, THashSet<TString>&& permissions, THashSet<TString>&& roles, TVector<TString>&& paths)>;
692+
TMethod ModifyPermissionsForPaths;
693693
};
694694
}
695695

@@ -1275,18 +1275,18 @@ class TKikimrIcGateway : public IKqpGateway {
12751275
return MakeFuture(ResultFromError<TGenericResult>("No permissions names for modify permissions"));
12761276
}
12771277

1278-
if (settings.Pathes.empty()) {
1279-
return MakeFuture(ResultFromError<TGenericResult>("No pathes for modify permissions"));
1278+
if (settings.Paths.empty()) {
1279+
return MakeFuture(ResultFromError<TGenericResult>("No paths for modify permissions"));
12801280
}
12811281

12821282
if (settings.Roles.empty()) {
12831283
return MakeFuture(ResultFromError<TGenericResult>("No roles for modify permissions"));
12841284
}
12851285

12861286
TVector<TPromise<TGenericResult>> promises;
1287-
promises.reserve(settings.Pathes.size());
1287+
promises.reserve(settings.Paths.size());
12881288
TVector<TFuture<TGenericResult>> futures;
1289-
futures.reserve(settings.Pathes.size());
1289+
futures.reserve(settings.Paths.size());
12901290

12911291
NACLib::TDiffACL acl;
12921292
switch (settings.Action) {
@@ -1322,8 +1322,8 @@ class TKikimrIcGateway : public IKqpGateway {
13221322
const auto serializedDiffAcl = acl.SerializeAsString();
13231323

13241324
TVector<std::pair<const TString*, std::pair<TString, TString>>> pathPairs;
1325-
pathPairs.reserve(settings.Pathes.size());
1326-
for (const auto& path : settings.Pathes) {
1325+
pathPairs.reserve(settings.Paths.size());
1326+
for (const auto& path : settings.Paths) {
13271327
pathPairs.push_back(std::make_pair(&path, NSchemeHelpers::SplitPathByDirAndBaseNames(path)));
13281328
}
13291329

ydb/core/kqp/gateway/utils/scheme_helpers.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void FillCreateExternalTableColumnDesc(NKikimrSchemeOp::TExternalTableDescriptio
8989
std::pair<TString, TString> SplitPathByDirAndBaseNames(const TString& path) {
9090
auto splitPos = path.find_last_of('/');
9191
if (splitPos == path.npos || splitPos + 1 == path.size()) {
92-
ythrow yexception() << "wrong path format '" << path << "'" ;
92+
ythrow yexception() << "wrong path format '" << path << "'";
9393
}
9494
return {path.substr(0, splitPos), path.substr(splitPos + 1)};
9595
}

0 commit comments

Comments
 (0)