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

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

4
primitives/linux-port/column.cpp
View File

@ -507,12 +507,12 @@ inline bool isMinMaxValid(const NewColRequestHeader* in)
switch (in->colType.DataType)
{
case CalpontSystemCatalog::CHAR:
return !in->colType.isDict();
return (in->colType.DataSize < 9);
case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::BLOB:
case CalpontSystemCatalog::TEXT:
return !in->colType.isDict();
return (in->colType.DataSize < 8);
case CalpontSystemCatalog::TINYINT:
case CalpontSystemCatalog::SMALLINT:

16
primitives/primproc/columncommand.cpp
View File

@ -466,6 +466,7 @@ void ColumnCommand::processResult()
void ColumnCommand::createCommand(ByteStream& bs)
{
uint8_t tmp8;
uint32_t tmp32;
bs.advance(1);
bs >> tmp8;
@ -480,7 +481,16 @@ void ColumnCommand::createCommand(ByteStream& bs)
cout << endl;
#endif
colType.unserialize(bs);
bs >> tmp8;
colType.colDataType = (execplan::CalpontSystemCatalog::ColDataType) tmp8;
bs >> tmp8;
colType.colWidth = tmp8;
bs >> tmp8;
colType.scale = tmp8;
bs >> tmp8;
colType.compressionType = tmp8;
bs >> tmp32;
colType.charsetNumber = tmp32;
bs >> BOP;
bs >> filterCount;
deserializeInlineVector(bs, lastLbid);
@ -888,7 +898,9 @@ ColumnCommand& ColumnCommand::operator=(const ColumnCommand& c)
_isScan = c._isScan;
traceFlags = c.traceFlags;
filterString = c.filterString;
colType = c.colType;
colType.colDataType = c.colType.colDataType;
colType.compressionType = c.colType.compressionType;
colType.colWidth = c.colType.colWidth;
BOP = c.BOP;
filterCount = c.filterCount;
fFilterFeeder = c.fFilterFeeder;

4
primitives/primproc/columncommand.h
View File

@ -62,7 +62,7 @@ public:
{
return filterCount;
}
const execplan::ColumnCommandDataType & getColType()
const execplan::CalpontSystemCatalog::ColType& getColType()
{
return colType;
}
@ -110,7 +110,7 @@ protected:
// we only care about the width and type fields.
//On the PM the rest is uninitialized
execplan::ColumnCommandDataType colType;
execplan::CalpontSystemCatalog::ColType colType;
private:
ColumnCommand(const ColumnCommand&);

4
primitives/primproc/filtercommand.cpp
View File

@ -246,8 +246,8 @@ SCommand FilterCommand::duplicate()
}
void FilterCommand::setColTypes(const execplan::ColumnCommandDataType& left,
const execplan::ColumnCommandDataType& right)
void FilterCommand::setColTypes(const execplan::CalpontSystemCatalog::ColType& left,
const execplan::CalpontSystemCatalog::ColType& right)
{
leftColType = left;
rightColType = right;

8
primitives/primproc/filtercommand.h
View File

@ -57,8 +57,8 @@ public:
SCommand duplicate();
void prep(int8_t outputType, bool makeAbsRids);
void setColTypes(const execplan::ColumnCommandDataType& left,
const execplan::ColumnCommandDataType& right);
void setColTypes(const execplan::CalpontSystemCatalog::ColType& left,
const execplan::CalpontSystemCatalog::ColType& right);
// operator override
bool operator==(const FilterCommand&) const;
@ -85,8 +85,8 @@ protected:
bool hasWideColumns;
// column type for null check
execplan::ColumnCommandDataType leftColType;
execplan::ColumnCommandDataType rightColType;
execplan::CalpontSystemCatalog::ColType leftColType;
execplan::CalpontSystemCatalog::ColType rightColType;
private:
// disabled copy constructor and operator