clean up

ydb-platform · Dec 9, 2024 · 240aa97 · 240aa97
1 parent 6e6a34d
commit 240aa97
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ydb/core/tx/columnshard/columnshard_impl.cpp b/ydb/core/tx/columnshard/columnshard_impl.cpp
@@ -947,7 +947,8 @@ class TCSMetadataSubscriber: public TDataAccessorsSubscriberBase, public TObject
     virtual void DoOnRequestsFinished(
         NOlap::TDataAccessorsResult&& result, std::shared_ptr<NOlap::NResourceBroker::NSubscribe::TResourcesGuard>&& guard) override {
         NActors::TActivationContext::Send(
-            TabletActorId, std::make_unique<TEvPrivate::TEvMetadataAccessorsInfo>(Processor, Generation, std::move(result), std::move(guard)));
+            TabletActorId, std::make_unique<TEvPrivate::TEvMetadataAccessorsInfo>(Processor, Generation,
+                               NOlap::NResourceBroker::NSubscribe::TResourceContainer(std::move(result), std::move(guard))));
     }
 
 public:

diff --git a/ydb/core/tx/columnshard/columnshard_private_events.h b/ydb/core/tx/columnshard/columnshard_private_events.h
@@ -93,10 +93,10 @@ struct TEvPrivate {
         }
 
         TEvMetadataAccessorsInfo(const std::shared_ptr<NOlap::IMetadataAccessorResultProcessor>& processor, const ui64 gen,
-            NOlap::TDataAccessorsResult&& result, std::shared_ptr<NOlap::NResourceBroker::NSubscribe::TResourcesGuard>&& guard)
+            NOlap::NResourceBroker::NSubscribe::TResourceContainer<NOlap::TDataAccessorsResult> result)
             : Processor(processor)
             , Generation(gen)
-            , Result({std::move(result), std::move(guard)}) {
+            , Result(std::move(result)) {
         }
     };
 

diff --git a/ydb/core/tx/columnshard/resource_subscriber/ya.make b/ydb/core/tx/columnshard/resource_subscriber/ya.make
@@ -5,6 +5,7 @@ SRCS(
     counters.cpp
     task.cpp
     events.cpp
+    container.cpp
 )
 
 PEERDIR(