rebase

Author: swalrus1

ydb/core/tx/columnshard/columnshard_impl.cpp

@@ -567,7 +567,7 @@ class TCompactionExecutor: public NOlap::NDataFetcher::IFetchCallback {
         TActorContext::AsActorContext().Send(ParentActorId, std::move(ev));
     }
 
-    virtual std::optional<ui64> GetNecessaryDataMemory(const std::shared_ptr<NOlap::NReader::NCommon::TColumnsSetIds>& columnIds,
+    virtual ui64 GetNecessaryDataMemory(const std::shared_ptr<NOlap::NReader::NCommon::TColumnsSetIds>& columnIds,
         const std::vector<NOlap::TPortionDataAccessor>& acc) const override {
         AFL_VERIFY(!columnIds);
         THashMap<ui32, ui64> memoryByColumns;

ydb/core/tx/columnshard/data_reader/fetcher.h

@@ -68,7 +68,7 @@ class TPortionsDataFetcher: TNonCopyable {
             CurrentContext.GetMemoryProcessId(), CurrentContext.GetMemoryScopeId(), CurrentContext.GetMemoryGroupId(), { task }, 0);
     }
 
-    std::optional<ui64> GetNecessaryDataMemory(
+    ui64 GetNecessaryDataMemory(
         const std::shared_ptr<NReader::NCommon::TColumnsSetIds>& columnIds, const std::vector<TPortionDataAccessor>& acc) const {
         return Callback->GetNecessaryDataMemory(columnIds, acc);
     }

ydb/core/tx/columnshard/engines/reader/plain_reader/iterator/source.h

@@ -247,9 +247,7 @@ class TPortionDataSource: public IDataSource {
     }
 
     virtual THashMap<TChunkAddress, TString> DecodeBlobAddresses(NBlobOperations::NRead::TCompositeReadBlobs&& blobsOriginal) const override {
-        auto result = GetStageData().GetPortionAccessor().DecodeBlobAddresses(blobsOriginal, Schema->GetIndexInfo());
-        AFL_VERIFY(blobsOriginal.IsEmpty())("blobs", blobsOriginal.DebugString());
-        return result;
+        return GetStageData().GetPortionAccessor().DecodeBlobAddresses(std::move(blobsOriginal), Schema->GetIndexInfo());
     }
 
     virtual ui64 GetColumnsVolume(const std::set<ui32>& columnIds, const EMemType type) const override {

ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/source.h

@@ -411,9 +411,7 @@ class TPortionDataSource: public IDataSource {
     }
 
     virtual THashMap<TChunkAddress, TString> DecodeBlobAddresses(NBlobOperations::NRead::TCompositeReadBlobs&& blobsOriginal) const override {
-        THashMap<TChunkAddress, TString> result = GetStageData().GetPortionAccessor().DecodeBlobAddresses(blobsOriginal, Schema->GetIndexInfo());
-        AFL_VERIFY(blobsOriginal.IsEmpty())("blobs", blobsOriginal.DebugString())("source", DebugJson().GetStringRobust());
-        return result;
+        return GetStageData().GetPortionAccessor().DecodeBlobAddresses(std::move(blobsOriginal), Schema->GetIndexInfo());
     }
 
     virtual ui64 GetColumnsVolume(const std::set<ui32>& columnIds, const EMemType type) const override {