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

MCOL-4791 Fix ColumnCommand fudged data type format to clearly identify CHAR vs VARCHAR

Browse Source
This commit is contained in:
Alexander Barkov
2021-07-02 12:42:03 +04:00
parent ceb73cddcd
commit e8126bede5
22 changed files with 228 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,7 @@ namespace joblist
{
ColumnCommandJL::ColumnCommandJL(const pColScanStep& scan, vector<BRM::LBID_t> lastLBID)
:colType(scan.fColType)
{
BRM::DBRM dbrm;
isScan = true;
@ -53,13 +54,11 @@ 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: ";
@ -84,6 +83,7 @@ ColumnCommandJL::ColumnCommandJL(const pColScanStep& scan, vector<BRM::LBID_t> l
}
ColumnCommandJL::ColumnCommandJL(const pColStep& step)
:colType(step.fColType)
{
BRM::DBRM dbrm;
@ -93,7 +93,6 @@ 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;
@ -101,7 +100,6 @@ ColumnCommandJL::ColumnCommandJL(const pColStep& step)
rpbShift = step.rpbShift;
OID = step.fOid;
colName = step.fName;
fIsDict = step.fIsDict;
ResourceManager* rm = ResourceManager::instance();
numDBRoots = rm->getDBRootCount();
@ -148,11 +146,7 @@ void ColumnCommandJL::createCommand(ByteStream& bs) const
cout << endl;
#endif
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;
colType.serialize(bs);
bs << BOP;
bs << filterCount;
serializeInlineVector(bs, fLastLbid);