@@ -47,7 +47,7 @@ TVector<TShardedTableOptions::TColumn> GetMoviesColumns() {
47
47
return columns;
48
48
}
49
49
50
- std::tuple<TVector<ui64>, ui64 > CreateTable (Tests::TServer::TPtr server,
50
+ std::tuple<TVector<ui64>, TTableId > CreateTable (Tests::TServer::TPtr server,
51
51
TActorId sender,
52
52
const TString &root,
53
53
const TString &name,
@@ -64,7 +64,7 @@ std::tuple<TVector<ui64>, ui64> CreateTable(Tests::TServer::TPtr server,
64
64
return CreateShardedTable (server, sender, root, name, opts);
65
65
}
66
66
67
- std::tuple<TVector<ui64>, ui64 > CreateMoviesTable (Tests::TServer::TPtr server,
67
+ std::tuple<TVector<ui64>, TTableId > CreateMoviesTable (Tests::TServer::TPtr server,
68
68
TActorId sender,
69
69
const TString &root,
70
70
const TString &name)
@@ -317,9 +317,8 @@ void AddRangeQuery(
317
317
struct TTableInfo {
318
318
TString Name;
319
319
320
- ui64 TableId;
320
+ TTableId TableId;
321
321
ui64 TabletId;
322
- ui64 OwnerId;
323
322
NKikimrTxDataShard::TEvGetInfoResponse::TUserTable UserTable;
324
323
325
324
TActorId ClientId;
@@ -376,7 +375,6 @@ struct TTestHelper {
376
375
table1.TabletId = shards.at (0 );
377
376
378
377
auto [tables, ownerId] = GetTables (Server, table1.TabletId );
379
- table1.OwnerId = ownerId;
380
378
table1.UserTable = tables[" table-1" ];
381
379
382
380
table1.ClientId = runtime.ConnectToPipe (table1.TabletId , Sender, 0 , GetTestPipeConfig ());
@@ -401,7 +399,6 @@ struct TTestHelper {
401
399
table2.TabletId = shards.at (0 );
402
400
403
401
auto [tables, ownerId] = GetTables (Server, table2.TabletId );
404
- table2.OwnerId = ownerId;
405
402
table2.UserTable = tables[" movies" ];
406
403
407
404
table2.ClientId = runtime.ConnectToPipe (table2.TabletId , Sender, 0 , GetTestPipeConfig ());
@@ -418,7 +415,6 @@ struct TTestHelper {
418
415
table3.TabletId = shards.at (0 );
419
416
420
417
auto [tables, ownerId] = GetTables (Server, table3.TabletId );
421
- table3.OwnerId = ownerId;
422
418
table3.UserTable = tables[" table-1-many" ];
423
419
424
420
table3.ClientId = runtime.ConnectToPipe (table3.TabletId , Sender, 0 , GetTestPipeConfig ());
@@ -508,7 +504,7 @@ struct TTestHelper {
508
504
auto & record = request->Record ;
509
505
510
506
record.SetReadId (readId);
511
- record.MutableTableId ()->SetOwnerId (table.OwnerId );
507
+ record.MutableTableId ()->SetOwnerId (table.TableId . PathId . OwnerId );
512
508
record.MutableTableId ()->SetTableId (table.UserTable .GetPathId ());
513
509
514
510
const auto & description = table.UserTable .GetDescription ();
@@ -764,7 +760,7 @@ struct TTestHelper {
764
760
765
761
auto evWrite = std::make_unique<NKikimr::NEvents::TDataEvents::TEvWrite>(txId, txMode);
766
762
ui64 payloadIndex = NKikimr::NEvWrite::TPayloadHelper<NKikimr::NEvents::TDataEvents::TEvWrite>(*evWrite).AddDataToPayload (matrix.ReleaseBuffer ());
767
- evWrite->AddOperation (NKikimrDataEvents::TEvWrite::TOperation::OPERATION_UPSERT, table.TableId , 1 , columnIds, payloadIndex, NKikimrDataEvents::FORMAT_CELLVEC);
763
+ evWrite->AddOperation (NKikimrDataEvents::TEvWrite::TOperation::OPERATION_UPSERT, table.TableId , columnIds, payloadIndex, NKikimrDataEvents::FORMAT_CELLVEC);
768
764
769
765
return Write (*Server->GetRuntime (), Sender, table.TabletId , std::move (evWrite));
770
766
}
@@ -3618,13 +3614,12 @@ Y_UNIT_TEST_SUITE(DataShardReadIteratorPageFaults) {
3618
3614
.Columns ({
3619
3615
{" key" , " Uint32" , true , false },
3620
3616
{" value" , " Uint32" , false , false }});
3621
- CreateShardedTable (server, sender, " /Root" , " table-1" , opts);
3617
+ auto [shards, tableId1] = CreateShardedTable (server, sender, " /Root" , " table-1" , opts);
3622
3618
3623
3619
ExecSQL (server, sender, Q_ (" UPSERT INTO `/Root/table-1` (key, value) VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6)" ));
3624
3620
SimulateSleep (runtime, TDuration::Seconds (1 ));
3625
3621
3626
- const auto shard1 = GetTableShards (server, sender, " /Root/table-1" ).at (0 );
3627
- const auto tableId1 = ResolveTableId (server, sender, " /Root/table-1" );
3622
+ const auto shard1 = shards.at (0 );
3628
3623
CompactTable (runtime, shard1, tableId1, false );
3629
3624
RebootTablet (runtime, shard1, sender);
3630
3625
SimulateSleep (runtime, TDuration::Seconds (1 ));
0 commit comments