diff --git a/dbcon/joblist/resourcemanager.cpp b/dbcon/joblist/resourcemanager.cpp index cbf44109f..bea05b29e 100644 --- a/dbcon/joblist/resourcemanager.cpp +++ b/dbcon/joblist/resourcemanager.cpp @@ -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; @@ -146,7 +146,7 @@ ResourceManager::ResourceManager(bool runningInExeMgr) : if (temp > defaultMaxOutstandingRequests) { fJlMaxOutstandingRequests = temp; - } + } } temp = getIntVal(fJobListStr, "NumScanReceiveThreads", -1); @@ -234,7 +234,7 @@ ResourceManager::ResourceManager(bool runningInExeMgr) : fAggNumBuckets = fAggNumThreads * 4; else fAggNumBuckets = fConfig->uFromText(nb); - + nr = fConfig->getConfig("RowAggregation", "RowAggrRowGroupsPerThread"); if (nr.empty()) @@ -418,4 +418,3 @@ bool ResourceManager::getMemory(int64_t amount, boost::shared_ptr sessi } //namespace -