database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Revert "No boost condition (#2822)" (#2828)

Browse Source 
This reverts commit f916e64927.
This commit is contained in:
Roman Nozdrin
2023-04-22 13:49:50 +01:00
committed by GitHub
parent f916e64927
commit 4fe9cd64a3
245 changed files with 2007 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/querytele/queryteleprotoimpl.cpp
View File

@ -48,7 +48,7 @@ struct TsTeleQueue
typedef std::queue<T> TeleQueue;
TeleQueue queue;
std::mutex queueMtx;
boost::mutex queueMtx;
};
TsTeleQueue<querytele::StepTele> stQueue;
@ -56,7 +56,7 @@ TsTeleQueue<querytele::QueryTele> qtQueue;
TsTeleQueue<querytele::ImportTele> itQueue;
volatile bool isInited = false;
std::mutex initMux;
boost::mutex initMux;
std::shared_ptr<att::TSocket> fSocket;
std::shared_ptr<att::TBufferedTransport> fTransport;
@ -195,9 +195,9 @@ void log_step(const querytele::StepTele& stdata)
void TeleConsumer()
{
bool didSomeWork = false;
std::unique_lock itlk(itQueue.queueMtx, std::defer_lock);
std::unique_lock qtlk(qtQueue.queueMtx, std::defer_lock);
std::unique_lock stlk(stQueue.queueMtx, std::defer_lock);
boost::mutex::scoped_lock itlk(itQueue.queueMtx, boost::defer_lock);
boost::mutex::scoped_lock qtlk(qtQueue.queueMtx, boost::defer_lock);
boost::mutex::scoped_lock stlk(stQueue.queueMtx, boost::defer_lock);
querytele::QueryTeleServiceClient client(fProtocol);
try
@ -333,7 +333,7 @@ QueryTeleProtoImpl::QueryTeleProtoImpl(const QueryTeleServerParms& sp) : fServer
if (fServerParms.host.empty() || fServerParms.port == 0)
return;
std::unique_lock lk(initMux);
boost::mutex::scoped_lock lk(initMux);
atomicops::atomicMb();
@ -354,7 +354,7 @@ int QueryTeleProtoImpl::enqStepTele(const StepTele& stdata)
{
try
{
std::unique_lock lk(stQueue.queueMtx);
boost::mutex::scoped_lock lk(stQueue.queueMtx);
// @bug6088 - Added conditions below to always log progress SUMMARY and START messages to avoid completed
// queries showing up with progress 0
@ -391,7 +391,7 @@ int QueryTeleProtoImpl::enqQueryTele(const QueryTele& qtdata)
{
try
{
std::unique_lock lk(qtQueue.queueMtx);
boost::mutex::scoped_lock lk(qtQueue.queueMtx);
if (qtQueue.queue.size() >= MaxQueueElems)
{
@ -413,7 +413,7 @@ int QueryTeleProtoImpl::enqImportTele(const ImportTele& itdata)
{
try
{
std::unique_lock lk(itQueue.queueMtx);
boost::mutex::scoped_lock lk(itQueue.queueMtx);
if (itQueue.queue.size() >= MaxQueueElems)
{
@ -435,7 +435,7 @@ int QueryTeleProtoImpl::waitForQueues()
{
try
{
std::unique_lock lk(itQueue.queueMtx);
boost::mutex::scoped_lock lk(itQueue.queueMtx);
while (!itQueue.queue.empty())
{