1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

Merge branch 'develop' into MCOL-4841

This commit is contained in:
david.hall
2022-06-14 14:41:41 -05:00
16 changed files with 212 additions and 789 deletions

View File

@ -37,7 +37,6 @@
#include "threadpool.h"
#include "../../utils/threadpool/prioritythreadpool.h"
#include "fair_threadpool.h"
#include "messagequeue.h"
#include "blockrequestprocessor.h"
#include "batchprimitiveprocessor.h"
@ -49,7 +48,7 @@ extern oam::OamCache* oamCache;
namespace primitiveprocessor
{
extern boost::shared_ptr<threadpool::FairThreadPool> OOBPool;
extern boost::shared_ptr<threadpool::PriorityThreadPool> OOBPool;
extern dbbc::BlockRequestProcessor** BRPp;
extern BRM::DBRM* brm;
extern boost::mutex bppLock;
@ -131,7 +130,7 @@ class PrimitiveServer
/** @brief get a pointer the shared processor thread pool
*/
inline threadpool::FairThreadPool* getProcessorThreadPool() const
inline boost::shared_ptr<threadpool::PriorityThreadPool> getProcessorThreadPool() const
{
return fProcessorPool;
}
@ -168,7 +167,7 @@ class PrimitiveServer
/** @brief the thread pool used to process
* primitive commands
*/
threadpool::FairThreadPool* fProcessorPool;
boost::shared_ptr<threadpool::PriorityThreadPool> fProcessorPool;
int fServerThreads;
int fServerQueueSize;