correct tests

Author: ivanmorozov333

ydb/core/formats/arrow/common/sparsed_accessor.cpp

@@ -204,10 +204,10 @@ std::shared_ptr<arrow::Scalar> TSparsedArrayChunk::GetScalar(const ui32 index) c
 void TSparsedArray::TBuilder::AddChunk(const ui32 recordsCount, const std::shared_ptr<arrow::RecordBatch>& data) {
     AFL_VERIFY(data);
     AFL_VERIFY(recordsCount);
-    AFL_VERIFY(data->num_rows() <= recordsCount);
-    AFL_VERIFY(data->num_columns() == 2);
-    AFL_VERIFY(data->column(0)->type_id() == arrow::uint32()->id());
-    AFL_VERIFY_DEBUG(data->schema()->field(0)->name() == "index");
+    AFL_VERIFY(data->num_rows() <= recordsCount)("rows", data->num_rows())("count", recordsCount);
+    AFL_VERIFY(data->num_columns() == 2)("count", data->num_columns());
+    AFL_VERIFY(data->column(0)->type_id() == arrow::uint32()->id())("type", data->column(0)->type()->ToString());
+    AFL_VERIFY_DEBUG(data->schema()->field(0)->name() == "index")("name", data->schema()->field(0)->name());
     if (data->num_rows()) {
         auto* arr = static_cast<const arrow::UInt32Array*>(data->column(0).get());
         AFL_VERIFY(arr->Value(arr->length() - 1) < recordsCount)("val", arr->Value(arr->length() - 1))("count", recordsCount);

ydb/core/tx/columnshard/engines/changes/compaction/sparsed/logic.cpp

@@ -67,17 +67,31 @@ TSparsedMerger::TWriter::TWriter(const TColumnMergeContext& context)
 bool TSparsedMerger::TCursor::AddIndexTo(const ui32 index, TWriter& writer) {
     if (index < NextGlobalPosition) {
         return false;
+    } else if (index == NextGlobalPosition) {
+        if (index == Chunk->GetFinishPosition()) {
+            InitArrays(index);
+            if (index != NextGlobalPosition) {
+                return false;
+            }
+        }
+        writer.AddRealData(Chunk->GetColValue(), NextLocalPosition);
+        if (++NextLocalPosition < Chunk->GetNotDefaultRecordsCount()) {
+            NextGlobalPosition = CommonShift + Chunk->GetIndexUnsafeFast(NextLocalPosition);
+            return true;
+        } else {
+            NextGlobalPosition = CommonShift + Chunk->GetRecordsCount();
+            return false;
+        }
     }
     AFL_VERIFY(Chunk->GetStartPosition() <= index);
     if (Chunk->GetFinishPosition() <= index) {
         InitArrays(index);
     }
     bool found = false;
-    for (ui32 i = NextLocalPosition; i < Chunk->GetNotDefaultRecordsCount(); ++i) {
-        NextLocalPosition = i;
-        NextGlobalPosition = CommonShift + Chunk->GetIndexUnsafeFast(i);
+    for (; NextLocalPosition < Chunk->GetNotDefaultRecordsCount(); ++NextLocalPosition) {
+        NextGlobalPosition = CommonShift + Chunk->GetIndexUnsafeFast(NextLocalPosition);
         if (NextGlobalPosition == index) {
-            writer.AddRealData(Chunk->GetColValue(), i);
+            writer.AddRealData(Chunk->GetColValue(), NextLocalPosition);
             found = true;
         } else if (index < NextGlobalPosition) {
             return found;

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

@@ -160,6 +160,9 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont
         auto blobSchema = context.SchemaVersions.GetSchemaVerified(inserted.GetSchemaVersion());
         std::vector<ui32> filteredIds = inserted.GetMeta().GetSchemaSubset().Apply(blobSchema->GetIndexInfo().GetColumnIds(true));
         usageColumnIds.insert(filteredIds.begin(), filteredIds.end());
+        if (inserted.GetMeta().GetModificationType() == NEvWrite::EModificationType::Delete) {
+            usageColumnIds.emplace((ui32)IIndexInfo::ESpecialColumn::DELETE_FLAG);
+        }
         if (usageColumnIds.size() == resultSchema->GetIndexInfo().GetColumnIds(true).size()) {
             break;
         }
@@ -179,8 +182,10 @@ TConclusionStatus TInsertColumnEngineChanges::DoConstructBlobs(TConstructionCont
         }
 
         IIndexInfo::AddSnapshotColumns(*batch, inserted.GetSnapshot());
-        IIndexInfo::AddDeleteFlagsColumn(*batch, inserted.GetMeta().GetModificationType() == NEvWrite::EModificationType::Delete);
-        usageColumnIds.insert(IIndexInfo::GetSystemColumnIds().begin(), IIndexInfo::GetSystemColumnIds().end());
+        if (usageColumnIds.contains((ui32)IIndexInfo::ESpecialColumn::DELETE_FLAG)) {
+            IIndexInfo::AddDeleteFlagsColumn(*batch, inserted.GetMeta().GetModificationType() == NEvWrite::EModificationType::Delete);
+        }
+        usageColumnIds.insert(IIndexInfo::GetSnapshotColumnIds().begin(), IIndexInfo::GetSnapshotColumnIds().end());
 
         batch = resultSchema->NormalizeBatch(*blobSchema, batch, usageColumnIds).DetachResult();
         pathBatches.Add(inserted, shardingFilterCommit, batch);