fix rebase

ydb-platform · Dec 20, 2023 · bcddff7 · bcddff7
1 parent beeaa0a
commit bcddff7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp b/ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp
@@ -166,37 +166,37 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
             }
 
             case NKqpProto::TKqpSchemeOperation::kCreateGroup: {
-                auto modifyScheme = schemeOp.GetCreateGroup();
+                const auto& modifyScheme = schemeOp.GetCreateGroup();
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }
 
             case NKqpProto::TKqpSchemeOperation::kAddGroupMembership: {
-                auto modifyScheme = schemeOp.GetAddGroupMembership();
+                const auto& modifyScheme = schemeOp.GetAddGroupMembership();
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }
 
             case NKqpProto::TKqpSchemeOperation::kRemoveGroupMembership: {
-                auto modifyScheme = schemeOp.GetRemoveGroupMembership();
+                const auto& modifyScheme = schemeOp.GetRemoveGroupMembership();
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }
 
             case NKqpProto::TKqpSchemeOperation::kRenameGroup: {
-                auto modifyScheme = schemeOp.GetRenameGroup();
+                const auto& modifyScheme = schemeOp.GetRenameGroup();
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }
 
             case NKqpProto::TKqpSchemeOperation::kDropGroup: {
-                auto modifyScheme = schemeOp.GetDropGroup();
+                const auto& modifyScheme = schemeOp.GetDropGroup();
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }
 
             case NKqpProto::TKqpSchemeOperation::kModifyPermissions: {
-                auto modifyScheme = schemeOp.GetModifyPermissions();
+                const auto& modifyScheme = schemeOp.GetModifyPermissions();
                 ev->Record.MutableTransaction()->MutableModifyScheme()->CopyFrom(modifyScheme);
                 break;
             }

diff --git a/ydb/core/kqp/gateway/kqp_ic_gateway.cpp b/ydb/core/kqp/gateway/kqp_ic_gateway.cpp
@@ -1324,7 +1324,7 @@ class TKikimrIcGateway : public IKqpGateway {
             TVector<std::pair<const TString*, std::pair<TString, TString>>> pathPairs;
             pathPairs.reserve(settings.Pathes.size());
             for (const auto& path : settings.Pathes) {
-                pathPairs.push_back(std::make_pair(&path, SplitPathByDirAndBaseNames(path)));
+                pathPairs.push_back(std::make_pair(&path, NSchemeHelpers::SplitPathByDirAndBaseNames(path)));
             }
 
             for (const auto& path : pathPairs) {

diff --git a/ydb/core/kqp/gateway/utils/scheme_helpers.cpp b/ydb/core/kqp/gateway/utils/scheme_helpers.cpp
@@ -86,4 +86,12 @@ void FillCreateExternalTableColumnDesc(NKikimrSchemeOp::TExternalTableDescriptio
     externalTableDesc.SetContent(general.SerializeAsString());
 }
 
+std::pair<TString, TString> SplitPathByDirAndBaseNames(const TString& path) {
+    auto splitPos = path.find_last_of('/');
+    if (splitPos == path.npos || splitPos + 1 == path.size()) {
+        ythrow yexception() << "wrong path format '" << path << "'" ;
+    }
+    return {path.substr(0, splitPos), path.substr(splitPos + 1)};
+}
+
 } // namespace NKikimr::NKqp::NSchemeHelpers
diff --git a/ydb/core/kqp/gateway/utils/scheme_helpers.h b/ydb/core/kqp/gateway/utils/scheme_helpers.h
@@ -31,4 +31,6 @@ void FillCreateExternalTableColumnDesc(NKikimrSchemeOp::TExternalTableDescriptio
                                        const TString& name,
                                        const NYql::TCreateExternalTableSettings& settings);
 
+std::pair<TString, TString> SplitPathByDirAndBaseNames(const TString& path);
+
 } // namespace NKikimr::NKqp::NSchemeHelpers
diff --git a/ydb/core/kqp/host/kqp_gateway_proxy.cpp b/ydb/core/kqp/host/kqp_gateway_proxy.cpp
@@ -845,7 +845,7 @@ class TKqpGatewayProxy : public IKikimrGateway {
         TVector<std::pair<const TString*, std::pair<TString, TString>>> pathPairs;
         pathPairs.reserve(settings.Pathes.size());
         for (const auto& path : settings.Pathes) {
-            pathPairs.push_back(std::make_pair(&path, SplitPathByDirAndBaseNames(path)));
+            pathPairs.push_back(std::make_pair(&path, NSchemeHelpers::SplitPathByDirAndBaseNames(path)));
         }
 
         if (IsPrepare()) {