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

Merge branch 'develop' into MCOL-4841

Browse Source 
# Conflicts:
#	exemgr/main.cpp
#	oam/etc/Columnstore.xml.singleserver
#	primitives/primproc/primproc.cpp
This commit is contained in:
david.hall
2022-06-09 10:07:26 -05:00
parent a98834e31c 2ad4ae2cd2
commit 3b6449842f
523 changed files with 32140 additions and 8380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
primitives/primproc/batchprimitiveprocessor.cpp
View File

@ -117,6 +117,7 @@ BatchPrimitiveProcessor::BatchPrimitiveProcessor()
, validCPData(false)
, minVal(MAX64)
, maxVal(MIN64)
, cpDataFromDictScan(false)
, lbidForCP(0)
, hasWideColumnOut(false)
, busyLoaderCount(0)
@ -138,6 +139,7 @@ BatchPrimitiveProcessor::BatchPrimitiveProcessor()
, processorThreads(0)
, ptMask(0)
, firstInstance(false)
, valuesLBID(0)
{
pp.setLogicalBlockMode(true);
pp.setBlockPtr((int*)blockData);
@ -167,6 +169,7 @@ BatchPrimitiveProcessor::BatchPrimitiveProcessor(ByteStream& b, double prefetch,
, validCPData(false)
, minVal(MAX64)
, maxVal(MIN64)
, cpDataFromDictScan(false)
, lbidForCP(0)
, hasWideColumnOut(false)
, busyLoaderCount(0)
@ -186,10 +189,10 @@ BatchPrimitiveProcessor::BatchPrimitiveProcessor(ByteStream& b, double prefetch,
, sockIndex(0)
, endOfJoinerRan(false)
, processorThreads(_processorThreads)
,
// processorThreads(32),
// ptMask(processorThreads - 1),
firstInstance(true)
, firstInstance(true)
, valuesLBID(0)
{
// promote processorThreads to next power of 2. also need to change the name to bucketCount or similar
processorThreads = nextPowOf2(processorThreads);
@ -2075,6 +2078,7 @@ void BatchPrimitiveProcessor::writeProjectionPreamble()
{
*serialized << (uint8_t)1;
*serialized << lbidForCP;
*serialized << ((uint8_t)cpDataFromDictScan);
if (UNLIKELY(hasWideColumnOut))
{
// PSA width
@ -2173,6 +2177,7 @@ void BatchPrimitiveProcessor::makeResponse()
{
*serialized << (uint8_t)1;
*serialized << lbidForCP;
*serialized << ((uint8_t)cpDataFromDictScan);
if (UNLIKELY(hasWideColumnOut))
{
@ -2274,6 +2279,7 @@ int BatchPrimitiveProcessor::operator()()
}
validCPData = false;
cpDataFromDictScan = false;
#ifdef PRIMPROC_STOPWATCH
stopwatch->start("BPP() execute");
execute(stopwatch);
@ -2812,4 +2818,3 @@ void BatchPrimitiveProcessor::buildVSSCache(uint32_t loopCount)
}
} // namespace primitiveprocessor
// vim:ts=4 sw=4: