diff --git a/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.cpp b/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.cpp index 7a6ac46772..0a95a725cf 100644 --- a/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.cpp +++ b/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.cpp @@ -41,8 +41,9 @@ static void ob_zstd_free(void *opaque, void *address) /** * ------------------------------ObZstdCtxAllocator--------------------- */ -ObZstdCtxAllocator::ObZstdCtxAllocator() - : allocator_(ObModIds::OB_COMPRESSOR, OB_MALLOC_BIG_BLOCK_SIZE) +ObZstdCtxAllocator::ObZstdCtxAllocator(int64_t tenant_id) + : allocator_(ObModIds::OB_COMPRESSOR, OB_MALLOC_BIG_BLOCK_SIZE, + tenant_id) { } diff --git a/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.h b/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.h index 4a8b62bfeb..77361b3627 100644 --- a/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.h +++ b/deps/oblib/src/lib/compress/zstd/ob_zstd_compressor.h @@ -26,11 +26,11 @@ namespace zstd class ObZstdCtxAllocator { public: - ObZstdCtxAllocator(); + ObZstdCtxAllocator(int64_t tenant_id); virtual ~ObZstdCtxAllocator(); static ObZstdCtxAllocator &get_thread_local_instance() { - thread_local ObZstdCtxAllocator allocator; + thread_local ObZstdCtxAllocator allocator(ob_thread_tenant_id()); return allocator; } void *alloc(size_t size); diff --git a/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.cpp b/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.cpp index 2d982f400e..ff9a048dd3 100644 --- a/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.cpp +++ b/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.cpp @@ -42,8 +42,9 @@ static void ob_zstd_free(void *opaque, void *address) /** * ------------------------------ObZstdCtxAllocator--------------------- */ -ObZstdCtxAllocator::ObZstdCtxAllocator() - : allocator_(ObModIds::OB_COMPRESSOR, OB_MALLOC_BIG_BLOCK_SIZE) +ObZstdCtxAllocator::ObZstdCtxAllocator(int64_t tenant_id) + : allocator_(ObModIds::OB_COMPRESSOR, OB_MALLOC_BIG_BLOCK_SIZE, + tenant_id) { } diff --git a/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.h b/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.h index eec541a7f0..0c6be709d3 100644 --- a/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.h +++ b/deps/oblib/src/lib/compress/zstd_1_3_8/ob_zstd_compressor_1_3_8.h @@ -26,11 +26,11 @@ namespace zstd_1_3_8 class ObZstdCtxAllocator { public: - ObZstdCtxAllocator(); + ObZstdCtxAllocator(int64_t tenant_id); virtual ~ObZstdCtxAllocator(); static ObZstdCtxAllocator &get_thread_local_instance() { - thread_local ObZstdCtxAllocator allocator; + thread_local ObZstdCtxAllocator allocator(ob_thread_tenant_id()); return allocator; } void *alloc(size_t size);