database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop' into MCOL-3585

Browse Source
This commit is contained in:
Jose Rojas
2019-12-05 10:03:40 -06:00
committed by GitHub
parent 608d61feb5 207fb3f588
commit e9ee385a11
212 changed files with 2749 additions and 1805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dbcon/joblist/resourcemanager.cpp
View File

@ -80,6 +80,7 @@ ResourceManager::ResourceManager(bool runningInExeMgr) :
fJlProcessorThreadsPerScan(defaultProcessorThreadsPerScan),
fJlNumScanReceiveThreads(defaultScanReceiveThreads),
fTwNumThreads(defaultNumThreads),
fJlMaxOutstandingRequests(defaultMaxOutstandingRequests),
fHJUmMaxMemorySmallSideDistributor(fHashJoinStr,
"UmMaxMemorySmallSide",
getUintVal(fHashJoinStr, "TotalUmMaxMemorySmallSide", defaultTotalUmMemory),
@ -87,8 +88,7 @@ ResourceManager::ResourceManager(bool runningInExeMgr) :
0),
fHJPmMaxMemorySmallSideSessionMap(
getUintVal(fHashJoinStr, "PmMaxMemorySmallSide", defaultHJPmMaxMemorySmallSide)),
isExeMgr(runningInExeMgr),
fJlMaxOutstandingRequests(defaultMaxOutstandingRequests)
isExeMgr(runningInExeMgr)
{
int temp;
int configNumCores = -1;
@ -231,7 +231,7 @@ ResourceManager::ResourceManager(bool runningInExeMgr) :
fAggNumBuckets = fAggNumThreads * 4;
else
fAggNumBuckets = fConfig->uFromText(nb);
nr = fConfig->getConfig("RowAggregation", "RowAggrRowGroupsPerThread");
if (nr.empty())
@ -415,4 +415,3 @@ bool ResourceManager::getMemory(int64_t amount, boost::shared_ptr<int64_t> sessi
} //namespace