Skip to content

Commit f657076

Browse files
Merge 1553851 into 22dd11e
2 parents 22dd11e + 1553851 commit f657076

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont
230230
}
231231
pathBatches.AddChunkInfo(inserted, context);
232232
}
233+
NoAppendIsCorrect = pathBatches.GetData().empty();
233234

234235
pathBatches.FinishChunksInfo();
235236

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void TChangesWithAppend::DoWriteIndexOnComplete(NColumnShard::TColumnShard* self
119119
}
120120

121121
void TChangesWithAppend::DoCompile(TFinalizationContext& context) {
122-
AFL_VERIFY(PortionsToRemove.size() + PortionsToMove.size() + AppendedPortions.size());
122+
AFL_VERIFY(PortionsToRemove.size() + PortionsToMove.size() + AppendedPortions.size() || NoAppendIsCorrect);
123123
for (auto&& i : AppendedPortions) {
124124
i.GetPortionConstructor().MutablePortionConstructor().SetPortionId(context.NextPortionId());
125125
i.GetPortionConstructor().MutablePortionConstructor().MutableMeta().SetCompactionLevel(TargetCompactionLevel.value_or(0));

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ class TChangesWithAppend: public TColumnEngineChanges {
1515
protected:
1616
std::optional<ui64> TargetCompactionLevel;
1717
TSaverContext SaverContext;
18+
bool NoAppendIsCorrect = false;
19+
std::vector<TWritePortionInfoWithBlobsResult> AppendedPortions;
20+
1821
virtual void OnDataAccessorsInitialized(const TDataAccessorsInitializationContext& /*context*/) override {
1922

2023
}
@@ -90,7 +93,6 @@ class TChangesWithAppend: public TColumnEngineChanges {
9093
}
9194
}
9295

93-
std::vector<TWritePortionInfoWithBlobsResult> AppendedPortions;
9496
virtual ui32 GetWritePortionsCount() const override {
9597
return AppendedPortions.size();
9698
}

0 commit comments

Comments
 (0)