Merge e0bd50a into 8a267cb

Author: kungasc

ydb/core/base/table_index.cpp

@@ -201,4 +201,24 @@ TClusterId SetPostingParentFlag(TClusterId parent) {
     return (parent | PostingParentFlag);
 }
 
+TString ToShortDebugString(const NKikimrTxDataShard::TEvReshuffleKMeansRequest& record) {
+    auto copy = record;
+    TStringBuilder result;
+    // clusters are not human readable and can be large like 100Kb+
+    result << " Clusters: " << record.ClustersSize();
+    copy.ClearClusters();
+    result << " " << copy.ShortDebugString();
+    return result;
+}
+
+TString ToShortDebugString(const NKikimrTxDataShard::TEvSampleKResponse& record) {
+    auto copy = record;
+    TStringBuilder result;
+    // rows are not human readable and can be large like 100Kb+
+    result << " Rows: " << record.RowsSize();
+    copy.ClearRows();
+    result << " " << copy.ShortDebugString();
+    return result;
+}
+
 }

ydb/core/base/table_index.h

@@ -3,6 +3,7 @@
 #include <ydb/public/api/protos/ydb_value.pb.h>
 #include <ydb/public/lib/scheme_types/scheme_type_id.h>
 #include <ydb/core/protos/flat_scheme_op.pb.h>
+#include <ydb/core/protos/tx_datashard.pb.h>
 
 #include <util/generic/hash_set.h>
 #include <util/generic/vector.h>
@@ -45,5 +46,8 @@ void EnsureNoPostingParentFlag(TClusterId parent);
 
 TClusterId SetPostingParentFlag(TClusterId parent);
 
+TString ToShortDebugString(const NKikimrTxDataShard::TEvReshuffleKMeansRequest& record);
+TString ToShortDebugString(const NKikimrTxDataShard::TEvSampleKResponse& record);
+
 }
 }

ydb/core/tx/datashard/build_index/reshuffle_kmeans.cpp

@@ -378,7 +378,7 @@ void TDataShard::HandleSafe(TEvDataShard::TEvReshuffleKMeansRequest::TPtr& ev, c
         response->Record.SetRequestSeqNoRound(seqNo.Round);
 
         LOG_N("Starting TReshuffleKMeansScan TabletId: " << TabletID() 
-            << " " << request.ShortDebugString()
+            << " " << NTableIndex::ToShortDebugString(request)
             << " row version " << rowVersion);
 
         // Note: it's very unlikely that we have volatile txs before this snapshot
@@ -396,7 +396,7 @@ void TDataShard::HandleSafe(TEvDataShard::TEvReshuffleKMeansRequest::TPtr& ev, c
         auto trySendBadRequest = [&] {
             if (response->Record.GetStatus() == NKikimrIndexBuilder::EBuildStatus::BAD_REQUEST) {
                 LOG_E("Rejecting TReshuffleKMeansScan bad request TabletId: " << TabletID()
-                    << " " << request.ShortDebugString()
+                    << " " << NTableIndex::ToShortDebugString(request)
                     << " with response " << response->Record.ShortDebugString());
                 ctx.Send(ev->Sender, std::move(response));
                 return true;

ydb/core/tx/datashard/build_index/sample_k.cpp

@@ -169,9 +169,9 @@ class TSampleKScan final: public TActor<TSampleKScan>, public IActorExceptionHan
         NYql::IssuesToMessage(Issues, record.MutableIssues());
 
         if (Response->Record.GetStatus() == NKikimrIndexBuilder::DONE) {
-            LOG_N("Done " << Debug() << " " << Response->Record.ShortDebugString());
+            LOG_N("Done " << Debug() << " " << NTableIndex::ToShortDebugString(Response->Record));
         } else {
-            LOG_E("Failed " << Debug() << " " << Response->Record.ShortDebugString());
+            LOG_E("Failed " << Debug() << " " << NTableIndex::ToShortDebugString(Response->Record));
         }
         Send(ResponseActorId, Response.Release());
 
@@ -279,7 +279,7 @@ void TDataShard::HandleSafe(TEvDataShard::TEvSampleKRequest::TPtr& ev, const TAc
             if (response->Record.GetStatus() == NKikimrIndexBuilder::EBuildStatus::BAD_REQUEST) {
                 LOG_E("Rejecting TSampleKScan bad request TabletId: " << TabletID()
                     << " " << request.ShortDebugString()
-                    << " with response " << response->Record.ShortDebugString());
+                    << " with response " << NTableIndex::ToShortDebugString(response->Record));
                 ctx.Send(ev->Sender, std::move(response));
                 return true;
             } else {

ydb/core/tx/schemeshard/schemeshard_build_index__progress.cpp

@@ -605,13 +605,7 @@ struct TSchemeShard::TIndexBuilder::TTxProgress: public TSchemeShard::TIndexBuil
         };
 
         auto shardId = CommonFillRecord(ev->Record, shardIdx, buildInfo);
-        [[maybe_unused]] auto toDebugStr = [&](const NKikimrTxDataShard::TEvReshuffleKMeansRequest& record) {
-            auto r = record;
-            // clusters are not human readable and can be large like 100Kb+
-            r.ClearClusters();
-            return r.ShortDebugString();
-        };
-        LOG_N("TTxBuildProgress: TEvReshuffleKMeansRequest: " << toDebugStr(ev->Record));
+        LOG_N("TTxBuildProgress: TEvReshuffleKMeansRequest: " << ToShortDebugString(ev->Record));
 
         ToTabletSend.emplace(shardId, std::move(ev));
     }
@@ -1566,15 +1560,9 @@ struct TSchemeShard::TIndexBuilder::TTxReplySampleK: public TSchemeShard::TIndex
             return true;
         }
         auto& buildInfo = *buildInfoPtr->Get();
-        [[maybe_unused]] auto toDebugStr = [&](const NKikimrTxDataShard::TEvSampleKResponse& record) {
-            auto r = record;
-            // rows are not human readable and can be large like 100Kb+
-            r.ClearRows();
-            return r.ShortDebugString();
-        };
         LOG_D("TTxReply : TEvSampleKResponse"
               << ", TIndexBuildInfo: " << buildInfo
-              << ", record: " << toDebugStr(record));
+              << ", record: " << ToShortDebugString(record));
 
         TTabletId shardId = TTabletId(record.GetTabletId());
         if (!Self->TabletIdToShardIdx.contains(shardId)) {