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

Fix garbage charset using ColType(int32_t colWidth_, int32_t scale_, int32_t precision_, (#2949)

Browse Source 
const ConstraintType& constraintType_, const DictOID& ddn_, int32_t colPosition_,
            int32_t compressionType_, OID columnOID_, const ColDataType& colDataType_);
This commit is contained in:
Leonid Fedorov
2023-09-06 20:01:31 +03:00
committed by GitHub
parent 931f2b36a1
commit 1c9cd9db9f
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -6146,18 +6146,6 @@ void CalpontSystemCatalog::checkSysCatVer()
} }
} }
CalpontSystemCatalog::ColType::ColType()
: constraintType(NO_CONSTRAINT)
, colPosition(-1)
, compressionType(NO_COMPRESSION)
, columnOID(0)
, autoincrement(0)
, nextvalue(0)
, cs(NULL)
{
charsetNumber = default_charset_info->number;
}
CalpontSystemCatalog::ColType::ColType(const ColType& rhs) : TypeHolderStd(rhs) CalpontSystemCatalog::ColType::ColType(const ColType& rhs) : TypeHolderStd(rhs)
{ {
constraintType = rhs.constraintType; constraintType = rhs.constraintType;

18
dbcon/execplan/calpontsystemcatalog.h
View File

@ -215,22 +215,22 @@ class CalpontSystemCatalog : public datatypes::SystemCatalog
*/ */
struct ColType : public datatypes::SystemCatalog::TypeHolderStd struct ColType : public datatypes::SystemCatalog::TypeHolderStd
{ {
ConstraintType constraintType; ConstraintType constraintType = NO_CONSTRAINT;
DictOID ddn; DictOID ddn;
NullString defaultValue; NullString defaultValue;
int32_t colPosition; // temporally put here. may need to have ColInfo struct later int32_t colPosition = -1; // temporally put here. may need to have ColInfo struct later
int32_t compressionType; int32_t compressionType = NO_COMPRESSION;
OID columnOID; OID columnOID = 0;
bool autoincrement; // set to true if SYSCOLUMN autoincrement is <20>y<EFBFBD> bool autoincrement = 0; // set to true if SYSCOLUMN autoincrement is <20>y<EFBFBD>
uint64_t nextvalue; // next autoincrement value uint64_t nextvalue = 0; // next autoincrement value
uint32_t charsetNumber; uint32_t charsetNumber = default_charset_info->number;
const CHARSET_INFO* cs; const CHARSET_INFO* cs = nullptr;
private: private:
long timeZone; long timeZone;
public: public:
ColType(); ColType() = default;
ColType(const ColType& rhs); ColType(const ColType& rhs);
ColType(int32_t colWidth_, int32_t scale_, int32_t precision_, ColType(int32_t colWidth_, int32_t scale_, int32_t precision_,
const ConstraintType& constraintType_, const DictOID& ddn_, int32_t colPosition_, const ConstraintType& constraintType_, const DictOID& ddn_, int32_t colPosition_,