database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +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

7
utils/funcexp/funcexp.cpp
View File

@ -22,8 +22,7 @@
*
****************************************************************************/
#include "functor_json.h"
#include <map>
#include <mutex>
#include <boost/thread/mutex.hpp>
#include "funcexp.h"
#include "functor_all.h"
@ -51,11 +50,11 @@ namespace funcexp
FuncExp* FuncExp::fInstance = 0;
/* static */
std::mutex FuncExp::fInstanceMutex;
boost::mutex FuncExp::fInstanceMutex;
FuncExp* FuncExp::instance()
{
std::unique_lock lk(fInstanceMutex);
boost::mutex::scoped_lock lk(fInstanceMutex);
if (!fInstance)
fInstance = new FuncExp();

5
utils/funcexp/funcexp.h
View File

@ -27,8 +27,7 @@
#include <string>
#include <vector>
#include <tr1/unordered_map>
#include <map>
#include <mutex>
#include <boost/thread/mutex.hpp>
#include "rowgroup.h"
#include "returnedcolumn.h"
@ -96,7 +95,7 @@ class FuncExp
private:
static FuncExp* fInstance;
static std::mutex fInstanceMutex;
static boost::mutex fInstanceMutex;
FuncMap fFuncMap;
FuncExp();
};