Merge 8ee2bd9 into 6887352

Author: ivanmorozov333

ydb/core/tx/columnshard/blobs_action/transaction/tx_blobs_written.cpp

@@ -99,7 +99,7 @@ void TTxBlobsWritingFinished::DoComplete(const TActorContext& ctx) {
                     Self->GetOperationsManager().AddEventForLock(*Self, op->GetLockId(), evWrite);
                 }
             }
-            granule.InsertPortionOnComplete(portion.GetPortionInfo().MutablePortionInfoPtr());
+            granule.InsertPortionOnComplete(portion.GetPortionInfo(), index);
         }
         if (op->GetBehaviour() == EOperationBehaviour::NoTxWrite) {
             AFL_VERIFY(CommitSnapshot);

ydb/core/tx/columnshard/columnshard__statistics.cpp

@@ -74,7 +74,9 @@ void TColumnShard::Handle(NStat::TEvStatistics::TEvStatisticsRequest::TPtr& ev,
                 }
                 AFL_VERIFY(indexMeta->GetColumnIds().size() == 1);
 
-                const std::vector<TString> data = portionInfo->GetIndexInplaceDataVerified(indexMeta->GetIndexId());
+                const std::vector<TString> data
+                //= portionInfo->GetIndexInplaceDataVerified(indexMeta->GetIndexId())
+                ;
 
                 for (const auto& sketchAsString : data) {
                     auto sketch = std::unique_ptr<TCountMinSketch>(TCountMinSketch::FromString(sketchAsString.data(), sketchAsString.size()));

ydb/core/tx/columnshard/columnshard_impl.cpp

@@ -1238,15 +1238,15 @@ class TTxAskPortionChunks: public TTransactionBase<TColumnShard> {
         for (auto&& i : PortionsByPath) {
             while (i.second.size()) {
                 auto p = i.second.back();
-                auto rowset = db.Table<NColumnShard::Schema::IndexColumnsV1>().Prefix(p->GetPathId(), p->GetPortionId()).Select();
-                NOlap::TPortionInfoConstructor constructor(*p, false, true, true);
+                std::vector<NOlap::TColumnChunkLoadContextV1> records;
+                std::vector<NOlap::TIndexChunkLoadContext> indexes;
                 {
+                    auto rowset = db.Table<NColumnShard::Schema::IndexColumnsV1>().Prefix(p->GetPathId(), p->GetPortionId()).Select();
                     if (!rowset.IsReady()) {
                         return false;
                     }
                     while (!rowset.EndOfSet()) {
-                        NOlap::TColumnChunkLoadContextV1 chunkLoadContext(rowset);
-                        constructor.LoadRecord(chunkLoadContext);
+                        records.emplace_back(NOlap::TColumnChunkLoadContextV1(rowset));
                         if (!rowset.Next()) {
                             return false;
                         }
@@ -1258,13 +1258,13 @@ class TTxAskPortionChunks: public TTransactionBase<TColumnShard> {
                         return false;
                     }
                     while (!rowset.EndOfSet()) {
-                        NOlap::TIndexChunkLoadContext chunkLoadContext(rowset, &selector);
-                        constructor.LoadIndex(chunkLoadContext);
+                        indexes.emplace_back(NOlap::TIndexChunkLoadContext(rowset, &selector));
                         if (!rowset.Next()) {
                             return false;
                         }
                     }
                 }
+                NOlap::TPortionInfoConstructor constructor = NOlap::TPortionInfoConstructor::BuildForLoading(p, std::move(records), std::move(indexes));
                 Accessors[i.first].emplace_back(constructor.Build(true));
                 i.second.pop_back();
             }

ydb/core/tx/columnshard/counters/portions.cpp

@@ -30,7 +30,6 @@ void TSimplePortionsGroupInfo::AddPortion(const TPortionInfo& p) {
     RawBytes += p.GetTotalRawBytes();
     Count += 1;
     RecordsCount += p.GetRecordsCount();
-    ChunksCount += p.GetChunksCount();
 }
 
 void TSimplePortionsGroupInfo::RemovePortion(const std::shared_ptr<const NOlap::TPortionInfo>& p) {
@@ -42,12 +41,10 @@ void TSimplePortionsGroupInfo::RemovePortion(const TPortionInfo& p) {
     RawBytes -= p.GetTotalRawBytes();
     Count -= 1;
     RecordsCount -= p.GetRecordsCount();
-    ChunksCount -= p.GetChunksCount();
     AFL_VERIFY(RawBytes >= 0);
     AFL_VERIFY(BlobBytes >= 0);
     AFL_VERIFY(Count >= 0);
     AFL_VERIFY(RecordsCount >= 0);
-    AFL_VERIFY(ChunksCount >= 0);
 }
 
 }   // namespace NKikimr::NOlap

ydb/core/tx/columnshard/counters/portions.h

@@ -15,7 +15,6 @@ class TSimplePortionsGroupInfo {
     YDB_READONLY(i64, RawBytes, 0);
     YDB_READONLY(i64, Count, 0);
     YDB_READONLY(i64, RecordsCount, 0);
-    YDB_READONLY(i64, ChunksCount, 0);
 
 public:
     NJson::TJsonValue SerializeToJson() const {
@@ -24,7 +23,6 @@ class TSimplePortionsGroupInfo {
         result.InsertValue("raw_bytes", RawBytes);
         result.InsertValue("count", Count);
         result.InsertValue("records_count", RecordsCount);
-        result.InsertValue("chunks_count", ChunksCount);
         return result;
     }
 
@@ -47,7 +45,6 @@ class TSimplePortionsGroupInfo {
         result.RawBytes = RawBytes + item.RawBytes;
         result.Count = Count + item.Count;
         result.RecordsCount = RecordsCount + item.RecordsCount;
-        result.ChunksCount = ChunksCount + item.ChunksCount;
         return result;
     }
 

ydb/core/tx/columnshard/data_accessor/abstract/collector.cpp

@@ -0,0 +1,5 @@
+#include "collector.h"
+
+namespace NKikimr::NOlap::NDataAccessorControl {
+
+}

ydb/core/tx/columnshard/data_accessor/abstract/collector.h

@@ -0,0 +1,32 @@
+#pragma once
+
+namespace NKikimr::NOlap::NDataAccessorControl {
+class IGranuleDataAccessor {
+private:
+    const ui64 PathId;
+
+    virtual void DoAskData(const std::shared_ptr<TDataAccessorsRequest>& request) = 0;
+    virtual void DoModifyPortions(const std::vector<TPortionDataAccessor>& add, const std::vector<ui64>& remove) = 0;
+
+public:
+    virtual ~IGranuleDataAccessor() = default;
+
+    ui64 GetPathId() const {
+        return PathId;
+    }
+
+    IGranuleDataAccessor(const ui64 pathId)
+        : PathId(pathId) {
+    }
+
+    void AskData(const std::shared_ptr<TDataAccessorsRequest>& request) {
+        AFL_VERIFY(request);
+        AFL_VERIFY(request->HasSubscriber());
+        return DoAskData(request);
+    }
+    void ModifyPortions(const std::vector<TPortionDataAccessor>& add, const std::vector<ui64>& remove) {
+        return DoModifyPortions(add, remove);
+    }
+};
+
+}   // namespace NKikimr::NOlap::NDataAccessorControl

ydb/core/tx/columnshard/data_accessor/abstract/constructor.cpp

@@ -0,0 +1,5 @@
+#include "constructor.h"
+
+namespace NKikimr::NOlap::NDataAccessorControl {
+
+}

ydb/core/tx/columnshard/data_accessor/abstract/constructor.h

@@ -0,0 +1,8 @@
+#pragma once
+
+namespace NKikimr::NOlap::NDataAccessorControl {
+class IConstructor {
+private:
+public:
+};
+}

ydb/core/tx/columnshard/data_accessor/abstract/manager.cpp

@@ -0,0 +1,5 @@
+#include "manager.h"
+
+namespace NKikimr::NOlap::NDataAccessorControl {
+
+}