fix

ivanmorozov333 · ivanmorozov333 · commit 42f2d99e0983 · 2024-11-08T17:42:51.000+03:00
diff --git a/ydb/core/tx/columnshard/data_accessor/abstract/constructor.h b/ydb/core/tx/columnshard/data_accessor/abstract/constructor.h
@@ -21,7 +21,7 @@ class IManagerConstructor {
     using TProto = NKikimrSchemeOp::TMetadataManagerConstructorContainer;
 
 private:
-    virtual std::shared_ptr<IMetadataMemoryManager> DoBuild(const TManagerConstructionContext& context) const = 0;
+    virtual TConclusion<std::shared_ptr<IMetadataMemoryManager>> DoBuild(const TManagerConstructionContext& context) const = 0;
     virtual bool DoDeserializeFromProto(const TProto& proto) = 0;
     virtual void DoSerializeToProto(TProto& proto) const = 0;
     virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& jsonInfo) = 0;
@@ -44,7 +44,7 @@ class IManagerConstructor {
         DoSerializeToProto(proto);
     }
 
-    std::shared_ptr<IMetadataMemoryManager> Build(const TManagerConstructionContext& context) {
+    TConclusion<std::shared_ptr<IMetadataMemoryManager>> Build(const TManagerConstructionContext& context) {
         return DoBuild(context);
     }
 };
diff --git a/ydb/core/tx/columnshard/data_accessor/in_mem/constructor.cpp b/ydb/core/tx/columnshard/data_accessor/in_mem/constructor.cpp
@@ -3,9 +3,8 @@
 
 namespace NKikimr::NOlap::NDataAccessorControl::NInMem {
 
-std::shared_ptr<IMetadataMemoryManager> TManagerConstructor::DoBuild(
-    const TManagerConstructionContext& /*context*/) const {
+TConclusion<std::shared_ptr<IMetadataMemoryManager>> TManagerConstructor::DoBuild(const TManagerConstructionContext& /*context*/) const {
     return std::make_shared<TManager>();
 }
 
-}
+}   // namespace NKikimr::NOlap::NDataAccessorControl::NInMem
diff --git a/ydb/core/tx/columnshard/data_accessor/in_mem/constructor.h b/ydb/core/tx/columnshard/data_accessor/in_mem/constructor.h
@@ -10,7 +10,7 @@ class TManagerConstructor: public IManagerConstructor {
     }
 
 private:
-    virtual std::shared_ptr<IMetadataMemoryManager> DoBuild(const TManagerConstructionContext& context) const override;
+    virtual TConclusion<std::shared_ptr<IMetadataMemoryManager>> DoBuild(const TManagerConstructionContext& context) const override;
     virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& /*jsonValue*/) override {
         return TConclusionStatus::Success();
     }
diff --git a/ydb/core/tx/columnshard/data_accessor/local_db/constructor.cpp b/ydb/core/tx/columnshard/data_accessor/local_db/constructor.cpp
@@ -3,9 +3,8 @@
 
 namespace NKikimr::NOlap::NDataAccessorControl::NLocalDB {
 
-std::shared_ptr<IMetadataMemoryManager> TManagerConstructor::DoBuild(
-    const TManagerConstructionContext& context) const {
+TConclusion<std::shared_ptr<IMetadataMemoryManager>> TManagerConstructor::DoBuild(const TManagerConstructionContext& context) const {
     return std::make_shared<TManager>(context.GetTabletActorId());
 }
 
-}
+}   // namespace NKikimr::NOlap::NDataAccessorControl::NLocalDB
diff --git a/ydb/core/tx/columnshard/data_accessor/local_db/constructor.h b/ydb/core/tx/columnshard/data_accessor/local_db/constructor.h
@@ -10,7 +10,7 @@ class TManagerConstructor: public IManagerConstructor {
     }
 
 private:
-    virtual std::shared_ptr<IMetadataMemoryManager> DoBuild(const TManagerConstructionContext& context) const override;
+    virtual TConclusion<std::shared_ptr<IMetadataMemoryManager>> DoBuild(const TManagerConstructionContext& context) const override;
     virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& /*jsonValue*/) override {
         return TConclusionStatus::Success();
     }
diff --git a/ydb/core/tx/columnshard/data_sharing/common/session/common.cpp b/ydb/core/tx/columnshard/data_sharing/common/session/common.cpp
@@ -19,15 +19,15 @@ TConclusionStatus TCommonSession::TryStart(NColumnShard::TColumnShard& shard) {
 
     AFL_VERIFY(!!LockGuard);
     const auto& index = shard.GetIndexAs<TColumnEngineForLogs>();
-    THashMap<ui64, std::vector<TPortionDataAccessor>> portionsByPath;
+    THashMap<ui64, std::vector<TPortionInfo::TConstPtr>> portionsByPath;
     THashSet<TString> StoragesIds;
     for (auto&& i : GetPathIdsForStart()) {
         const auto& g = index.GetGranuleVerified(i);
         for (auto&& p : g.GetPortionsOlderThenSnapshot(GetSnapshotBarrier())) {
             if (shard.GetDataLocksManager()->IsLocked(*p.second, { "sharing_session:" + GetSessionId() })) {
                 return TConclusionStatus::Fail("failed to start cursor: portion is locked");
             }
-//            portionsByPath[i].emplace_back(p.second);
+            portionsByPath[i].emplace_back(p.second);
         }
     }
 
diff --git a/ydb/core/tx/columnshard/data_sharing/common/session/common.h b/ydb/core/tx/columnshard/data_sharing/common/session/common.h
@@ -44,7 +44,7 @@ class TCommonSession {
 
 protected:
     TTransferContext TransferContext;
-    virtual TConclusionStatus DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) = 0;
+    virtual TConclusionStatus DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) = 0;
     virtual THashSet<ui64> GetPathIdsForStart() const = 0;
 
 public:
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/session/destination.cpp b/ydb/core/tx/columnshard/data_sharing/destination/session/destination.cpp
@@ -161,7 +161,7 @@ NKikimr::TConclusionStatus TDestinationSession::DeserializeCursorFromProto(
 }
 
 TConclusionStatus TDestinationSession::DoStart(
-    NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) {
+    NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) {
     AFL_VERIFY(IsConfirmed());
     NYDBTest::TControllers::GetColumnShardController()->OnDataSharingStarted(shard.TabletID(), GetSessionId());
     THashMap<TString, THashSet<TUnifiedBlobId>> local;
diff --git a/ydb/core/tx/columnshard/data_sharing/destination/session/destination.h b/ydb/core/tx/columnshard/data_sharing/destination/session/destination.h
@@ -79,7 +79,8 @@ class TDestinationSession: public TCommonSession {
     THashMap<TString, THashSet<TUnifiedBlobId>> CurrentBlobIds;
 
 protected:
-    virtual TConclusionStatus DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) override;
+    virtual TConclusionStatus DoStart(
+        NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) override;
     virtual THashSet<ui64> GetPathIdsForStart() const override {
         THashSet<ui64> result;
         for (auto&& i : PathIds) {
diff --git a/ydb/core/tx/columnshard/data_sharing/source/session/source.cpp b/ydb/core/tx/columnshard/data_sharing/source/session/source.cpp
@@ -110,7 +110,7 @@ void TSourceSession::StartCursor(const NColumnShard::TColumnShard& shard, THashM
     ActualizeDestination(shard, shard.GetDataLocksManager());
 }
 
-TConclusionStatus TSourceSession::DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) {
+TConclusionStatus TSourceSession::DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) {
     shard.Execute(new TTxStartSourceCursor(this, &shard, std::move(portions), "start_source_cursor"));
     return TConclusionStatus::Success();
 }
diff --git a/ydb/core/tx/columnshard/data_sharing/source/session/source.h b/ydb/core/tx/columnshard/data_sharing/source/session/source.h
@@ -22,7 +22,8 @@ class TSourceSession: public TCommonSession {
     TTabletId DestinationTabletId = TTabletId(0);
 
 protected:
-    virtual TConclusionStatus DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) override;
+    virtual TConclusionStatus DoStart(
+        NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) override;
     virtual THashSet<ui64> GetPathIdsForStart() const override {
         THashSet<ui64> result;
         for (auto&& i : PathIds) {

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace NKikimr::NOlap::NDataAccessorControl::NInMem {`
`5`	`5`
`6`		`-std::shared_ptr<IMetadataMemoryManager> TManagerConstructor::DoBuild(`
`7`		`- const TManagerConstructionContext& /context/) const {`
	`6`	`+TConclusion<std::shared_ptr<IMetadataMemoryManager>> TManagerConstructor::DoBuild(const TManagerConstructionContext& /context/) const {`
`8`	`7`	`return std::make_shared<TManager>();`
`9`	`8`	`}`
`10`	`9`
`11`		`-}`
	`10`	`+} // namespace NKikimr::NOlap::NDataAccessorControl::NInMem`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class TManagerConstructor: public IManagerConstructor {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`private:`
`13`		`- virtual std::shared_ptr<IMetadataMemoryManager> DoBuild(const TManagerConstructionContext& context) const override;`
	`13`	`+ virtual TConclusion<std::shared_ptr<IMetadataMemoryManager>> DoBuild(const TManagerConstructionContext& context) const override;`
`14`	`14`	`virtual TConclusionStatus DoDeserializeFromJson(const NJson::TJsonValue& /jsonValue/) override {`
`15`	`15`	`return TConclusionStatus::Success();`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,15 @@ TConclusionStatus TCommonSession::TryStart(NColumnShard::TColumnShard& shard) {`
`19`	`19`
`20`	`20`	`AFL_VERIFY(!!LockGuard);`
`21`	`21`	`const auto& index = shard.GetIndexAs<TColumnEngineForLogs>();`
`22`		`- THashMap<ui64, std::vector<TPortionDataAccessor>> portionsByPath;`
	`22`	`+ THashMap<ui64, std::vector<TPortionInfo::TConstPtr>> portionsByPath;`
`23`	`23`	`THashSet<TString> StoragesIds;`
`24`	`24`	`for (auto&& i : GetPathIdsForStart()) {`
`25`	`25`	`const auto& g = index.GetGranuleVerified(i);`
`26`	`26`	`for (auto&& p : g.GetPortionsOlderThenSnapshot(GetSnapshotBarrier())) {`
`27`	`27`	`if (shard.GetDataLocksManager()->IsLocked(*p.second, { "sharing_session:" + GetSessionId() })) {`
`28`	`28`	`return TConclusionStatus::Fail("failed to start cursor: portion is locked");`
`29`	`29`	`}`
`30`		`-// portionsByPath[i].emplace_back(p.second);`
	`30`	`+ portionsByPath[i].emplace_back(p.second);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ NKikimr::TConclusionStatus TDestinationSession::DeserializeCursorFromProto(`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`TConclusionStatus TDestinationSession::DoStart(`
`164`		`- NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) {`
	`164`	`+ NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) {`
`165`	`165`	`AFL_VERIFY(IsConfirmed());`
`166`	`166`	`NYDBTest::TControllers::GetColumnShardController()->OnDataSharingStarted(shard.TabletID(), GetSessionId());`
`167`	`167`	`THashMap<TString, THashSet<TUnifiedBlobId>> local;`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ void TSourceSession::StartCursor(const NColumnShard::TColumnShard& shard, THashM`
`110`	`110`	`ActualizeDestination(shard, shard.GetDataLocksManager());`
`111`	`111`	`}`
`112`	`112`
`113`		`-TConclusionStatus TSourceSession::DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionDataAccessor>>&& portions) {`
	`113`	`+TConclusionStatus TSourceSession::DoStart(NColumnShard::TColumnShard& shard, THashMap<ui64, std::vector<TPortionInfo::TConstPtr>>&& portions) {`
`114`	`114`	`shard.Execute(new TTxStartSourceCursor(this, &shard, std::move(portions), "start_source_cursor"));`
`115`	`115`	`return TConclusionStatus::Success();`
`116`	`116`	`}`