fix allocation size calc

Author: swalrus1

ydb/core/tx/columnshard/engines/reader/common_reader/iterator/columns_set.h

@@ -85,6 +85,15 @@ class TColumnsSetIds {
         }
         return result;
     }
+
+    TColumnsSetIds& operator+=(const TColumnsSetIds& external) {
+        return (*this = *this + external);
+    }
+
+    TColumnsSetIds& operator-=(const TColumnsSetIds& external) {
+        return (*this = *this - external);
+    }
+
     bool IsEmpty() const {
         return ColumnIds.empty();
     }

ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetch_steps.cpp

@@ -75,10 +75,10 @@ void TAllocateMemoryStep::TFetchingStepAllocation::DoOnAllocationImpossible(cons
 
 TConclusion<bool> TAllocateMemoryStep::DoExecuteInplace(const std::shared_ptr<IDataSource>& source, const TFetchingScriptCursor& step) const {
     ui64 size = PredefinedSize.value_or(0);
-    for (auto&& i : Packs) {
-        ui32 sizeLocal = source->GetColumnsVolume(i.GetColumns().GetColumnIds(), i.GetMemType());
-        if (source->GetStageData().GetUseFilter() && i.GetMemType() != EMemType::Blob && source->GetContext()->GetReadMetadata()->HasLimit() && 
-            (HasAppData() && !AppDataVerified().ColumnShardConfig.GetUseSlicesFilter())) {
+    for (auto&& [memType, columns] : ColumnsByMemType) {
+        ui32 sizeLocal = source->GetColumnsVolume(columns.GetColumnIds(), static_cast<EMemType>(memType));
+        if (source->GetStageData().GetUseFilter() && static_cast<EMemType>(memType) != EMemType::Blob &&
+            source->GetContext()->GetReadMetadata()->HasLimit() && (HasAppData() && !AppDataVerified().ColumnShardConfig.GetUseSlicesFilter())) {
             const ui32 filtered =
                 source->GetStageData().GetFilteredCount(source->GetRecordsCount(), source->GetContext()->GetReadMetadata()->GetLimitRobust());
             if (filtered < source->GetRecordsCount()) {

ydb/core/tx/columnshard/engines/reader/common_reader/iterator/fetch_steps.h

@@ -8,18 +8,7 @@ namespace NKikimr::NOlap::NReader::NCommon {
 class TAllocateMemoryStep: public IFetchingStep {
 private:
     using TBase = IFetchingStep;
-    class TColumnsPack {
-    private:
-        YDB_READONLY_DEF(TColumnsSetIds, Columns);
-        YDB_READONLY(EMemType, MemType, EMemType::Blob);
-
-    public:
-        TColumnsPack(const TColumnsSetIds& columns, const EMemType memType)
-            : Columns(columns)
-            , MemType(memType) {
-        }
-    };
-    std::vector<TColumnsPack> Packs;
+    THashMap<ui32, TColumnsSetIds> ColumnsByMemType;
     const EStageFeaturesIndexes StageIndex;
     const std::optional<ui64> PredefinedSize;
 
@@ -50,7 +39,7 @@ class TAllocateMemoryStep: public IFetchingStep {
         if (!ids.GetColumnsCount()) {
             return;
         }
-        Packs.emplace_back(ids, memType);
+        ColumnsByMemType[(ui32)memType] += ids;
     }
     EStageFeaturesIndexes GetStage() const {
         return StageIndex;