init

Author: vitstn

ydb/library/yql/minikql/computation/mkql_block_transport.cpp

@@ -10,6 +10,11 @@ namespace NKikimr::NMiniKQL {
 
 namespace {
 
+TRope MakeReadOnlyRopeAndUntrack(const std::shared_ptr<const arrow::Buffer>& owner, const char* data, size_t size) {
+    MKQLArrowUntrack(owner->data());
+    return NYql::MakeReadOnlyRope(owner, data, size);
+}
+
 class TOwnedArrowBuffer : public arrow::Buffer {
 public:
     TOwnedArrowBuffer(TContiguousSpan span, const std::shared_ptr<const void>& owner)
@@ -76,7 +81,7 @@ void StoreNulls(const arrow::ArrayData& data, TRope& dst) {
     YQL_ENSURE(desiredOffset <= (size_t)data.offset);
     YQL_ENSURE((data.offset - desiredOffset) % 8 == 0);
     const char* nulls = data.GetValues<char>(0, 0) + (data.offset - desiredOffset) / 8;
-    dst.Insert(dst.End(), NYql::MakeReadOnlyRope(data.buffers[0], nulls, nullBytes));
+    dst.Insert(dst.End(), MakeReadOnlyRopeAndUntrack(data.buffers[0], nulls, nullBytes));
 }
 
 void LoadBufferSize(const IBlockDeserializer::TMetadataSource& metaSource, TMaybe<ui64>& result) {
@@ -205,7 +210,7 @@ class TFixedSizeBlockSerializer final : public IBlockSerializer {
         const ui64 desiredOffset = data.offset % 8;
         const char* buf = reinterpret_cast<const char*>(data.buffers[1]->data()) + (data.offset - desiredOffset) * ObjectSize;
         size_t dataBytes = ((size_t)data.length + desiredOffset) * ObjectSize;
-        dst.Insert(dst.End(), NYql::MakeReadOnlyRope(data.buffers[1], buf, dataBytes));
+        dst.Insert(dst.End(), MakeReadOnlyRopeAndUntrack(data.buffers[1], buf, dataBytes));
     }
 };
 
@@ -277,11 +282,11 @@ class TStringBlockSerializer final : public IBlockSerializer {
         const ui64 desiredOffset = data.offset % 8;
         const char* offsets = reinterpret_cast<const char*>(data.GetValues<TOffset>(1) - desiredOffset);
         size_t offsetsSize = ((size_t)data.length + 1 + desiredOffset) * sizeof(TOffset);
-        dst.Insert(dst.End(), NYql::MakeReadOnlyRope(data.buffers[1], offsets, offsetsSize));
+        dst.Insert(dst.End(), MakeReadOnlyRopeAndUntrack(data.buffers[1], offsets, offsetsSize));
 
         const char* mainData = reinterpret_cast<const char*>(data.buffers[2]->data());
         size_t mainSize = data.buffers[2]->size();
-        dst.Insert(dst.End(), NYql::MakeReadOnlyRope(data.buffers[2], mainData, mainSize));
+        dst.Insert(dst.End(), MakeReadOnlyRopeAndUntrack(data.buffers[2], mainData, mainSize));
     }
 };
 

ydb/library/yql/minikql/mkql_alloc.cpp

@@ -31,20 +31,33 @@ TAllocState::TAllocState(const TSourceLocation& location, const NKikimr::TAligne
     GetRoot()->InitLinks();
     OffloadedBlocksRoot.InitLinks();
     GlobalPAllocList.InitLinks();
+    ArrowBlocksRoot.InitLinks();
 }
 
 void TAllocState::CleanupPAllocList(TListEntry* root) {
     for (auto curr = root->Right; curr != root; ) {
         auto next = curr->Right;
         auto size = ((TMkqlPAllocHeader*)curr)->Size;
-	auto fullSize = size + sizeof(TMkqlPAllocHeader);
+        auto fullSize = size + sizeof(TMkqlPAllocHeader);
         MKQLFreeWithSize(curr, fullSize, EMemorySubPool::Default); // may free items from OffloadedBlocksRoot
         curr = next;
     }
 
     root->InitLinks();
 }
 
+void TAllocState::CleanupArrowList(TListEntry* root) {
+    for (auto curr = root->Right; curr != root; ) {
+        auto next = curr->Right;
+        auto size = ((TMkqlArrowHeader*)curr)->Size;
+        auto fullSize = size + sizeof(TMkqlArrowHeader);
+        ReleaseAlignedPage(curr, fullSize);
+        curr = next;
+    }
+
+    root->InitLinks();
+}
+
 void TAllocState::KillAllBoxed() {
     {
         const auto root = GetRoot();
@@ -72,6 +85,8 @@ void TAllocState::KillAllBoxed() {
         OffloadedBlocksRoot.InitLinks();
     }
 
+    CleanupArrowList(&ArrowBlocksRoot);
+
 #ifndef NDEBUG
     ActiveMemInfo.clear();
 #endif
@@ -230,18 +245,47 @@ void TPagedArena::Clear() noexcept {
 }
 
 void* MKQLArrowAllocate(ui64 size) {
-    return GetAlignedPage(size);
+    TAllocState* state = TlsAllocState;
+    Y_ENSURE(state);
+    auto fullSize = size + sizeof(TMkqlArrowHeader);
+    state->OffloadAlloc(fullSize);
+    auto ptr = GetAlignedPage(fullSize);
+    auto header = (TMkqlArrowHeader*)ptr;
+    header->Entry.Link(&state->ArrowBlocksRoot);
+    header->Size = size;
+    return header + 1;
 }
 
 void* MKQLArrowReallocate(const void* mem, ui64 prevSize, ui64 size) {
-    auto res = GetAlignedPage(size);
+    auto res = MKQLArrowAllocate(size);
     memcpy(res, mem, Min(prevSize, size));
-    ReleaseAlignedPage(const_cast<void*>(mem), prevSize);
+    MKQLArrowFree(mem, prevSize);
     return res;
 }
 
 void MKQLArrowFree(const void* mem, ui64 size) {
-    ReleaseAlignedPage(const_cast<void*>(mem), size);
+    auto fullSize = size + sizeof(TMkqlArrowHeader);
+    auto header = ((TMkqlArrowHeader*)mem) - 1;
+    if (!header->Entry.IsUnlinked()) {
+        TAllocState* state = TlsAllocState;
+        Y_ENSURE(state);
+        state->OffloadFree(fullSize);
+        header->Entry.Unlink();
+    }
+
+    Y_ENSURE(size == header->Size);
+    ReleaseAlignedPage(header, fullSize);
+}
+
+void MKQLArrowUntrack(const void* mem) {
+    TAllocState* state = TlsAllocState;
+    Y_ENSURE(state);
+    auto header = ((TMkqlArrowHeader*)mem) - 1;
+    if (!header->Entry.IsUnlinked()) {
+        header->Entry.Unlink();
+        auto fullSize = header->Size + sizeof(TMkqlArrowHeader);
+        state->OffloadFree(fullSize);
+    }
 }
 
 } // NMiniKQL

ydb/library/yql/minikql/mkql_alloc.h

@@ -50,6 +50,7 @@ struct TAllocState : public TAlignedPagePool
         void Link(TListEntry* root) noexcept;
         void Unlink() noexcept;
         void InitLinks() noexcept { Left = Right = this; }
+        bool IsUnlinked() const noexcept { return !Left && !Right; }
     };
 
 #ifndef NDEBUG
@@ -74,7 +75,7 @@ struct TAllocState : public TAlignedPagePool
     TListEntry OffloadedBlocksRoot;
     TListEntry GlobalPAllocList;
     TListEntry* CurrentPAllocList;
-    std::shared_ptr<std::atomic<size_t>> ArrowMemoryUsage = std::make_shared<std::atomic<size_t>>();
+    TListEntry ArrowBlocksRoot;
     void* MainContext = nullptr;
     void* CurrentContext = nullptr;
 
@@ -97,6 +98,7 @@ struct TAllocState : public TAlignedPagePool
     void InvalidateMemInfo();
     size_t GetDeallocatedInPages() const;
     static void CleanupPAllocList(TListEntry* root);
+    static void CleanupArrowList(TListEntry* root);
 
     void LockObject(::NKikimr::NUdf::TUnboxedValuePod value);
     void UnlockObject(::NKikimr::NUdf::TUnboxedValuePod value);
@@ -163,6 +165,15 @@ static_assert(sizeof(TMkqlPAllocHeader) ==
     sizeof(TAllocState::TListEntry) +
     sizeof(void*), "Padding is not allowed");
 
+constexpr size_t ArrowAlignment = 64;
+struct TMkqlArrowHeader {
+    TAllocState::TListEntry Entry;
+    ui64 Size;
+    char Padding[ArrowAlignment - sizeof(TAllocState::TListEntry) - sizeof(ui64)];
+};
+
+static_assert(sizeof(TMkqlArrowHeader) == ArrowAlignment);
+
 class TScopedAlloc {
 public:
     explicit TScopedAlloc(const TSourceLocation& location,
@@ -410,6 +421,7 @@ inline void MKQLUnregisterObject(NUdf::TBoxedValue* value) noexcept {
 void* MKQLArrowAllocate(ui64 size);
 void* MKQLArrowReallocate(const void* mem, ui64 prevSize, ui64 size);
 void MKQLArrowFree(const void* mem, ui64 size);
+void MKQLArrowUntrack(const void* mem);
 
 template <const EMemorySubPool MemoryPoolExt = EMemorySubPool::Default>
 struct TWithMiniKQLAlloc {