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

Merge branch 'develop-1.2' into develop-merge-up-20190729

Browse Source
This commit is contained in:
Andrew Hutchings
2019-07-29 12:19:26 +01:00
parent d30745d37c 106250cbf0
commit 811909aa72
36 changed files with 366 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dmlproc/dmlproc.cpp
View File

@ -86,6 +86,8 @@ using namespace joblist;
namespace fs = boost::filesystem;
ThreadPool DMLServer::fDmlPackagepool(10, 0);
namespace
{
DistributedEngineComm* Dec;
@ -605,7 +607,7 @@ int main(int argc, char* argv[])
int temp;
int serverThreads = 10;
int serverQueueSize = 50;
int serverQueueSize = 0;
const string DMLProc("DMLProc");
temp = toInt(cf->getConfig(DMLProc, "ServerThreads"));
@ -613,10 +615,9 @@ int main(int argc, char* argv[])
if (temp > 0)
serverThreads = temp;
temp = toInt(cf->getConfig(DMLProc, "ServerQueueSize"));
if (temp > 0)
serverQueueSize = temp;
// temp = toInt(cf->getConfig(DMLProc, "ServerQueueSize"));
// if (temp > 0)
// serverQueueSize = temp;
//read and cleanup port before trying to use
try
@ -656,6 +657,8 @@ int main(int argc, char* argv[])
{
JobStep::jobstepThreadPool.setDebug(true);
JobStep::jobstepThreadPool.invoke(threadpool::ThreadPoolMonitor(&JobStep::jobstepThreadPool));
DMLServer::fDmlPackagepool.setDebug(true);
DMLServer::fDmlPackagepool.invoke(ThreadPoolMonitor(&DMLServer::fDmlPackagepool));
}
//set ACTIVE state