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

Revert "Merge pull request #2022 from mariadb-corporation/bar-develop-MCOL-4791"

Browse Source 
This reverts commit 4016e25e5b, reversing
changes made to 85435f6b1e.
This commit is contained in:
Gagan Goel
2021-07-13 11:06:56 +00:00
parent 90e5218c71
commit b3a560300c
22 changed files with 318 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/joblist/columncommand-jl.cpp
View File

@ -45,7 +45,6 @@ namespace joblist
{
ColumnCommandJL::ColumnCommandJL(const pColScanStep& scan, vector<BRM::LBID_t> lastLBID)
:colType(scan.fColType)
{
BRM::DBRM dbrm;
isScan = true;
@ -54,11 +53,13 @@ ColumnCommandJL::ColumnCommandJL(const pColScanStep& scan, vector<BRM::LBID_t> l
traceFlags = scan.fTraceFlags;
filterString = scan.fFilterString;
filterCount = scan.fFilterCount;
colType = scan.fColType;
BOP = scan.fBOP;
extents = scan.extents;
OID = scan.fOid;
colName = scan.fName;
rpbShift = scan.rpbShift;
fIsDict = scan.fIsDict;
fLastLbid = lastLBID;
//cout << "CCJL inherited lastlbids: ";
@ -83,7 +84,6 @@ ColumnCommandJL::ColumnCommandJL(const pColScanStep& scan, vector<BRM::LBID_t> l
}
ColumnCommandJL::ColumnCommandJL(const pColStep& step)
:colType(step.fColType)
{
BRM::DBRM dbrm;
@ -93,6 +93,7 @@ ColumnCommandJL::ColumnCommandJL(const pColStep& step)
traceFlags = step.fTraceFlags;
filterString = step.fFilterString;
filterCount = step.fFilterCount;
colType = step.fColType;
BOP = step.fBOP;
extents = step.extents;
divShift = step.divShift;
@ -100,6 +101,7 @@ ColumnCommandJL::ColumnCommandJL(const pColStep& step)
rpbShift = step.rpbShift;
OID = step.fOid;
colName = step.fName;
fIsDict = step.fIsDict;
ResourceManager* rm = ResourceManager::instance();
numDBRoots = rm->getDBRootCount();
@ -146,7 +148,11 @@ void ColumnCommandJL::createCommand(ByteStream& bs) const
cout << endl;
#endif
colType.serialize(bs);
bs << (uint8_t) colType.colDataType;
bs << (uint8_t) colType.colWidth;
bs << (uint8_t) colType.scale;
bs << (uint8_t) colType.compressionType;
bs << (uint32_t) colType.charsetNumber;
bs << BOP;
bs << filterCount;
serializeInlineVector(bs, fLastLbid);