"Bug#35290223 Memory used by binlog compression is not instrumented"

This reverts commit 54b2818fe1b025ee9b9e1bb6bc4cc54b2bb3eeeb.

Change-Id: If82b16652ebde2e0c951e39a078ddfdb4e15da23

Author: Slawomir Maludzinski

cmake/zstd.cmake

@@ -99,7 +99,6 @@ MACRO (MYSQL_CHECK_ZSTD)
   ENDIF()
 
   ADD_LIBRARY(ext::zstd ALIAS zstd_interface)
-  ADD_DEFINITIONS(-DWITH_ZSTD_${WITH_ZSTD})
 
   IF(ZSTD_VERSION VERSION_LESS MIN_ZSTD_VERSION_REQUIRED)
     MESSAGE(FATAL_ERROR

libbinlogevents/include/compression/base.h

@@ -27,13 +27,6 @@
 
 namespace binary_log::transaction::compression {
 
-// ZSTD version boundary below which instrumented
-// ZSTD_create[CD]Stream_advanced functions are allowed.
-// When new ZSTD versions are released and they do not
-// break prototype for ZSTD_create[CD]Stream_advanced
-// increase the number '10505' accordingly
-constexpr unsigned int ZSTD_INSTRUMENTED_BELOW_VERSION = 10505;
-
 // Todo: use enum class and a more specific name.
 // Use contiguous values.
 enum type {

libbinlogevents/include/compression/factory.h

@@ -26,18 +26,13 @@
 #include <memory>
 #include "compressor.h"
 #include "decompressor.h"
-#include "libbinlogevents/include/resource/memory_resource.h"  // Memory_resource
 
 namespace binary_log::transaction::compression {
 
 class Factory {
-  using Memory_resource_t = mysqlns::resource::Memory_resource;
-
  public:
-  static std::unique_ptr<Compressor> build_compressor(
-      type t, const Memory_resource_t &memory_resource = Memory_resource_t());
-  static std::unique_ptr<Decompressor> build_decompressor(
-      type t, const Memory_resource_t &memory_resource = Memory_resource_t());
+  static std::unique_ptr<Compressor> build_compressor(type t);
+  static std::unique_ptr<Decompressor> build_decompressor(type t);
 };
 
 }  // namespace binary_log::transaction::compression

libbinlogevents/include/compression/zstd_comp.h

@@ -23,13 +23,11 @@
 #ifndef LIBBINLOGEVENTS_COMPRESSION_ZSTD_COMP_H_
 #define LIBBINLOGEVENTS_COMPRESSION_ZSTD_COMP_H_
 
-#define ZSTD_STATIC_LINKING_ONLY 1
 #include <zstd.h>
 
 #include "compressor.h"
 #include "libbinlogevents/include/buffer/buffer_sequence_view.h"
 #include "libbinlogevents/include/nodiscard.h"
-#include "libbinlogevents/include/resource/memory_resource.h"  // Memory_resource
 
 struct ZSTD_outBuffer_s;
 
@@ -41,14 +39,13 @@ class Zstd_comp : public Compressor {
   using typename Compressor::Char_t;
   using typename Compressor::Managed_buffer_sequence_t;
   using typename Compressor::Size_t;
-  using Memory_resource_t = mysqlns::resource::Memory_resource;
   using Compression_level_t = int;
   static constexpr type type_code = ZSTD;
 
   /// The default compression level for this compressor.
   static constexpr Compression_level_t default_compression_level = 3;
 
-  Zstd_comp(const Memory_resource_t &memory_resource = Memory_resource_t());
+  Zstd_comp() = default;
 
   ~Zstd_comp() override;
 
@@ -147,14 +144,6 @@ class Zstd_comp : public Compressor {
 
   /// Compression level that was given in @c set_compression_level
   Compression_level_t m_next_compression_level{default_compression_level};
-
-  /// Instrumented memory allocator object
-  Memory_resource_t m_memory_resource;
-
-  /// ZSTD memory allocator objects and functions
-  ZSTD_customMem m_zstd_custom_mem;
-  static void *zstd_mem_res_alloc(void *opaque, size_t size);
-  static void zstd_mem_res_free(void *opaque, void *address);
 };
 
 }  // namespace binary_log::transaction::compression

libbinlogevents/include/compression/zstd_dec.h

@@ -23,12 +23,10 @@
 #ifndef LIBBINLOGEVENTS_COMPRESSION_ZSTD_DEC_H_
 #define LIBBINLOGEVENTS_COMPRESSION_ZSTD_DEC_H_
 
-#define ZSTD_STATIC_LINKING_ONLY 1
 #include <zstd.h>
 
 #include "decompressor.h"
 #include "libbinlogevents/include/nodiscard.h"
-#include "libbinlogevents/include/resource/memory_resource.h"  // Memory_resource
 
 namespace binary_log {
 namespace transaction {
@@ -40,10 +38,9 @@ class Zstd_dec : public Decompressor {
   using typename Decompressor::Char_t;
   using typename Decompressor::Grow_constraint_t;
   using typename Decompressor::Size_t;
-  using Memory_resource_t = mysqlns::resource::Memory_resource;
   static constexpr type type_code = ZSTD;
 
-  Zstd_dec(const Memory_resource_t &memory_resource = Memory_resource_t());
+  Zstd_dec();
   ~Zstd_dec() override;
 
   Zstd_dec(const Zstd_dec &) = delete;
@@ -78,14 +75,6 @@ class Zstd_dec : public Decompressor {
   ZSTD_inBuffer m_ibuf{nullptr, 0, 0};
 
   bool m_frame_boundary = false;
-
-  /// Instrumented memory allocator object
-  Memory_resource_t m_memory_resource;
-
-  /// ZSTD memory allocator objects and functions
-  ZSTD_customMem m_zstd_custom_mem;
-  static void *zstd_mem_res_alloc(void *opaque, size_t size);
-  static void zstd_mem_res_free(void *opaque, void *address);
 };
 
 }  // namespace compression

libbinlogevents/src/compression/factory.cpp

@@ -30,11 +30,10 @@
 
 namespace binary_log::transaction::compression {
 
-std::unique_ptr<Compressor> Factory::build_compressor(
-    type t, const Memory_resource_t &memory_resource) {
+std::unique_ptr<Compressor> Factory::build_compressor(type t) {
   switch (t) {
     case ZSTD:
-      return std::make_unique<Zstd_comp>(memory_resource);
+      return std::make_unique<Zstd_comp>();
     case NONE:
       return std::make_unique<None_comp>();
     default:
@@ -43,11 +42,10 @@ std::unique_ptr<Compressor> Factory::build_compressor(
   return std::unique_ptr<Compressor>();
 }
 
-std::unique_ptr<Decompressor> Factory::build_decompressor(
-    type t, const Memory_resource_t &memory_resource) {
+std::unique_ptr<Decompressor> Factory::build_decompressor(type t) {
   switch (t) {
     case ZSTD:
-      return std::make_unique<Zstd_dec>(memory_resource);
+      return std::make_unique<Zstd_dec>();
     case NONE:
       return std::make_unique<None_dec>();
     default:

libbinlogevents/src/compression/payload_event_buffer_istream.cpp

@@ -113,8 +113,7 @@ void Payload_event_buffer_istream::set_error_str(const std::string &s) {
 
 void Payload_event_buffer_istream::initialize() {
   try {
-    m_decompressor = Factory_t::build_decompressor(m_compression_algorithm,
-                                                   m_memory_resource);
+    m_decompressor = Factory_t::build_decompressor(m_compression_algorithm);
     if (m_decompressor == nullptr) {
       set_error_str(
           concat("Unknown compression algorithm in Payload_log_event: ",

libbinlogevents/src/compression/zstd_comp.cpp

@@ -28,11 +28,6 @@
 
 namespace binary_log::transaction::compression {
 
-Zstd_comp::Zstd_comp(const Memory_resource_t &memory_resource)
-    : m_memory_resource(memory_resource),
-      m_zstd_custom_mem{zstd_mem_res_alloc, zstd_mem_res_free,
-                        static_cast<void *>(&m_memory_resource)} {}
-
 Zstd_comp::~Zstd_comp() { destroy(); }
 
 void Zstd_comp::destroy() {
@@ -211,14 +206,4 @@ Compressor::Grow_constraint_t Zstd_comp::do_get_grow_constraint_hint() const {
   return ret;
 }
 
-void *Zstd_comp::zstd_mem_res_alloc(void *opaque, size_t size) {
-  Memory_resource_t *mem_res = static_cast<Memory_resource_t *>(opaque);
-  return mem_res->allocate(size);
-}
-
-void Zstd_comp::zstd_mem_res_free(void *opaque, void *address) {
-  Memory_resource_t *mem_res = static_cast<Memory_resource_t *>(opaque);
-  mem_res->deallocate(address);
-}
-
 }  // namespace binary_log::transaction::compression

libbinlogevents/src/compression/zstd_dec.cpp

@@ -27,11 +27,7 @@
 
 namespace binary_log::transaction::compression {
 
-Zstd_dec::Zstd_dec(const Memory_resource_t &memory_resource)
-    : m_ctx{nullptr},
-      m_memory_resource{memory_resource},
-      m_zstd_custom_mem{zstd_mem_res_alloc, zstd_mem_res_free,
-                        static_cast<void *>(&m_memory_resource)} {}
+Zstd_dec::Zstd_dec() : m_ctx(nullptr) {}
 
 Zstd_dec::~Zstd_dec() { destroy(); }
 
@@ -141,14 +137,4 @@ Decompressor::Grow_constraint_t Zstd_dec::do_get_grow_constraint_hint() const {
   return ret;
 }
 
-void *Zstd_dec::zstd_mem_res_alloc(void *opaque, size_t size) {
-  Memory_resource_t *mem_res = static_cast<Memory_resource_t *>(opaque);
-  return mem_res->allocate(size);
-}
-
-void Zstd_dec::zstd_mem_res_free(void *opaque, void *address) {
-  Memory_resource_t *mem_res = static_cast<Memory_resource_t *>(opaque);
-  mem_res->deallocate(address);
-}
-
 }  // namespace binary_log::transaction::compression