From 4d41a945dbc626f1bd66e41360c5ba33cebb9aa6 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <rnozdrin@mariadb.com>
Date: Fri, 1 Jul 2022 13:40:53 +0000
Subject: [PATCH] This patch  removes Out-Of-Band pool from PP

---
 primitives/primproc/primitiveserver.cpp          | 12 ------------
 primitives/primproc/primitiveserver.h            |  8 --------
 primitives/primproc/primitiveserverthreadpools.h | 11 ++---------
 primitives/primproc/primproc.cpp                 |  1 -
 primitives/primproc/sqlfrontsessionthread.cpp    |  3 +--
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp
index bb7cff4b6..fffc0d971 100644
--- a/primitives/primproc/primitiveserver.cpp
+++ b/primitives/primproc/primitiveserver.cpp
@@ -124,7 +124,6 @@ oam::OamCache* oamCache = oam::OamCache::makeOamCache();
 // FIXME: there is an anon ns burried later in between 2 named namespaces...
 namespace primitiveprocessor
 {
-boost::shared_ptr<threadpool::FairThreadPool> OOBPool;
 
 BlockRequestProcessor** BRPp;
 #ifndef _MSC_VER
@@ -1236,7 +1235,6 @@ struct BPPHandler
       }
 
       fPrimitiveServerPtr->getProcessorThreadPool()->removeJobs(key);
-      OOBPool->removeJobs(key);
     }
 
     scoped.unlock();
@@ -1360,7 +1358,6 @@ struct BPPHandler
 
     scoped.unlock();
     fPrimitiveServerPtr->getProcessorThreadPool()->removeJobs(key);
-    OOBPool->removeJobs(key);
     return 0;
   }
 
@@ -1660,7 +1657,6 @@ return 0;
                             " stepID "<< stepID << endl;
     */
     fPrimitiveServerPtr->getProcessorThreadPool()->removeJobs(uniqueID);
-    OOBPool->removeJobs(uniqueID);
     lk.unlock();
     deleteDJLock(uniqueID);
     return 0;
@@ -2138,7 +2134,6 @@ struct ReadThread
                 txnId = *((uint32_t*)&buf[pos + 2]);
                 stepID = *((uint32_t*)&buf[pos + 6]);
                 uniqueID = *((uint32_t*)&buf[pos + 10]);
-                isSyscat = hdr->flags & IS_SYSCAT;
               }
               else if (ismHdr->Command == BATCH_PRIMITIVE_RUN)
               {
@@ -2154,7 +2149,6 @@ struct ReadThread
                 stepID = *((uint32_t*)&buf[pos + 6]);
                 uniqueID = *((uint32_t*)&buf[pos + 10]);
                 weight = ismHdr->Size + *((uint32_t*)&buf[pos + 18]);
-                isSyscat = bpps->isSysCat();
               }
               FairThreadPool::Job job(uniqueID, stepID, txnId, functor, outIos, weight, priority, id);
               procPoolPtr->addJob(job);
@@ -2319,12 +2313,6 @@ PrimitiveServer::PrimitiveServer(int serverThreads, int serverQueueSize, int pro
   fProcessorPool.reset(new threadpool::FairThreadPool(fProcessorWeight, highPriorityThreads,
                                                       medPriorityThreads, lowPriorityThreads, 0));
 
-  // We're not using either the priority or the job-clustering features, just need a threadpool
-  // that can reschedule jobs, and an unlimited non-blocking queue
-  OOBPool.reset(new threadpool::FairThreadPool(1, 5, 0, 0, 1));
-  // Initialize a local pointer.
-  fOOBPool = OOBPool;
-
   asyncCounter = 0;
 
   brm = new DBRM();
diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h
index eb5195eb5..79c1e20ef 100644
--- a/primitives/primproc/primitiveserver.h
+++ b/primitives/primproc/primitiveserver.h
@@ -48,7 +48,6 @@ extern oam::OamCache* oamCache;
 
 namespace primitiveprocessor
 {
-extern boost::shared_ptr<threadpool::FairThreadPool> OOBPool;
 extern dbbc::BlockRequestProcessor** BRPp;
 extern BRM::DBRM* brm;
 extern boost::mutex bppLock;
@@ -135,12 +134,6 @@ class PrimitiveServer
     return fProcessorPool;
   }
 
-  inline boost::shared_ptr<threadpool::FairThreadPool> getOOBThreadPool() const
-  {
-    return fOOBPool;
-  }
-
-  // 			int fCacheCount;
   int ReadAheadBlocks() const
   {
     return fReadAheadBlocks;
@@ -173,7 +166,6 @@ class PrimitiveServer
    * primitive commands
    */
   boost::shared_ptr<threadpool::FairThreadPool> fProcessorPool;
-  boost::shared_ptr<threadpool::FairThreadPool> fOOBPool;
 
   int fServerThreads;
   int fServerQueueSize;
diff --git a/primitives/primproc/primitiveserverthreadpools.h b/primitives/primproc/primitiveserverthreadpools.h
index 9c0a95a08..db23d290c 100644
--- a/primitives/primproc/primitiveserverthreadpools.h
+++ b/primitives/primproc/primitiveserverthreadpools.h
@@ -24,9 +24,8 @@ class PrimitiveServerThreadPools
 {
  public:
   PrimitiveServerThreadPools() = default;
-  PrimitiveServerThreadPools(boost::shared_ptr<threadpool::FairThreadPool> primServerThreadPool,
-                             boost::shared_ptr<threadpool::FairThreadPool> OOBThreadPool)
-   : fPrimServerThreadPool(primServerThreadPool), fOOBThreadPool(OOBThreadPool)
+  PrimitiveServerThreadPools(boost::shared_ptr<threadpool::FairThreadPool> primServerThreadPool)
+   : fPrimServerThreadPool(primServerThreadPool)
   {
   }
 
@@ -35,12 +34,6 @@ class PrimitiveServerThreadPools
     return fPrimServerThreadPool;
   }
 
-  boost::shared_ptr<threadpool::FairThreadPool> getOOBThreadPool()
-  {
-    return fOOBThreadPool;
-  }
-
  private:
   boost::shared_ptr<threadpool::FairThreadPool> fPrimServerThreadPool;
-  boost::shared_ptr<threadpool::FairThreadPool> fOOBThreadPool;
 };
diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index 599f001d7..7282c0343 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -725,7 +725,6 @@ int ServicePrimProc::Child()
 #endif
 
   primServerThreadPool = server.getProcessorThreadPool();
-  OOBThreadPool = server.getOOBThreadPool();
 
   server.start(this, startupRaceLock);
 
diff --git a/primitives/primproc/sqlfrontsessionthread.cpp b/primitives/primproc/sqlfrontsessionthread.cpp
index f3c17035b..545d10a32 100644
--- a/primitives/primproc/sqlfrontsessionthread.cpp
+++ b/primitives/primproc/sqlfrontsessionthread.cpp
@@ -520,8 +520,7 @@ namespace exemgr
       statementsRunningCount->incr(stmtCounted);
 
       PrimitiveServerThreadPools primitiveServerThreadPools(
-          ServicePrimProc::instance()->getPrimitiveServerThreadPool(),
-          ServicePrimProc::instance()->getOOBThreadPool());
+          ServicePrimProc::instance()->getPrimitiveServerThreadPool());
 
       if (tryTuples)
       {