database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +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

2
primitives/primproc/batchprimitiveprocessor.h
View File

@ -257,6 +257,7 @@ class BatchPrimitiveProcessor
int128_t max128Val;
int64_t maxVal;
};
bool cpDataFromDictScan;
uint64_t lbidForCP;
bool hasWideColumnOut;
@ -432,6 +433,7 @@ class BatchPrimitiveProcessor
uint processorThreads;
uint ptMask;
bool firstInstance;
uint64_t valuesLBID;
static const uint64_t maxResultCount = 1048576; // 2^20