database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-02 17:22:27 +03:00
Code Activity

Merge branch 'develop-1.1' into develop-1.2-merge-up-20190517

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-17 20:43:49 +01:00
parent 8afc3f85d3 4628346746
commit ea2ff9cd11
4 changed files with 105 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dmlproc/dmlproc.cpp
View File

@ -87,6 +87,8 @@ using namespace joblist;
namespace fs = boost::filesystem;
ThreadPool DMLServer::fDmlPackagepool(10, 0);
namespace
{
DistributedEngineComm* Dec;
@ -606,7 +608,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"));
@ -614,10 +616,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
@ -657,6 +658,8 @@ int main(int argc, char* argv[])
{
JobStep::jobstepThreadPool.setDebug(true);
JobStep::jobstepThreadPool.invoke(ThreadPoolMonitor(&JobStep::jobstepThreadPool));
DMLServer::fDmlPackagepool.setDebug(true);
DMLServer::fDmlPackagepool.invoke(ThreadPoolMonitor(&DMLServer::fDmlPackagepool));
}
//set ACTIVE state