Skip to content

Commit aaace33

Browse files
nshestakovnshestakov
committed
fix
1 parent afbaa97 commit aaace33

File tree

2 files changed

+63
-65
lines changed

2 files changed

+63
-65
lines changed

‎ydb/core/tx/replication/service/table_writer_ut.cpp

+58-59
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ namespace NKikimr::NReplication::NService {
1616

1717
Y_UNIT_TEST_SUITE(LocalTableWriter) {
1818
using namespace NTestHelpers;
19-
using TRecord = TEvWorker::TEvData::TRecord;
2019

21-
TRecord Record(ui64 offset, const TString& data) {
22-
return TRecord(offset, data, TInstant::Zero(), "MessageGroupId", "ProducerId", 13 /* seqNo */);
20+
TEvWorker::TEvData::TRecord TRecord(ui64 offset, const TString& data) {
21+
return TEvWorker::TEvData::TRecord(offset, data, TInstant::Zero(), "MessageGroupId", "ProducerId", 13 /* seqNo */);
2322
}
2423

2524
Y_UNIT_TEST(WriteTable) {
@@ -40,9 +39,9 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
4039
env.Send<TEvWorker::TEvHandshake>(writer, new TEvWorker::TEvHandshake());
4140

4241
env.Send<TEvWorker::TEvPoll>(writer, new TEvWorker::TEvData(0, "TestSource", {
43-
Record(1, R"({"key":[1], "update":{"value":"10"}})"),
44-
Record(2, R"({"key":[2], "update":{"value":"20"}})"),
45-
Record(3, R"({"key":[3], "update":{"value":"30"}})"),
42+
TRecord(1, R"({"key":[1], "update":{"value":"10"}})"),
43+
TRecord(2, R"({"key":[2], "update":{"value":"20"}})"),
44+
TRecord(3, R"({"key":[3], "update":{"value":"30"}})"),
4645
}));
4746
}
4847

@@ -97,37 +96,37 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
9796
env.Send<TEvWorker::TEvHandshake>(writer, new TEvWorker::TEvHandshake());
9897

9998
env.Send<TEvWorker::TEvPoll>(writer, new TEvWorker::TEvData(0, "TestSource", {
100-
Record(1, R"({"key":[1], "update":{"int32_value":-100500}})"),
101-
Record(2, R"({"key":[2], "update":{"uint32_value":100500}})"),
102-
Record(3, R"({"key":[3], "update":{"int64_value":-200500}})"),
103-
Record(4, R"({"key":[4], "update":{"uint64_value":200500}})"),
104-
Record(5, R"({"key":[5], "update":{"uint8_value":255}})"),
105-
Record(6, R"({"key":[6], "update":{"bool_value":true}})"),
106-
Record(7, R"({"key":[7], "update":{"double_value":1.1234}})"),
107-
Record(8, R"({"key":[8], "update":{"float_value":-1.123}})"),
108-
Record(9, R"({"key":[9], "update":{"date_value":"2020-08-12T00:00:00.000000Z"}})"),
109-
Record(10, R"({"key":[10], "update":{"datetime_value":"2020-08-12T12:34:56.000000Z"}})"),
110-
Record(11, R"({"key":[11], "update":{"timestamp_value":"2020-08-12T12:34:56.123456Z"}})"),
111-
Record(12, R"({"key":[12], "update":{"interval_value":-300500}})"),
112-
Record(13, R"({"key":[13], "update":{"decimal_value":"3.321"}})"),
113-
Record(14, R"({"key":[14], "update":{"dynumber_value":".3321e1"}})"),
114-
Record(15, Sprintf(R"({"key":[15], "update":{"string_value":"%s"}})", Base64Encode("lorem ipsum").c_str())),
115-
Record(16, R"({"key":[16], "update":{"utf8_value":"lorem ipsum"}})"),
116-
Record(17, R"({"key":[17], "update":{"json_value":{"key": "value"}}})"),
117-
Record(18, R"({"key":[18], "update":{"jsondoc_value":{"key": "value"}}})"),
118-
Record(19, R"({"key":[19], "update":{"uuid_value":"65df1ec1-a97d-47b2-ae56-3c023da6ee8c"}})"),
119-
Record(20, R"({"key":[20], "update":{"date32_value":18486}})"),
120-
Record(21, R"({"key":[21], "update":{"datetime64_value":1597235696}})"),
121-
Record(22, R"({"key":[22], "update":{"timestamp64_value":1597235696123456}})"),
122-
Record(23, R"({"key":[23], "update":{"interval64_value":-300500}})"),
123-
Record(24, R"({"key":[24], "update":{"pgint2_value":"-42"}})"),
124-
Record(25, R"({"key":[25], "update":{"pgint4_value":"-420"}})"),
125-
Record(26, R"({"key":[26], "update":{"pgint8_value":"-4200"}})"),
126-
Record(27, R"({"key":[27], "update":{"pgfloat4_value":"3.1415"}})"),
127-
Record(28, R"({"key":[28], "update":{"pgfloat8_value":"2.718"}})"),
128-
Record(29, R"({"key":[29], "update":{"pgbytea_value":"\\x6c6f72656d2022697073756d22"}})"),
129-
Record(30, R"({"key":[30], "update":{"pgtext_value":"lorem \"ipsum\""}})"),
130-
Record(31, R"({"key":[31], "update":{"decimal35_value":"355555555555555.321"}})"),
99+
TRecord(1, R"({"key":[1], "update":{"int32_value":-100500}})"),
100+
TRecord(2, R"({"key":[2], "update":{"uint32_value":100500}})"),
101+
TRecord(3, R"({"key":[3], "update":{"int64_value":-200500}})"),
102+
TRecord(4, R"({"key":[4], "update":{"uint64_value":200500}})"),
103+
TRecord(5, R"({"key":[5], "update":{"uint8_value":255}})"),
104+
TRecord(6, R"({"key":[6], "update":{"bool_value":true}})"),
105+
TRecord(7, R"({"key":[7], "update":{"double_value":1.1234}})"),
106+
TRecord(8, R"({"key":[8], "update":{"float_value":-1.123}})"),
107+
TRecord(9, R"({"key":[9], "update":{"date_value":"2020-08-12T00:00:00.000000Z"}})"),
108+
TRecord(10, R"({"key":[10], "update":{"datetime_value":"2020-08-12T12:34:56.000000Z"}})"),
109+
TRecord(11, R"({"key":[11], "update":{"timestamp_value":"2020-08-12T12:34:56.123456Z"}})"),
110+
TRecord(12, R"({"key":[12], "update":{"interval_value":-300500}})"),
111+
TRecord(13, R"({"key":[13], "update":{"decimal_value":"3.321"}})"),
112+
TRecord(14, R"({"key":[14], "update":{"dynumber_value":".3321e1"}})"),
113+
TRecord(15, Sprintf(R"({"key":[15], "update":{"string_value":"%s"}})", Base64Encode("lorem ipsum").c_str())),
114+
TRecord(16, R"({"key":[16], "update":{"utf8_value":"lorem ipsum"}})"),
115+
TRecord(17, R"({"key":[17], "update":{"json_value":{"key": "value"}}})"),
116+
TRecord(18, R"({"key":[18], "update":{"jsondoc_value":{"key": "value"}}})"),
117+
TRecord(19, R"({"key":[19], "update":{"uuid_value":"65df1ec1-a97d-47b2-ae56-3c023da6ee8c"}})"),
118+
TRecord(20, R"({"key":[20], "update":{"date32_value":18486}})"),
119+
TRecord(21, R"({"key":[21], "update":{"datetime64_value":1597235696}})"),
120+
TRecord(22, R"({"key":[22], "update":{"timestamp64_value":1597235696123456}})"),
121+
TRecord(23, R"({"key":[23], "update":{"interval64_value":-300500}})"),
122+
TRecord(24, R"({"key":[24], "update":{"pgint2_value":"-42"}})"),
123+
TRecord(25, R"({"key":[25], "update":{"pgint4_value":"-420"}})"),
124+
TRecord(26, R"({"key":[26], "update":{"pgint8_value":"-4200"}})"),
125+
TRecord(27, R"({"key":[27], "update":{"pgfloat4_value":"3.1415"}})"),
126+
TRecord(28, R"({"key":[28], "update":{"pgfloat8_value":"2.718"}})"),
127+
TRecord(29, R"({"key":[29], "update":{"pgbytea_value":"\\x6c6f72656d2022697073756d22"}})"),
128+
TRecord(30, R"({"key":[30], "update":{"pgtext_value":"lorem \"ipsum\""}})"),
129+
TRecord(31, R"({"key":[31], "update":{"decimal35_value":"355555555555555.321"}})"),
131130
}));
132131
}
133132

@@ -148,9 +147,9 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
148147
env.Send<TEvWorker::TEvHandshake>(writer, new TEvWorker::TEvHandshake());
149148

150149
env.Send<TEvWorker::TEvPoll>(writer, new TEvWorker::TEvData(0, "TestSource", {
151-
Record(1, R"({"key":["1.0"], "update":{"value":"155555555555555.321"}})"),
152-
Record(2, R"({"key":["2.0"], "update":{"value":"255555555555555.321"}})"),
153-
Record(3, R"({"key":["3.0"], "update":{"value":"355555555555555.321"}})"),
150+
TRecord(1, R"({"key":["1.0"], "update":{"value":"155555555555555.321"}})"),
151+
TRecord(2, R"({"key":["2.0"], "update":{"value":"255555555555555.321"}})"),
152+
TRecord(3, R"({"key":["3.0"], "update":{"value":"355555555555555.321"}})"),
154153
}));
155154
}
156155

@@ -189,9 +188,9 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
189188

190189
{
191190
auto ev = env.Send<TEvService::TEvGetTxId>(writer, new TEvWorker::TEvData(0,"TestSource", {
192-
Record(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
193-
Record(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[2,0]})"),
194-
Record(order++, R"({"key":[3], "update":{"value":"30"}, "ts":[3,0]})"),
191+
TRecord(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
192+
TRecord(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[2,0]})"),
193+
TRecord(order++, R"({"key":[3], "update":{"value":"30"}, "ts":[3,0]})"),
195194
}));
196195

197196
const auto& versions = ev->Get()->Record.GetVersions();
@@ -208,17 +207,17 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
208207
}
209208
{
210209
auto ev = env.Send<TEvService::TEvHeartbeat>(writer, new TEvWorker::TEvData(0, "TestSource", {
211-
Record(order++, R"({"resolved":[10,0]})"),
210+
TRecord(order++, R"({"resolved":[10,0]})"),
212211
}));
213212
UNIT_ASSERT_VALUES_EQUAL(TRowVersion::FromProto(ev->Get()->Record.GetVersion()), TRowVersion(10, 0));
214213
env.GetRuntime().GrabEdgeEvent<TEvWorker::TEvPoll>(env.GetSender());
215214
}
216215

217216
env.Send<TEvService::TEvGetTxId>(writer, new TEvWorker::TEvData(0, "TestSource", {
218-
Record(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[11,0]})"),
219-
Record(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[12,0]})"),
220-
Record(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[21,0]})"),
221-
Record(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[22,0]})"),
217+
TRecord(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[11,0]})"),
218+
TRecord(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[12,0]})"),
219+
TRecord(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[21,0]})"),
220+
TRecord(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[22,0]})"),
222221
}));
223222

224223
env.Send<TEvWorker::TEvPoll>(writer, MakeTxIdResult({
@@ -227,12 +226,12 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
227226
}));
228227

229228
env.Send<TEvWorker::TEvPoll>(writer, new TEvWorker::TEvData(0, "TestSource", {
230-
Record(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[13,0]})"),
231-
Record(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[23,0]})"),
229+
TRecord(order++, R"({"key":[1], "update":{"value":"10"}, "ts":[13,0]})"),
230+
TRecord(order++, R"({"key":[2], "update":{"value":"20"}, "ts":[23,0]})"),
232231
}));
233232

234233
env.Send<TEvService::TEvHeartbeat>(writer, new TEvWorker::TEvData(0, "TestSource", {
235-
Record(order++, R"({"resolved":[30,0]})"),
234+
TRecord(order++, R"({"resolved":[30,0]})"),
236235
}));
237236
env.GetRuntime().GrabEdgeEvent<TEvWorker::TEvPoll>(env.GetSender());
238237
}
@@ -299,8 +298,8 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
299298

300299
env.Send<TEvWorker::TEvHandshake>(worker, new TEvWorker::TEvHandshake());
301300
env.Send<TEvService::TEvGetTxId>(writer, new TEvWorker::TEvData(0, "TestSource", {
302-
Record(1, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
303-
Record(2, R"({"key":[2], "update":{"value":"20"}, "ts":[11,0]})"),
301+
TRecord(1, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
302+
TRecord(2, R"({"key":[2], "update":{"value":"20"}, "ts":[11,0]})"),
304303
}));
305304
env.SendAsync(writer, MakeTxIdResult({
306305
{TRowVersion(10, 0), 1},
@@ -382,8 +381,8 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
382381

383382
env.Send<TEvWorker::TEvHandshake>(worker, new TEvWorker::TEvHandshake());
384383
env.Send<TEvService::TEvGetTxId>(writer, new TEvWorker::TEvData(0, "TestSource", {
385-
Record(1, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
386-
Record(2, R"({"resolved":[10,0]})"),
384+
TRecord(1, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
385+
TRecord(2, R"({"resolved":[10,0]})"),
387386
}));
388387
env.Send<TEvService::TEvHeartbeat>(writer, MakeTxIdResult({
389388
{TRowVersion(10, 0), 1},
@@ -412,16 +411,16 @@ Y_UNIT_TEST_SUITE(LocalTableWriter) {
412411
env.Send<TEvWorker::TEvHandshake>(writer, new TEvWorker::TEvHandshake());
413412

414413
env.Send<TEvService::TEvGetTxId>(writer, new TEvWorker::TEvData(0, "TestSource", {
415-
Record(1, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
414+
TRecord(1, R"({"key":[1], "update":{"value":"10"}, "ts":[1,0]})"),
416415
}));
417416
env.Send<TEvWorker::TEvPoll>(writer, MakeTxIdResult({
418417
{TRowVersion(10, 0), 1},
419418
}));
420419

421420
env.Send<TEvService::TEvGetTxId>(writer, new TEvWorker::TEvData(0, "TestSource", {
422-
Record(2, R"({"key":[3], "update":{"value":"30"}, "ts":[11,0]})"),
423-
Record(3, R"({"key":[2], "update":{"value":"20"}, "ts":[2,0]})"),
424-
Record(4, R"({"resolved":[20,0]})"),
421+
TRecord(2, R"({"key":[3], "update":{"value":"30"}, "ts":[11,0]})"),
422+
TRecord(3, R"({"key":[2], "update":{"value":"20"}, "ts":[2,0]})"),
423+
TRecord(4, R"({"resolved":[20,0]})"),
425424
}));
426425
env.Send<TEvService::TEvHeartbeat>(writer, MakeTxIdResult({
427426
{TRowVersion(20, 0), 2},

‎ydb/core/tx/replication/service/transfer_writer_ut.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ namespace NKikimr::NReplication::NService {
1717

1818
Y_UNIT_TEST_SUITE(TransferWriter) {
1919
using namespace NTestHelpers;
20-
using TRecord = TEvWorker::TEvData::TRecord;
2120

22-
TRecord Record(ui64 offset, const TString& data) {
23-
return TRecord(offset, data, TInstant::Zero(), "MessageGroupId", "ProducerId", 13 /* seqNo */);
21+
TEvWorker::TEvData::TRecord TRecord(ui64 offset, const TString& data) {
22+
return TEvWorker::TEvData::TRecord(offset, data, TInstant::Zero(), "MessageGroupId", "ProducerId", 13 /* seqNo */);
2423
}
2524

2625
Y_UNIT_TEST(Write_ColumnTable) {
@@ -56,9 +55,9 @@ Y_UNIT_TEST_SUITE(TransferWriter) {
5655
env.Send<TEvWorker::TEvHandshake>(writer, new TEvWorker::TEvHandshake());
5756

5857
env.Send<TEvWorker::TEvPoll>(writer, new TEvWorker::TEvData(0, "TestSource", {
59-
Record(1, R"({"key":[1], "update":{"value":"10"}})"),
60-
Record(2, R"({"key":[2], "update":{"value":"20"}})"),
61-
Record(3, R"({"key":[3], "update":{"value":"30"}})"),
58+
TRecord(1, R"({"key":[1], "update":{"value":"10"}})"),
59+
TRecord(2, R"({"key":[2], "update":{"value":"20"}})"),
60+
TRecord(3, R"({"key":[3], "update":{"value":"30"}})"),
6261
}));
6362
}
6463

0 commit comments

Comments
 (0)