fix

Author: Enjection

ydb/core/tx/datashard/change_exchange_impl.h

@@ -3,8 +3,6 @@
 #include "defs.h"
 #include "change_exchange_helpers.h"
 
-#include <ydb/core/scheme/scheme_tabledefs.h>
-
 namespace NKikimr {
 namespace NDataShard {
 

ydb/core/tx/datashard/incr_restore_scan.cpp

@@ -31,7 +31,7 @@ class TIncrementalRestoreScan
                 << "[TIncrementalRestoreScan]"
                 << "[" << TxId << "]"
                 << "[" << SourcePathId << "]"
-                << "[" << SourcePathId << "]"
+                << "[" << TargetPathId << "]"
                 << SelfId() /* contains brackets */ << " ";
         }
 
@@ -41,10 +41,10 @@ class TIncrementalRestoreScan
     explicit TIncrementalRestoreScan(
             TActorId parent,
             std::function<TActorId(const TActorContext& ctx)> changeSenderFactory,
-            ui64 txId,
             const TPathId& sourcePathId,
             TUserTable::TCPtr table,
             const TPathId& targetPathId,
+            ui64 txId,
             NStreamScan::TLimits limits)
         : IActorCallback(static_cast<TReceiveFunc>(&TIncrementalRestoreScan::StateWork), NKikimrServices::TActivity::INCREMENTAL_RESTORE_SCAN_ACTOR)
         , Parent(parent)
@@ -54,6 +54,9 @@ class TIncrementalRestoreScan
         , TargetPathId(targetPathId)
         , ValueTags(InitValueTags(table))
         , Limits(limits)
+        , Columns(table->Columns)
+        , KeyColumnTypes(table->KeyColumnTypes)
+        , KeyColumnIds(table->KeyColumnIds)
     {}
 
     static TVector<TTag> InitValueTags(TUserTable::TCPtr table) {
@@ -154,7 +157,6 @@ class TIncrementalRestoreScan
     }
 
     EScan Feed(TArrayRef<const TCell> key, const TRow& row) noexcept override {
-
         Buffer.AddRow(key, *row);
         if (Buffer.Bytes() < Limits.BatchMaxBytes) {
             if (Buffer.Rows() < Limits.BatchMaxRows) {
@@ -270,7 +272,7 @@ class TIncrementalRestoreScan
 THolder<NTable::IScan> CreateIncrementalRestoreScan(
         NActors::TActorId parent,
         std::function<TActorId(const TActorContext& ctx)> changeSenderFactory,
-        TPathId sourcePathId,
+        const TPathId& sourcePathId,
         TUserTable::TCPtr table,
         const TPathId& targetPathId,
         ui64 txId,
@@ -279,10 +281,10 @@ THolder<NTable::IScan> CreateIncrementalRestoreScan(
     return MakeHolder<TIncrementalRestoreScan>(
         parent,
         changeSenderFactory,
-        txId,
         sourcePathId,
         table,
         targetPathId,
+        txId,
         limits);
 }
 

ydb/core/tx/datashard/incr_restore_scan.h

@@ -30,7 +30,7 @@ struct TEvIncrementalRestoreScan {
 THolder<NTable::IScan> CreateIncrementalRestoreScan(
         NActors::TActorId parent,
         std::function<TActorId(const TActorContext& ctx)> changeSenderFactory,
-        TPathId tablePathId,
+        const TPathId& sourcePathId,
         TUserTable::TCPtr table,
         const TPathId& targetPathId,
         ui64 txId,