Merge 217698f into 95f1072

Author: ivanmorozov333

ydb/core/tx/columnshard/engines/changes/indexation.cpp

@@ -230,6 +230,7 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont
         }
         pathBatches.AddChunkInfo(inserted, context);
     }
+    NoAppendIsCorrect = pathBatches.GetData().empty();
 
     pathBatches.FinishChunksInfo();
 

ydb/core/tx/columnshard/engines/changes/with_appended.cpp

@@ -119,7 +119,7 @@ void TChangesWithAppend::DoWriteIndexOnComplete(NColumnShard::TColumnShard* self
 }
 
 void TChangesWithAppend::DoCompile(TFinalizationContext& context) {
-    AFL_VERIFY(PortionsToRemove.size() + PortionsToMove.size() + AppendedPortions.size());
+    AFL_VERIFY(PortionsToRemove.size() + PortionsToMove.size() + AppendedPortions.size() || NoAppendIsCorrect);
     for (auto&& i : AppendedPortions) {
         i.GetPortionConstructor().MutablePortionConstructor().SetPortionId(context.NextPortionId());
         i.GetPortionConstructor().MutablePortionConstructor().MutableMeta().SetCompactionLevel(TargetCompactionLevel.value_or(0));

ydb/core/tx/columnshard/engines/changes/with_appended.h

@@ -11,10 +11,13 @@ class TChangesWithAppend: public TColumnEngineChanges {
     using TBase = TColumnEngineChanges;
     THashMap<TPortionAddress, std::shared_ptr<const TPortionInfo>> PortionsToRemove;
     THashMap<TPortionAddress, std::shared_ptr<const TPortionInfo>> PortionsToMove;
+    std::vector<TWritePortionInfoWithBlobsResult> AppendedPortions;
 
 protected:
     std::optional<ui64> TargetCompactionLevel;
     TSaverContext SaverContext;
+    bool NoAppendIsCorrect = false;
+
     virtual void OnDataAccessorsInitialized(const TDataAccessorsInitializationContext& /*context*/) override {
 
     }
@@ -58,6 +61,14 @@ class TChangesWithAppend: public TColumnEngineChanges {
 
     }
 
+    const std::vector<TWritePortionInfoWithBlobsResult>& GetAppendedPortions() const {
+        return AppendedPortions;
+    }
+
+    std::vector<TWritePortionInfoWithBlobsResult>& MutableAppendedPortions() {
+        return AppendedPortions;
+    }
+
     void AddMovePortions(const std::vector<std::shared_ptr<TPortionInfo>>& portions) {
         for (auto&& i : portions) {
             AFL_VERIFY(i);
@@ -90,7 +101,6 @@ class TChangesWithAppend: public TColumnEngineChanges {
         }
     }
 
-    std::vector<TWritePortionInfoWithBlobsResult> AppendedPortions;
     virtual ui32 GetWritePortionsCount() const override {
         return AppendedPortions.size();
     }

ydb/core/tx/columnshard/engines/ut/ut_logs_engine.cpp

@@ -333,14 +333,14 @@ bool Insert(TColumnEngineForLogs& engine, TTestDbWrapper& db, TSnapshot snap, st
     NOlap::TConstructionContext context(engine.GetVersionedIndex(), NColumnShard::TIndexationCounters("Indexation"), snap);
     Y_ABORT_UNLESS(changes->ConstructBlobs(context).Ok());
 
-    UNIT_ASSERT_VALUES_EQUAL(changes->AppendedPortions.size(), 1);
+    UNIT_ASSERT_VALUES_EQUAL(changes->GetAppendedPortions().size(), 1);
     ui32 blobsCount = 0;
-    for (auto&& i : changes->AppendedPortions) {
+    for (auto&& i : changes->GetAppendedPortions()) {
         blobsCount += i.GetBlobs().size();
     }
     UNIT_ASSERT_VALUES_EQUAL(blobsCount, 1);   // add 2 columns: planStep, txId
 
-    AddIdsToBlobs(changes->AppendedPortions, blobs, step);
+    AddIdsToBlobs(changes->MutableAppendedPortions(), blobs, step);
 
     const bool result = engine.ApplyChangesOnTxCreate(changes, snap) && engine.ApplyChangesOnExecute(db, changes, snap);
 
@@ -394,7 +394,7 @@ bool Compact(TColumnEngineForLogs& engine, TTestDbWrapper& db, TSnapshot snap, N
     Y_ABORT_UNLESS(changes->ConstructBlobs(context).Ok());
 
     //    UNIT_ASSERT_VALUES_EQUAL(changes->AppendedPortions.size(), expected.NewPortions);
-    AddIdsToBlobs(changes->AppendedPortions, changes->Blobs, step);
+    AddIdsToBlobs(changes->MutableAppendedPortions(), changes->Blobs, step);
 
     //    UNIT_ASSERT_VALUES_EQUAL(changes->GetTmpGranuleIds().size(), expected.NewGranules);
 
@@ -404,7 +404,7 @@ bool Compact(TColumnEngineForLogs& engine, TTestDbWrapper& db, TSnapshot snap, N
     NOlap::TWriteIndexCompleteContext contextComplete(NActors::TActivationContext::AsActorContext(), 0, 0, TDuration::Zero(), engine, snap);
     changes->WriteIndexOnComplete(nullptr, contextComplete);
     if (blobsPool) {
-        for (auto&& i : changes->AppendedPortions) {
+        for (auto&& i : changes->GetAppendedPortions()) {
             for (auto&& r : i.GetPortionResult().TestGetRecords()) {
                 Y_ABORT_UNLESS(blobsPool
                                    ->emplace(i.GetPortionResult().GetPortionInfo().RestoreBlobRange(r.BlobRange),