From 87981483e25a81d47c6478d36165213036e26dbe Mon Sep 17 00:00:00 2001
From: drrtuy <drrtuy@gmail.com>
Date: Tue, 25 Mar 2025 11:29:26 +0000
Subject: [PATCH] chore(compilation): to resolve unexpected boost warnings

---
 dbcon/mysql/ha_mcs.cpp        |  7 ++++---
 writeengine/shared/we_brm.cpp | 21 ++++-----------------
 writeengine/shared/we_brm.h   |  2 +-
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index 7309d5f83..82d2a9d73 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -83,10 +83,11 @@ pthread_mutex_t mcs_mutex;
   Function we use in the creation of our hash to get key.
 */
 
-static uchar* mcs_get_key(COLUMNSTORE_SHARE* share, size_t* length, my_bool not_used __attribute__((unused)))
+static uchar* mcs_get_key(void* share, size_t* length, my_bool not_used __attribute__((unused)))
 {
-  *length = share->table_name_length;
-  return (uchar*)share->table_name;
+  auto* sharePtr = reinterpret_cast<COLUMNSTORE_SHARE*>(share);
+  *length = sharePtr->table_name_length;
+  return (uchar*)sharePtr->table_name;
 }
 
 // This one is unused
diff --git a/writeengine/shared/we_brm.cpp b/writeengine/shared/we_brm.cpp
index ffc783c78..ee4df234e 100644
--- a/writeengine/shared/we_brm.cpp
+++ b/writeengine/shared/we_brm.cpp
@@ -58,7 +58,7 @@ namespace WriteEngine
 {
 BRMWrapper* volatile BRMWrapper::m_instance = NULL;
 std::atomic<bool> BRMWrapper::finishReported(false);
-boost::thread_specific_ptr<int> BRMWrapper::m_ThreadDataPtr;
+thread_local int BRMWrapper::m_brmRc = 0;
 boost::mutex BRMWrapper::m_instanceCreateMutex;
 
 bool BRMWrapper::m_useVb = true;
@@ -441,17 +441,7 @@ int BRMWrapper::saveState()
 //------------------------------------------------------------------------------
 void BRMWrapper::saveBrmRc(int brmRc)
 {
-  int* dataPtr = m_ThreadDataPtr.get();
-
-  if (dataPtr == 0)
-  {
-    dataPtr = new int(brmRc);
-    m_ThreadDataPtr.reset(dataPtr);
-  }
-  else
-  {
-    *dataPtr = brmRc;
-  }
+  m_brmRc = brmRc;
 }
 
 //------------------------------------------------------------------------------
@@ -555,13 +545,10 @@ int BRMWrapper::getTableLockInfo(uint64_t lockID, BRM::TableLockInfo* lockInfo,
 /* static */
 int BRMWrapper::getBrmRc(bool reset)
 {
-  if (m_ThreadDataPtr.get() == 0)
-    return BRM::ERR_OK;
-
-  int brmRc = *m_ThreadDataPtr;
+  int brmRc = m_brmRc;
 
   if (reset)
-    m_ThreadDataPtr.reset(new int(BRM::ERR_OK));
+    m_brmRc = static_cast<int>(BRM::ERR_OK);
 
   return brmRc;
 }
diff --git a/writeengine/shared/we_brm.h b/writeengine/shared/we_brm.h
index 59afea48f..275d930c3 100644
--- a/writeengine/shared/we_brm.h
+++ b/writeengine/shared/we_brm.h
@@ -466,7 +466,7 @@ class BRMWrapper : public WEObj
   //--------------------------------------------------------------------------
 
   static BRMWrapper* volatile m_instance;
-  static boost::thread_specific_ptr<int> m_ThreadDataPtr;
+  static thread_local int m_brmRc;
   static boost::mutex m_instanceCreateMutex;
 
   EXPORT static bool m_useVb;