PR from branch users/eivanov89/-upsert-sql-load-actor

4 files changed, 8 insertions, 8 deletions

diff --git a/ydb/core/protos/tx_datashard.proto b/ydb/core/protos/tx_datashard.proto
index fc834143fe..eb57564c6e 100644
--- a/ydb/core/protos/tx_datashard.proto
+++ b/ydb/core/protos/tx_datashard.proto
@@ -1809,7 +1809,7 @@ message TEvTestLoadRequest {
     oneof Command {
         TLoadStop LoadStop = 2;
         TUpdateStart BulkUpsertStart = 3;
-        TUpdateStart UpsertMkqlStart = 4;
+        TUpdateStart UpsertLocalMkqlStart = 4;
     }
 }
 
diff --git a/ydb/core/tx/datashard/datashard_ut_testload.cpp b/ydb/core/tx/datashard/datashard_ut_testload.cpp
index 0813db9ea8..75a9e77f5a 100644
--- a/ydb/core/tx/datashard/datashard_ut_testload.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_testload.cpp
@@ -222,14 +222,14 @@ Y_UNIT_TEST_SUITE(UpsertLoad) {
         helper.TestLoad(std::move(request), expectedRowCount);
     }
 
-    Y_UNIT_TEST(ShouldWriteDataBulkUpsertMkql) {
+    Y_UNIT_TEST(ShouldWriteDataBulkUpsertLocalMkql) {
         TTestHelper helper;
 
         const ui64 expectedRowCount = 10;
 
         std::unique_ptr<TEvDataShard::TEvTestLoadRequest> request(new TEvDataShard::TEvTestLoadRequest());
         auto& record = request->Record;
-        auto& command = *record.MutableUpsertMkqlStart();
+        auto& command = *record.MutableUpsertLocalMkqlStart();
 
         command.SetTag(1);
         command.SetRowCount(expectedRowCount);
diff --git a/ydb/core/tx/datashard/testload/test_load_actor.cpp b/ydb/core/tx/datashard/testload/test_load_actor.cpp
index c5c54496db..2f36d7b654 100644
--- a/ydb/core/tx/datashard/testload/test_load_actor.cpp
+++ b/ydb/core/tx/datashard/testload/test_load_actor.cpp
@@ -112,8 +112,8 @@ public:
                 break;
             }
 
-            case NKikimrTxDataShard::TEvTestLoadRequest::CommandCase::kUpsertMkqlStart: {
-                const auto& cmd = record.GetUpsertMkqlStart();
+            case NKikimrTxDataShard::TEvTestLoadRequest::CommandCase::kUpsertLocalMkqlStart: {
+                const auto& cmd = record.GetUpsertLocalMkqlStart();
                 const ui64 tag = GetOrGenerateTag(cmd);
                 if (LoadActors.count(tag) != 0) {
                     ythrow TLoadActorException() << Sprintf("duplicate load actor with Tag# %" PRIu64, tag);
diff --git a/ydb/core/tx/datashard/testload/test_load_upsert.cpp b/ydb/core/tx/datashard/testload/test_load_upsert.cpp
index fb0a2484f7..c637483e41 100644
--- a/ydb/core/tx/datashard/testload/test_load_upsert.cpp
+++ b/ydb/core/tx/datashard/testload/test_load_upsert.cpp
@@ -22,7 +22,7 @@ namespace {
 
 enum class ERequestType {
     BulkUpsert,
-    UpsertMkql,
+    UpsertLocalMkql,
 };
 
 TString GetKey(size_t n) {
@@ -109,7 +109,7 @@ TRequestsVector GenerateRequests(ui64 tableId, ui64 n, ERequestType requestType)
         case ERequestType::BulkUpsert:
             requests.emplace_back(GenerateBulkRowRequest(tableId, keyNum));
             break;
-        case ERequestType::UpsertMkql:
+        case ERequestType::UpsertLocalMkql:
             requests.emplace_back(GenerateMkqlRowRequest(tableId, keyNum));
             break;
         }
@@ -307,7 +307,7 @@ NActors::IActor *CreateBulkUpsertActor(const NKikimrTxDataShard::TEvTestLoadRequ
 NActors::IActor *CreateUpsertActor(const NKikimrTxDataShard::TEvTestLoadRequest::TUpdateStart& cmd,
         const NActors::TActorId& parent, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag)
 {
-    return new TUpsertActor(cmd, parent, std::move(counters), tag, ERequestType::UpsertMkql);
+    return new TUpsertActor(cmd, parent, std::move(counters), tag, ERequestType::UpsertLocalMkql);
 }
 
 } // NKikimr::NDataShard