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

Fixed compiler warning in resource manager.

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-12-02 15:18:42 -05:00
parent 57724e5515
commit c2aaf6cea2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dbcon/joblist/resourcemanager.cpp
View File

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