Make TQueueInplace and TOneOneQueueInplace usable without an extra pointer

ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp

@@ -108,8 +108,6 @@ namespace NKikimr {
             std::shared_ptr<TVDiskSkeletonTrace> Trace;
             ui64 InternalMessageId;
 
-            TRecord() = default;
-
             TRecord(std::unique_ptr<IEventHandle> ev, TInstant now, ui32 recByteSize, const NBackpressure::TMessageId &msgId,
                     ui64 cost, TInstant deadline, NKikimrBlobStorage::EVDiskQueueId extQueueId,
                     const NBackpressure::TQueueClientId& clientId, TString name, std::shared_ptr<TVDiskSkeletonTrace> &&trace,
@@ -161,7 +159,7 @@ namespace NKikimr {
 
         private:
             const TString VDiskLogPrefix;
-            std::unique_ptr<TQueueType, TQueueType::TCleanDestructor> Queue;
+            TQueueType Queue;
             ui64 InFlightCount;
             ui64 InFlightCost;
             ui64 InFlightBytes;
@@ -203,7 +201,6 @@ namespace NKikimr {
                     ui64 maxInFlightCost,
                     TIntrusivePtr<::NMonitoring::TDynamicCounters> skeletonFrontGroup)
                 : VDiskLogPrefix(logPrefix)
-                , Queue(new TQueueType())
                 , InFlightCount(0)
                 , InFlightCost(0)
                 , InFlightBytes(0)
@@ -231,7 +228,7 @@ namespace NKikimr {
             }
 
             ui64 GetSize() const {
-                return Queue->GetSize();
+                return Queue.GetSize();
             }
 
             template<typename TFront>
@@ -240,7 +237,7 @@ namespace NKikimr {
                          NKikimrBlobStorage::EVDiskQueueId extQueueId, TFront& /*front*/,
                          const NBackpressure::TQueueClientId& clientId, std::shared_ptr<TVDiskSkeletonTrace> &&trace,
                          ui64 internalMessageId) {
-                if (!Queue->Head() && CanSendToSkeleton(cost)) {
+                if (!Queue.Head() && CanSendToSkeleton(cost)) {
                     // send to Skeleton for further processing
                     ctx.Send(converted.release());
                     ++InFlightCount;
@@ -262,8 +259,8 @@ namespace NKikimr {
                     *SkeletonFrontDelayedBytes += recByteSize;
 
                     TInstant now = TAppData::TimeProvider->Now();
-                    Queue->Push(TRecord(std::move(converted), now, recByteSize, msgId, cost, deadline, extQueueId,
-                        clientId, Name, std::move(trace), internalMessageId));
+                    Queue.Emplace(std::move(converted), now, recByteSize, msgId, cost, deadline, extQueueId,
+                        clientId, Name, std::move(trace), internalMessageId);
                 }
             }
 
@@ -276,7 +273,7 @@ namespace NKikimr {
             template <class TFront>
             void ProcessNext(const TActorContext &ctx, TFront &front, bool forceError) {
                 // we can send next element to Skeleton if any
-                while (TRecord *rec = Queue->Head()) {
+                while (TRecord *rec = Queue.Head()) {
                     const ui64 cost = rec->Cost;
                     if (CanSendToSkeleton(cost) || forceError) {
                         ui32 recByteSize = rec->ByteSize;
@@ -314,7 +311,7 @@ namespace NKikimr {
                             Msgs.emplace(rec->InternalMessageId, TMsgInfo(rec->MsgId.MsgId, ctx.Now(), std::move(rec->Trace)));
                             UpdateState();
                         }
-                        Queue->Pop();
+                        Queue.Pop();
                     } else {
                         break; // stop sending requests to skeleton
                     }

ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.cpp

@@ -55,9 +55,6 @@ namespace NKikimr {
         {}
 
         ~TEmergencyQueue() {
-            while (Queue.Head()) {
-                Queue.Pop();
-            }
         }
 
         void Push(TEvBlobStorage::TEvVMovedPatch::TPtr ev) {

ydb/core/tablet_flat/logic_redo_entry.h

@@ -11,16 +11,16 @@ namespace NRedo {
 
     struct TEntry {
         template<typename ... Args>
-        static TEntry* Create(NTable::TTxStamp stamp, TArrayRef<const ui32> affects, Args&& ... args)
+        static std::unique_ptr<TEntry> Create(NTable::TTxStamp stamp, TArrayRef<const ui32> affects, Args&& ... args)
         {
-            auto *ptr = malloc(sizeof(TEntry) + affects.size() * sizeof(ui32));
+            void* ptr = ::operator new(sizeof(TEntry) + affects.size() * sizeof(ui32));
 
-            return ::new(ptr) TEntry(stamp, affects, std::forward<Args>(args)...);
+            return std::unique_ptr<TEntry>(::new(ptr) TEntry(stamp, affects, std::forward<Args>(args)...));
         }
 
-        void operator delete (void *p)
+        void operator delete(void* p)
         {
-            free(p);
+            ::operator delete(p);
         }
 
         void Describe(IOutputStream &out) const

ydb/core/tablet_flat/logic_redo_queue.h

@@ -19,10 +19,10 @@ namespace NRedo {
     struct TQueue {
         using TStamp = NTable::TTxStamp;
         using TAffects = TArrayRef<const ui32>;
+        using TLog = TQueueInplace<std::unique_ptr<TEntry>, 4096>;
 
         TQueue(THashMap<ui32, NTable::TSnapEdge> edges)
-            : Log(new TLog)
-            , Edges(std::move(edges))
+            : Edges(std::move(edges))
         {
 
         }
@@ -45,13 +45,14 @@ namespace NRedo {
                 << " (" << Memory << " mem" << ", " << LargeGlobIdsBytes << " raw)b }";
         }
 
-        void Push(TEntry *entry)
+        void Push(std::unique_ptr<TEntry>&& entryPtr)
         {
+            TEntry* entry = entryPtr.get();
             if (bool(entry->Embedded) == bool(entry->LargeGlobId)) {
                 Y_TABLET_ERROR(NFmt::Do(*entry) << " has incorrect payload");
             }
 
-            Log->Push(entry);
+            Log.Push(std::move(entryPtr));
 
             Items++;
             Memory += entry->BytesMem();
@@ -92,15 +93,15 @@ namespace NRedo {
             for (auto &it : Overhead)
                 it.second.Clear();
 
-            auto was = std::exchange(Log, new TLog);
+            TLog was = std::exchange(Log, TLog{});
 
             Items = 0;
             Memory = 0;
             LargeGlobIdsBytes = 0;
 
             auto logos = snap.MutableNonSnapLogBodies();
 
-            while (TAutoPtr<TEntry> entry = was->Pop()) {
+            while (auto entry = was.PopDefault()) {
                 if (entry->FilterTables(Edges)) {
                     for (const auto& blobId : entry->LargeGlobId.Blobs()) {
                         LogoBlobIDFromLogoBlobID(blobId, logos->Add());
@@ -116,7 +117,7 @@ namespace NRedo {
 
                     entry->References = 0;
 
-                    Push(entry.Release());
+                    Push(std::move(entry));
                 } else {
                     Y_ENSURE(entry->References == 0);
                 }
@@ -134,9 +135,7 @@ namespace NRedo {
             return Usage;
         }
 
-        using TLog = TOneOneQueueInplace<NRedo::TEntry *, 4096>;
-
-        TAutoPtr<TLog, TLog::TPtrCleanInplaceMallocDestructor> Log;
+        TLog Log;
         THashMap<ui32, NTable::TSnapEdge> Edges;
         THashMap<ui32, TOverhead> Overhead;
         TIntrusiveList<TOverhead> Changes;