sync scheme in load actors with YCSB

4 files changed, 32 insertions, 32 deletions

diff --git a/ydb/core/tx/datashard/datashard_ut_testload.cpp b/ydb/core/tx/datashard/datashard_ut_testload.cpp
index 45927ddc60e..2e04771a9b8 100644
--- a/ydb/core/tx/datashard/datashard_ut_testload.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_testload.cpp
@@ -33,11 +33,11 @@ void CreateTable(Tests::TServer::TPtr server,
     TVector<TShardedTableOptions::TColumn> columns;
     columns.reserve(ValueColumnsCount + 1);
 
-    columns.emplace_back("key", "Utf8", true, false);
+    columns.emplace_back("id", "Utf8", true, false);
 
     for (size_t i = 0; i < ValueColumnsCount; ++i) {
         TString fieldName = FieldPrefix + ToString(i);
-        columns.emplace_back(fieldName, "Utf8", false, false);
+        columns.emplace_back(fieldName, "String", false, false);
     }
 
     auto opts = TShardedTableOptions()
diff --git a/ydb/core/tx/datashard/testload/bulk_mkql_upsert.cpp b/ydb/core/tx/datashard/testload/bulk_mkql_upsert.cpp
index 5440b5c3c01..857342722b8 100644
--- a/ydb/core/tx/datashard/testload/bulk_mkql_upsert.cpp
+++ b/ydb/core/tx/datashard/testload/bulk_mkql_upsert.cpp
@@ -11,7 +11,7 @@
 #include <google/protobuf/text_format.h>
 
 // * Scheme is hardcoded and it is like default YCSB setup:
-// 1 utf8 "key" column, 10 utf8 "field0" - "field9" columns
+// 1 Text "id" column, 10 Bytes "field0" - "field9" columns
 // * row is ~ 1 KB, keys are like user1000385178204227360
 
 namespace NKikimr::NDataShardLoad {
@@ -65,7 +65,7 @@ TUploadRequest GenerateMkqlRowRequest(ui64 /* tableId */, ui64 keyNum, const TSt
     if (!programWithoutKey) {
         TString fields;
         for (size_t i = 0; i < 10; ++i) {
-            fields += Sprintf("'('field%lu (Utf8 '%s))", i, Value.data());
+            fields += Sprintf("'('field%lu (String '%s))", i, Value.data());
         }
         TString rowUpd = "(let upd_ '(" + fields + "))";
 
@@ -82,7 +82,7 @@ TUploadRequest GenerateMkqlRowRequest(ui64 /* tableId */, ui64 keyNum, const TSt
     TString key = GetKey(keyNum);
 
     auto programText = Sprintf(R"((
-        (let row1_ '('('key (Utf8 '%s))))
+        (let row1_ '('('id (Utf8 '%s))))
     )", key.data()) + programWithoutKey;
 
     auto request = std::make_unique<TEvTablet::TEvLocalMKQL>();
diff --git a/ydb/core/tx/datashard/testload/kqp_upsert.cpp b/ydb/core/tx/datashard/testload/kqp_upsert.cpp
index 041b65233f0..a9a8f735bdd 100644
--- a/ydb/core/tx/datashard/testload/kqp_upsert.cpp
+++ b/ydb/core/tx/datashard/testload/kqp_upsert.cpp
@@ -14,7 +14,7 @@
 #include <google/protobuf/text_format.h>
 
 // * Scheme is hardcoded and it is like default YCSB setup:
-// 1 utf8 "key" column, 10 utf8 "field0" - "field9" columns
+// 1 Text "id" column, 10 Bytes "field0" - "field9" columns
 // * row is ~ 1 KB, keys are like user1000385178204227360
 
 namespace NKikimr::NDataShardLoad {
@@ -44,19 +44,19 @@ TQueryInfo GenerateUpsert(size_t n, const TString& table) {
     str << Sprintf(R"__(
         --!syntax_v1
 
-        DECLARE $key AS Utf8;
-        DECLARE $field0 AS Utf8;
-        DECLARE $field1 AS Utf8;
-        DECLARE $field2 AS Utf8;
-        DECLARE $field3 AS Utf8;
-        DECLARE $field4 AS Utf8;
-        DECLARE $field5 AS Utf8;
-        DECLARE $field6 AS Utf8;
-        DECLARE $field7 AS Utf8;
-        DECLARE $field8 AS Utf8;
-        DECLARE $field9 AS Utf8;
-
-        UPSERT INTO `%s` ( key, field0, field1, field2, field3, field4, field5, field6, field7, field8, field9 )
+        DECLARE $key AS Text;
+        DECLARE $field0 AS Bytes;
+        DECLARE $field1 AS Bytes;
+        DECLARE $field2 AS Bytes;
+        DECLARE $field3 AS Bytes;
+        DECLARE $field4 AS Bytes;
+        DECLARE $field5 AS Bytes;
+        DECLARE $field6 AS Bytes;
+        DECLARE $field7 AS Bytes;
+        DECLARE $field8 AS Bytes;
+        DECLARE $field9 AS Bytes;
+
+        UPSERT INTO `%s` ( id, field0, field1, field2, field3, field4, field5, field6, field7, field8, field9 )
             VALUES ( $key, $field0, $field1, $field2, $field3, $field4, $field5, $field6, $field7, $field8, $field9 );
     )__", table.c_str());
 
@@ -64,7 +64,7 @@ TQueryInfo GenerateUpsert(size_t n, const TString& table) {
 
     for (size_t i = 0; i < 10; ++i) {
         TString name = "$field" + ToString(i);
-        paramsBuilder.AddParam(name).Utf8(Value).Build();
+        paramsBuilder.AddParam(name).String(Value).Build();
     }
 
     auto params = paramsBuilder.Build();
diff --git a/ydb/core/tx/datashard/testload/test_load_actor.cpp b/ydb/core/tx/datashard/testload/test_load_actor.cpp
index 62032488b29..7ef8eb1025a 100644
--- a/ydb/core/tx/datashard/testload/test_load_actor.cpp
+++ b/ydb/core/tx/datashard/testload/test_load_actor.cpp
@@ -207,18 +207,18 @@ public:
         TString queryBase = R"__(
             --!syntax_v1
             CREATE TABLE `%s/%s` (
-                key Utf8,
-                field0 Utf8,
-                field1 Utf8,
-                field2 Utf8,
-                field3 Utf8,
-                field4 Utf8,
-                field5 Utf8,
-                field6 Utf8,
-                field7 Utf8,
-                field8 Utf8,
-                field9 Utf8,
-                PRIMARY KEY(key)
+                id Text NOT NULL,
+                field0 Bytes,
+                field1 Bytes,
+                field2 Bytes,
+                field3 Bytes,
+                field4 Bytes,
+                field5 Bytes,
+                field6 Bytes,
+                field7 Bytes,
+                field8 Bytes,
+                field9 Bytes,
+                PRIMARY KEY(id)
             ) WITH (AUTO_PARTITIONING_BY_LOAD = DISABLED,
                     AUTO_PARTITIONING_BY_SIZE = ENABLED,
                     AUTO_PARTITIONING_PARTITION_SIZE_MB = %)__" PRIu64 R"__(,