database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-06-06 08:21:01 +03:00
Code

MCOL-3536 collation

Browse Source
This commit is contained in:
David Hall 2020-05-26 12:42:11 -05:00
parent 11ba12f6ea
commit 06e50e0926
47 changed files with 516 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -6099,7 +6099,8 @@ CalpontSystemCatalog::ColType::ColType() :
compressionType(NO_COMPRESSION), compressionType(NO_COMPRESSION),
columnOID(0), columnOID(0),
autoincrement(0), autoincrement(0),
nextvalue(0) nextvalue(0),
cs(NULL)
{ {
charsetNumber = default_charset_info->number; charsetNumber = default_charset_info->number;
} }
@ -6118,10 +6119,16 @@ CalpontSystemCatalog::ColType::ColType(const ColType& rhs)
columnOID = rhs.columnOID; columnOID = rhs.columnOID;
autoincrement = rhs.autoincrement; autoincrement = rhs.autoincrement;
nextvalue = rhs.nextvalue; nextvalue = rhs.nextvalue;
charsetNumber = default_charset_info->number; charsetNumber = rhs.charsetNumber;
charsetNumber = default_charset_info->number; cs = rhs.cs;
} }
CHARSET_INFO* CalpontSystemCatalog::ColType::getCharset()
{
if (!cs)
cs= get_charset(charsetNumber, MYF(MY_WME));
return cs;
}
const string CalpontSystemCatalog::ColType::toString() const const string CalpontSystemCatalog::ColType::toString() const
{ {

7
dbcon/execplan/calpontsystemcatalog.h
View File

@ -48,6 +48,11 @@
#undef min #undef min
#undef max #undef max
// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;
#ifdef _MSC_VER #ifdef _MSC_VER
#define __attribute__(x) #define __attribute__(x)
#endif #endif
@ -293,9 +298,11 @@ public:
bool autoincrement; //set to true if SYSCOLUMN autoincrement is <20>y<EFBFBD> bool autoincrement; //set to true if SYSCOLUMN autoincrement is <20>y<EFBFBD>
uint64_t nextvalue; //next autoincrement value uint64_t nextvalue; //next autoincrement value
uint32_t charsetNumber; uint32_t charsetNumber;
const CHARSET_INFO* cs;
ColType(const ColType& rhs); ColType(const ColType& rhs);
CHARSET_INFO* getCharset();
// for F&E use. only serialize necessary info for now // for F&E use. only serialize necessary info for now
void serialize (messageqcpp::ByteStream& b) const void serialize (messageqcpp::ByteStream& b) const
{ {

3
dbcon/execplan/treenode.h
View File

@ -336,7 +336,7 @@ public:
fRefCount = refCount; fRefCount = refCount;
} }
// the inc and dec functions are used by connector single thread. // the inc and dec functions areparm[n]->data() used by connector single thread.
virtual void decRefCount() virtual void decRefCount()
{ {
fRefCount--; fRefCount--;
@ -458,6 +458,7 @@ public:
void charsetNumber(uint32_t cnum) void charsetNumber(uint32_t cnum)
{ {
fResultType.charsetNumber = cnum; fResultType.charsetNumber = cnum;
fOperationType.charsetNumber = cnum;
} }
protected: protected:

4
dbcon/joblist/expressionstep.cpp
View File

@ -397,8 +397,8 @@ void ExpressionStep::populateColumnInfo(SimpleColumn* sc, JobInfo& jobInfo)
//XXX use this before connector sets colType in sc correctly. //XXX use this before connector sets colType in sc correctly.
// type of pseudo column is set by connector // type of pseudo column is set by connector
if (dynamic_cast<PseudoColumn*>(sc) == NULL) // if (dynamic_cast<PseudoColumn*>(sc) == NULL)
ct = jobInfo.csc->colType(sc->oid()); // ct = jobInfo.csc->colType(sc->oid());
//X //X
if (ct.scale == 0) // keep passed original ct for decimal type if (ct.scale == 0) // keep passed original ct for decimal type

5
dbcon/joblist/groupconcat.cpp
View File

@ -211,6 +211,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG)
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
vector<pair<uint32_t, uint32_t> >::iterator i1 = (*k)->fGroupCols.begin(); vector<pair<uint32_t, uint32_t> >::iterator i1 = (*k)->fGroupCols.begin();
@ -229,6 +230,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG)
oids.push_back(projRG.getOIDs()[j->second]); oids.push_back(projRG.getOIDs()[j->second]);
keys.push_back(projRG.getKeys()[j->second]); keys.push_back(projRG.getKeys()[j->second]);
types.push_back(projRG.getColTypes()[j->second]); types.push_back(projRG.getColTypes()[j->second]);
csNums.push_back(projRG.getCharsetNumber(j->second));
scale.push_back(projRG.getScale()[j->second]); scale.push_back(projRG.getScale()[j->second]);
precision.push_back(projRG.getPrecision()[j->second]); precision.push_back(projRG.getPrecision()[j->second]);
@ -258,6 +260,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG)
oids.push_back(projRG.getOIDs()[j->second]); oids.push_back(projRG.getOIDs()[j->second]);
keys.push_back(projRG.getKeys()[j->second]); keys.push_back(projRG.getKeys()[j->second]);
types.push_back(projRG.getColTypes()[j->second]); types.push_back(projRG.getColTypes()[j->second]);
csNums.push_back(projRG.getCharsetNumber(j->second));
scale.push_back(projRG.getScale()[j->second]); scale.push_back(projRG.getScale()[j->second]);
precision.push_back(projRG.getPrecision()[j->second]); precision.push_back(projRG.getPrecision()[j->second]);
} }
@ -271,7 +274,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG)
i2++; i2++;
} }
(*k)->fRowGroup = RowGroup(oids.size(), pos, oids, keys, types, scale, precision, projRG.getStringTableThreshold(), false); (*k)->fRowGroup = RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision, projRG.getStringTableThreshold(), false);
(*k)->fMapping = makeMapping(projRG, (*k)->fRowGroup); (*k)->fMapping = makeMapping(projRG, (*k)->fRowGroup);
} }
} }

2
dbcon/joblist/jlf_common.cpp
View File

@ -196,7 +196,7 @@ TupleInfo setTupleInfo_(const CalpontSystemCatalog::ColType& ct,
{ {
//Haven't even seen the table yet, much less this col //Haven't even seen the table yet, much less this col
ti = TupleInfo(fudgeWidth(ct, col_oid), col_oid, col_key, tbl_key, ti = TupleInfo(fudgeWidth(ct, col_oid), col_oid, col_key, tbl_key,
ct.scale, ct.precision, ct.colDataType); ct.scale, ct.precision, ct.colDataType, ct.charsetNumber);
jobInfo.keyInfo->tupleInfoMap[col_key] = ti; jobInfo.keyInfo->tupleInfoMap[col_key] = ti;
jobInfo.keyInfo->colKeyToTblKey[col_key] = tbl_key; jobInfo.keyInfo->colKeyToTblKey[col_key] = tbl_key;
jobInfo.keyInfo->colKeyToTblKey[tbl_key] = tbl_key; jobInfo.keyInfo->colKeyToTblKey[tbl_key] = tbl_key;

5
dbcon/joblist/jlf_common.h
View File

@ -74,8 +74,8 @@ const int32_t CNX_EXP_TABLE_ID = 999;
struct TupleInfo struct TupleInfo
{ {
TupleInfo(uint32_t w = 0, uint32_t o = 0, uint32_t k = -1, uint32_t t = -1, uint32_t s = 0, uint32_t p = 0, TupleInfo(uint32_t w = 0, uint32_t o = 0, uint32_t k = -1, uint32_t t = -1, uint32_t s = 0, uint32_t p = 0,
execplan::CalpontSystemCatalog::ColDataType dt = execplan::CalpontSystemCatalog::BIT) : execplan::CalpontSystemCatalog::ColDataType dt = execplan::CalpontSystemCatalog::BIT, uint32_t csn = 8) :
width(w), oid(o), key(k), tkey(t), scale(s), precision(p), dtype(dt) { } width(w), oid(o), key(k), tkey(t), scale(s), precision(p), dtype(dt), csNum(csn) { }
~TupleInfo() { } ~TupleInfo() { }
uint32_t width; uint32_t width;
@ -85,6 +85,7 @@ struct TupleInfo
uint32_t scale; uint32_t scale;
uint32_t precision; uint32_t precision;
execplan::CalpontSystemCatalog::ColDataType dtype; execplan::CalpontSystemCatalog::ColDataType dtype;
uint32_t csNum; // For collations
}; };
// for compound join // for compound join

63
dbcon/joblist/jlf_tuplejoblist.cpp
View File

@ -159,13 +159,14 @@ void tupleKeyToProjectStep(uint32_t key, JobStepVector& jsv, JobInfo& jobInfo)
inline void addColumnToRG(uint32_t cid, vector<uint32_t>& pos, vector<uint32_t>& oids, inline void addColumnToRG(uint32_t cid, vector<uint32_t>& pos, vector<uint32_t>& oids,
vector<uint32_t>& keys, vector<uint32_t>& scale, vector<uint32_t>& precision, vector<uint32_t>& keys, vector<uint32_t>& scale, vector<uint32_t>& precision,
vector<CalpontSystemCatalog::ColDataType>& types, JobInfo& jobInfo) vector<CalpontSystemCatalog::ColDataType>& types, vector<uint32_t>& csNums, JobInfo& jobInfo)
{ {
TupleInfo ti(getTupleInfo(cid, jobInfo)); TupleInfo ti(getTupleInfo(cid, jobInfo));
pos.push_back(pos.back() + ti.width); pos.push_back(pos.back() + ti.width);
oids.push_back(ti.oid); oids.push_back(ti.oid);
keys.push_back(ti.key); keys.push_back(ti.key);
types.push_back(ti.dtype); types.push_back(ti.dtype);
csNums.push_back(ti.csNum);
scale.push_back(ti.scale); scale.push_back(ti.scale);
precision.push_back(ti.precision); precision.push_back(ti.precision);
} }
@ -173,19 +174,20 @@ inline void addColumnToRG(uint32_t cid, vector<uint32_t>& pos, vector<uint32_t>&
inline void addColumnInExpToRG(uint32_t cid, vector<uint32_t>& pos, vector<uint32_t>& oids, inline void addColumnInExpToRG(uint32_t cid, vector<uint32_t>& pos, vector<uint32_t>& oids,
vector<uint32_t>& keys, vector<uint32_t>& scale, vector<uint32_t>& precision, vector<uint32_t>& keys, vector<uint32_t>& scale, vector<uint32_t>& precision,
vector<CalpontSystemCatalog::ColDataType>& types, JobInfo& jobInfo) vector<CalpontSystemCatalog::ColDataType>& types, vector<uint32_t>& csNums, JobInfo& jobInfo)
{ {
if (jobInfo.keyInfo->dictKeyMap.find(cid) != jobInfo.keyInfo->dictKeyMap.end()) if (jobInfo.keyInfo->dictKeyMap.find(cid) != jobInfo.keyInfo->dictKeyMap.end())
cid = jobInfo.keyInfo->dictKeyMap[cid]; cid = jobInfo.keyInfo->dictKeyMap[cid];
if (find(keys.begin(), keys.end(), cid) == keys.end()) if (find(keys.begin(), keys.end(), cid) == keys.end())
addColumnToRG(cid, pos, oids, keys, scale, precision, types, jobInfo); addColumnToRG(cid, pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
inline void addColumnsToRG(uint32_t tid, vector<uint32_t>& pos, vector<uint32_t>& oids, inline void addColumnsToRG(uint32_t tid, vector<uint32_t>& pos, vector<uint32_t>& oids,
vector<uint32_t>& keys, vector<uint32_t>& scale, vector<uint32_t>& precision, vector<uint32_t>& keys, vector<uint32_t>& scale, vector<uint32_t>& precision,
vector<CalpontSystemCatalog::ColDataType>& types, vector<CalpontSystemCatalog::ColDataType>& types,
vector<uint32_t>& csNums,
TableInfoMap& tableInfoMap, JobInfo& jobInfo) TableInfoMap& tableInfoMap, JobInfo& jobInfo)
{ {
// -- the selected columns // -- the selected columns
@ -193,7 +195,7 @@ inline void addColumnsToRG(uint32_t tid, vector<uint32_t>& pos, vector<uint32_t>
for (unsigned i = 0; i < pjCol.size(); i++) for (unsigned i = 0; i < pjCol.size(); i++)
{ {
addColumnToRG(pjCol[i], pos, oids, keys, scale, precision, types, jobInfo); addColumnToRG(pjCol[i], pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
// -- any columns will be used in cross-table exps // -- any columns will be used in cross-table exps
@ -201,7 +203,7 @@ inline void addColumnsToRG(uint32_t tid, vector<uint32_t>& pos, vector<uint32_t>
for (unsigned i = 0; i < exp2.size(); i++) for (unsigned i = 0; i < exp2.size(); i++)
{ {
addColumnInExpToRG(exp2[i], pos, oids, keys, scale, precision, types, jobInfo); addColumnInExpToRG(exp2[i], pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
// -- any columns will be used in returned exps // -- any columns will be used in returned exps
@ -209,7 +211,7 @@ inline void addColumnsToRG(uint32_t tid, vector<uint32_t>& pos, vector<uint32_t>
for (unsigned i = 0; i < expr.size(); i++) for (unsigned i = 0; i < expr.size(); i++)
{ {
addColumnInExpToRG(expr[i], pos, oids, keys, scale, precision, types, jobInfo); addColumnInExpToRG(expr[i], pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
// -- any columns will be used in final outer join expression // -- any columns will be used in final outer join expression
@ -217,7 +219,7 @@ inline void addColumnsToRG(uint32_t tid, vector<uint32_t>& pos, vector<uint32_t>
for (unsigned i = 0; i < expo.size(); i++) for (unsigned i = 0; i < expo.size(); i++)
{ {
addColumnInExpToRG(expo[i], pos, oids, keys, scale, precision, types, jobInfo); addColumnInExpToRG(expo[i], pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
} }
@ -232,6 +234,7 @@ void constructJoinedRowGroup(RowGroup& rg, uint32_t large, uint32_t prev, bool r
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
// -- start with the join keys // -- start with the join keys
@ -242,14 +245,14 @@ void constructJoinedRowGroup(RowGroup& rg, uint32_t large, uint32_t prev, bool r
vector<uint32_t>& joinKeys = jobInfo.tableJoinMap[make_pair(large, prev)].fLeftKeys; vector<uint32_t>& joinKeys = jobInfo.tableJoinMap[make_pair(large, prev)].fLeftKeys;
for (vector<uint32_t>::iterator i = joinKeys.begin(); i != joinKeys.end(); i++) for (vector<uint32_t>::iterator i = joinKeys.begin(); i != joinKeys.end(); i++)
addColumnToRG(*i, pos, oids, keys, scale, precision, types, jobInfo); addColumnToRG(*i, pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
// -- followed by the columns in select or expression // -- followed by the columns in select or expression
for (set<uint32_t>::iterator i = tableSet.begin(); i != tableSet.end(); i++) for (set<uint32_t>::iterator i = tableSet.begin(); i != tableSet.end(); i++)
addColumnsToRG(*i, pos, oids, keys, scale, precision, types, tableInfoMap, jobInfo); addColumnsToRG(*i, pos, oids, keys, scale, precision, types, csNums, tableInfoMap, jobInfo);
RowGroup tmpRg(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup tmpRg(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
rg = tmpRg; rg = tmpRg;
} }
@ -264,12 +267,13 @@ void constructJoinedRowGroup(RowGroup& rg, set<uint32_t>& tableSet, TableInfoMap
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
for (set<uint32_t>::iterator i = tableSet.begin(); i != tableSet.end(); i++) for (set<uint32_t>::iterator i = tableSet.begin(); i != tableSet.end(); i++)
{ {
// columns in select or expression // columns in select or expression
addColumnsToRG(*i, pos, oids, keys, scale, precision, types, tableInfoMap, jobInfo); addColumnsToRG(*i, pos, oids, keys, scale, precision, types, csNums, tableInfoMap, jobInfo);
// keys to be joined if not already in the rowgroup // keys to be joined if not already in the rowgroup
vector<uint32_t>& adjList = tableInfoMap[*i].fAdjacentList; vector<uint32_t>& adjList = tableInfoMap[*i].fAdjacentList;
@ -284,13 +288,13 @@ void constructJoinedRowGroup(RowGroup& rg, set<uint32_t>& tableSet, TableInfoMap
for (vector<uint32_t>::iterator k = joinKeys.begin(); k != joinKeys.end(); k++) for (vector<uint32_t>::iterator k = joinKeys.begin(); k != joinKeys.end(); k++)
{ {
if (find(keys.begin(), keys.end(), *k) == keys.end()) if (find(keys.begin(), keys.end(), *k) == keys.end())
addColumnToRG(*k, pos, oids, keys, scale, precision, types, jobInfo); addColumnToRG(*k, pos, oids, keys, scale, precision, types, csNums, jobInfo);
} }
} }
} }
} }
RowGroup tmpRg(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup tmpRg(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
rg = tmpRg; rg = tmpRg;
} }
@ -339,6 +343,7 @@ void adjustLastStep(JobStepVector& querySteps, DeliveredTableMap& deliverySteps,
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
for (unsigned i = 0; i < v.size(); i++) for (unsigned i = 0; i < v.size(); i++)
@ -347,11 +352,12 @@ void adjustLastStep(JobStepVector& querySteps, DeliveredTableMap& deliverySteps,
oids.push_back(v[i].oid); oids.push_back(v[i].oid);
keys.push_back(v[i].key); keys.push_back(v[i].key);
types.push_back(v[i].dtype); types.push_back(v[i].dtype);
csNums.push_back(v[i].csNum);
scale.push_back(v[i].scale); scale.push_back(v[i].scale);
precision.push_back(v[i].precision); precision.push_back(v[i].precision);
} }
RowGroup rg1(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup rg1(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
// evaluate the returned/groupby expressions if any // evaluate the returned/groupby expressions if any
JobStepVector& expSteps = jobInfo.returnedExpressions; JobStepVector& expSteps = jobInfo.returnedExpressions;
@ -365,6 +371,7 @@ void adjustLastStep(JobStepVector& querySteps, DeliveredTableMap& deliverySteps,
scale.clear(); scale.clear();
precision.clear(); precision.clear();
types.clear(); types.clear();
csNums.clear();
pos.push_back(2); pos.push_back(2);
const vector<uint32_t>& keys0 = rg0->getKeys(); const vector<uint32_t>& keys0 = rg0->getKeys();
@ -377,6 +384,7 @@ void adjustLastStep(JobStepVector& querySteps, DeliveredTableMap& deliverySteps,
oids.push_back(v[i].oid); oids.push_back(v[i].oid);
keys.push_back(v[i].key); keys.push_back(v[i].key);
types.push_back(v[i].dtype); types.push_back(v[i].dtype);
csNums.push_back(v[i].csNum);
scale.push_back(v[i].scale); scale.push_back(v[i].scale);
precision.push_back(v[i].precision); precision.push_back(v[i].precision);
} }
@ -384,7 +392,7 @@ void adjustLastStep(JobStepVector& querySteps, DeliveredTableMap& deliverySteps,
// for v0.9.3.0, the output and input to the expression are in the same row // for v0.9.3.0, the output and input to the expression are in the same row
// add the returned column into the rg0 as rg01 // add the returned column into the rg0 as rg01
RowGroup rg01 = *rg0 + RowGroup(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup rg01 = *rg0 + RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
if (jobInfo.trace) cout << "Output RowGroup 01: " << rg01.toString() << endl; if (jobInfo.trace) cout << "Output RowGroup 01: " << rg01.toString() << endl;
@ -640,6 +648,7 @@ void addProjectStepsToBps(TableInfoMap::iterator& mit, BatchPrimitive* bps, JobI
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
// this psv is a copy of the project steps, the original vector in mit is not changed // this psv is a copy of the project steps, the original vector in mit is not changed
@ -730,6 +739,7 @@ void addProjectStepsToBps(TableInfoMap::iterator& mit, BatchPrimitive* bps, JobI
oids.push_back(ti.oid); oids.push_back(ti.oid);
keys.push_back(ti.key); keys.push_back(ti.key);
types.push_back(ti.dtype); types.push_back(ti.dtype);
csNums.push_back(ti.csNum);
scale.push_back(ti.scale); scale.push_back(ti.scale);
precision.push_back(ti.precision); precision.push_back(ti.precision);
} }
@ -742,12 +752,13 @@ void addProjectStepsToBps(TableInfoMap::iterator& mit, BatchPrimitive* bps, JobI
oids.push_back(ti.oid); oids.push_back(ti.oid);
keys.push_back(ti.key); keys.push_back(ti.key);
types.push_back(ti.dtype); types.push_back(ti.dtype);
csNums.push_back(ti.csNum);
scale.push_back(ti.scale); scale.push_back(ti.scale);
precision.push_back(ti.precision); precision.push_back(ti.precision);
} }
// construct RowGroup // construct RowGroup
RowGroup rg(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup rg(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
// fix the output association // fix the output association
AnyDataListSPtr spdl(new AnyDataList()); AnyDataListSPtr spdl(new AnyDataList());
@ -818,6 +829,7 @@ void addExpresssionStepsToBps(TableInfoMap::iterator& mit, SJSTEP& sjsp, JobInfo
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
vector<uint32_t> cols; vector<uint32_t> cols;
@ -854,12 +866,13 @@ void addExpresssionStepsToBps(TableInfoMap::iterator& mit, SJSTEP& sjsp, JobInfo
oids.push_back(ti.oid); oids.push_back(ti.oid);
keys.push_back(ti.key); keys.push_back(ti.key);
types.push_back(ti.dtype); types.push_back(ti.dtype);
csNums.push_back(ti.csNum);
scale.push_back(ti.scale); scale.push_back(ti.scale);
precision.push_back(ti.precision); precision.push_back(ti.precision);
} }
// construct RowGroup and add to TBPS // construct RowGroup and add to TBPS
RowGroup rg(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup rg(oids.size(), pos, oids, keys, types, scale, csNums, precision, jobInfo.stringTableThreshold);
bps->setFE1Input(rg); bps->setFE1Input(rg);
if (jobInfo.trace) cout << "FE1 input RowGroup: " << rg.toString() << endl << endl; if (jobInfo.trace) cout << "FE1 input RowGroup: " << rg.toString() << endl << endl;
@ -1025,6 +1038,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
pos.push_back(2 + 8); pos.push_back(2 + 8);
@ -1033,10 +1047,11 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
uint32_t keyId = pds->tupleId(); uint32_t keyId = pds->tupleId();
keys.push_back(keyId); keys.push_back(keyId);
types.push_back(CalpontSystemCatalog::BIGINT); types.push_back(CalpontSystemCatalog::BIGINT);
csNums.push_back(pds->colType().charsetNumber);
scale.push_back(0); scale.push_back(0);
precision.push_back(0); precision.push_back(0);
RowGroup rg(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); RowGroup rg(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
if (jobInfo.trace) cout << "RowGroup pds(and): " << rg.toString() << endl; if (jobInfo.trace) cout << "RowGroup pds(and): " << rg.toString() << endl;
@ -1341,6 +1356,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
for (unsigned i = 0; i < tis.size(); i++) for (unsigned i = 0; i < tis.size(); i++)
@ -1349,11 +1365,12 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
oids.push_back(tis[i].oid); oids.push_back(tis[i].oid);
keys.push_back(tis[i].key); keys.push_back(tis[i].key);
types.push_back(tis[i].dtype); types.push_back(tis[i].dtype);
csNums.push_back(tis[i].csNum);
scale.push_back(tis[i].scale); scale.push_back(tis[i].scale);
precision.push_back(tis[i].precision); precision.push_back(tis[i].precision);
} }
RowGroup addRg(oids.size(), pos, oids, keys, types, scale, precision, RowGroup addRg(oids.size(), pos, oids, keys, types, csNums, scale, precision,
jobInfo.stringTableThreshold); jobInfo.stringTableThreshold);
RowGroup feRg1 = feRg; RowGroup feRg1 = feRg;
@ -3985,6 +4002,7 @@ SJSTEP unionQueries(JobStepVector& queries, uint64_t distinctUnionNum, JobInfo&
vector<uint32_t> precision; vector<uint32_t> precision;
vector<uint32_t> width; vector<uint32_t> width;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
JobStepAssociation jsaToUnion; JobStepAssociation jsaToUnion;
// bug4388, share code with connector for column type coversion // bug4388, share code with connector for column type coversion
@ -4009,10 +4027,12 @@ SJSTEP unionQueries(JobStepVector& queries, uint64_t distinctUnionNum, JobInfo&
const vector<uint32_t>& scaleIn = rg.getScale(); const vector<uint32_t>& scaleIn = rg.getScale();
const vector<uint32_t>& precisionIn = rg.getPrecision(); const vector<uint32_t>& precisionIn = rg.getPrecision();
const vector<CalpontSystemCatalog::ColDataType>& typesIn = rg.getColTypes(); const vector<CalpontSystemCatalog::ColDataType>& typesIn = rg.getColTypes();
const vector<uint32_t>& csNumsIn = rg.getCharsetNumbers();
for (uint64_t j = 0; j < colCount; ++j) for (uint64_t j = 0; j < colCount; ++j)
{ {
queryColTypes[j][i].colDataType = typesIn[j]; queryColTypes[j][i].colDataType = typesIn[j];
queryColTypes[j][i].charsetNumber = csNumsIn[j];
queryColTypes[j][i].scale = scaleIn[j]; queryColTypes[j][i].scale = scaleIn[j];
queryColTypes[j][i].precision = precisionIn[j]; queryColTypes[j][i].precision = precisionIn[j];
queryColTypes[j][i].colWidth = rg.getColumnWidth(j); queryColTypes[j][i].colWidth = rg.getColumnWidth(j);
@ -4054,6 +4074,7 @@ SJSTEP unionQueries(JobStepVector& queries, uint64_t distinctUnionNum, JobInfo&
{ {
CalpontSystemCatalog::ColType colType = DataConvert::convertUnionColType(queryColTypes[j]); CalpontSystemCatalog::ColType colType = DataConvert::convertUnionColType(queryColTypes[j]);
types.push_back(colType.colDataType); types.push_back(colType.colDataType);
csNums.push_back(colType.charsetNumber);
scale.push_back(colType.scale); scale.push_back(colType.scale);
precision.push_back(colType.precision); precision.push_back(colType.precision);
width.push_back(colType.colWidth); width.push_back(colType.colWidth);
@ -4067,7 +4088,7 @@ SJSTEP unionQueries(JobStepVector& queries, uint64_t distinctUnionNum, JobInfo&
unionStep->setInputRowGroups(inputRGs); unionStep->setInputRowGroups(inputRGs);
unionStep->setDistinctFlags(distinct); unionStep->setDistinctFlags(distinct);
unionStep->setOutputRowGroup(RowGroup(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold)); unionStep->setOutputRowGroup(RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold));
// Fix for bug 4388 adjusts the result type at connector side, this workaround is obsolete. // Fix for bug 4388 adjusts the result type at connector side, this workaround is obsolete.
// bug 3067, update the returned column types. // bug 3067, update the returned column types.

6
dbcon/joblist/pdictionaryscan.cpp
View File

@ -138,7 +138,7 @@ pDictionaryScan::pDictionaryScan(
sendWaiting(false), sendWaiting(false),
ridCount(0), ridCount(0),
ridList(0), ridList(0),
colType(ct), fColType(ct),
pThread(0), pThread(0),
cThread(0), cThread(0),
fScanLbidReqLimit(jobInfo.rm->getJlScanLbidReqLimit()), fScanLbidReqLimit(jobInfo.rm->getJlScanLbidReqLimit()),
@ -505,8 +505,8 @@ void pDictionaryScan::sendAPrimitiveMessage(
hdr.COP2 = fCOP2; hdr.COP2 = fCOP2;
hdr.NVALS = fFilterCount; hdr.NVALS = fFilterCount;
hdr.Count = msgLbidCount; hdr.Count = msgLbidCount;
hdr.CompType = colType.ddn.compressionType; hdr.CompType = fColType.ddn.compressionType;
hdr.charsetNumber = colType.charsetNumber; hdr.charsetNumber = fColType.charsetNumber;
idbassert(hdr.Count > 0); idbassert(hdr.Count > 0);
if (isEquality) if (isEquality)

7
dbcon/joblist/primitivestep.h
View File

@ -960,6 +960,11 @@ public:
void appendFilter(const messageqcpp::ByteStream& filter, unsigned count); void appendFilter(const messageqcpp::ByteStream& filter, unsigned count);
virtual void abort(); virtual void abort();
const execplan::CalpontSystemCatalog::ColType& colType() const
{
return fColType;
}
protected: protected:
void sendError(uint16_t error); void sendError(uint16_t error);
@ -992,7 +997,7 @@ private:
uint32_t fLogicalBlocksPerScan; uint32_t fLogicalBlocksPerScan;
DataList<ElementType>* ridList; DataList<ElementType>* ridList;
messageqcpp::ByteStream fFilterString; messageqcpp::ByteStream fFilterString;
execplan::CalpontSystemCatalog::ColType colType; execplan::CalpontSystemCatalog::ColType fColType;
uint64_t pThread; //producer thread. thread pool handle uint64_t pThread; //producer thread. thread pool handle
uint64_t cThread; //consumer thread. thread pool handle uint64_t cThread; //consumer thread. thread pool handle
DataList_t* requestList; DataList_t* requestList;

5
dbcon/joblist/subquerytransformer.cpp
View File

@ -198,6 +198,7 @@ SJSTEP& SubQueryTransformer::makeSubQueryStep(execplan::CalpontSelectExecutionPl
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
pos.push_back(2); pos.push_back(2);
CalpontSystemCatalog::OID tblOid = fVtable.tableOid(); CalpontSystemCatalog::OID tblOid = fVtable.tableOid();
@ -229,6 +230,7 @@ SJSTEP& SubQueryTransformer::makeSubQueryStep(execplan::CalpontSelectExecutionPl
{ {
ct.colWidth = row.getColumnWidth(i); ct.colWidth = row.getColumnWidth(i);
ct.colDataType = row.getColTypes()[i]; ct.colDataType = row.getColTypes()[i];
ct.charsetNumber = row.getCharsetNumber(i);
ct.scale = row.getScale(i); ct.scale = row.getScale(i);
if (colDataTypeInRg != CalpontSystemCatalog::FLOAT && if (colDataTypeInRg != CalpontSystemCatalog::FLOAT &&
@ -268,6 +270,7 @@ SJSTEP& SubQueryTransformer::makeSubQueryStep(execplan::CalpontSelectExecutionPl
oids.push_back(ti.oid); oids.push_back(ti.oid);
keys.push_back(ti.key); keys.push_back(ti.key);
types.push_back(ti.dtype); types.push_back(ti.dtype);
csNums.push_back(ti.csNum);
scale.push_back(ti.scale); scale.push_back(ti.scale);
precision.push_back(ti.precision); precision.push_back(ti.precision);
} }
@ -276,7 +279,7 @@ SJSTEP& SubQueryTransformer::makeSubQueryStep(execplan::CalpontSelectExecutionPl
fVtable.columnType(i); fVtable.columnType(i);
} }
RowGroup rg1(oids.size(), pos, oids, keys, types, scale, precision, csep->stringTableThreshold()); RowGroup rg1(oids.size(), pos, oids, keys, types, csNums, scale, precision, csep->stringTableThreshold());
rg1.setUseStringTable(rg.usesStringTable()); rg1.setUseStringTable(rg.usesStringTable());
dynamic_cast<SubQueryStep*>(fSubQueryStep.get())->setOutputRowGroup(rg1); dynamic_cast<SubQueryStep*>(fSubQueryStep.get())->setOutputRowGroup(rg1);

143
dbcon/joblist/tupleaggregatestep.cpp
View File

@ -758,13 +758,14 @@ void TupleAggregateStep::configDeliveredRowGroup(const JobInfo& jobInfo)
vector<uint32_t>::const_iterator offsets0 = fRowGroupOut.getOffsets().begin(); vector<uint32_t>::const_iterator offsets0 = fRowGroupOut.getOffsets().begin();
vector<CalpontSystemCatalog::ColDataType>::const_iterator types0 = vector<CalpontSystemCatalog::ColDataType>::const_iterator types0 =
fRowGroupOut.getColTypes().begin(); fRowGroupOut.getColTypes().begin();
vector<uint32_t> csNums = fRowGroupOut.getCharsetNumbers();
vector<uint32_t>::const_iterator precision0 = fRowGroupOut.getPrecision().begin(); vector<uint32_t>::const_iterator precision0 = fRowGroupOut.getPrecision().begin();
fRowGroupDelivered = RowGroup(retColCount, fRowGroupDelivered = RowGroup(retColCount,
vector<uint32_t>(offsets0, offsets0 + retColCount + 1), vector<uint32_t>(offsets0, offsets0 + retColCount + 1),
vector<uint32_t>(oids.begin(), oids.begin() + retColCount), vector<uint32_t>(oids.begin(), oids.begin() + retColCount),
vector<uint32_t>(keys.begin(), keys.begin() + retColCount), vector<uint32_t>(keys.begin(), keys.begin() + retColCount),
vector<CalpontSystemCatalog::ColDataType>(types0, types0 + retColCount), vector<CalpontSystemCatalog::ColDataType>(types0, types0 + retColCount),
vector<uint32_t>(csNums.begin(), csNums.begin() + retColCount),
vector<uint32_t>(scale.begin(), scale.begin() + retColCount), vector<uint32_t>(scale.begin(), scale.begin() + retColCount),
vector<uint32_t>(precision0, precision0 + retColCount), vector<uint32_t>(precision0, precision0 + retColCount),
jobInfo.stringTableThreshold); jobInfo.stringTableThreshold);
@ -1037,6 +1038,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
const vector<uint32_t>& scaleProj = projRG.getScale(); const vector<uint32_t>& scaleProj = projRG.getScale();
const vector<uint32_t>& precisionProj = projRG.getPrecision(); const vector<uint32_t>& precisionProj = projRG.getPrecision();
const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes(); const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes();
const vector<uint32_t>& csNumProj = projRG.getCharsetNumbers();
vector<uint32_t> posAgg; vector<uint32_t> posAgg;
vector<uint32_t> oidsAgg; vector<uint32_t> oidsAgg;
@ -1044,6 +1046,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
vector<uint32_t> scaleAgg; vector<uint32_t> scaleAgg;
vector<uint32_t> precisionAgg; vector<uint32_t> precisionAgg;
vector<CalpontSystemCatalog::ColDataType> typeAgg; vector<CalpontSystemCatalog::ColDataType> typeAgg;
vector<uint32_t> csNumAgg;
vector<uint32_t> widthAgg; vector<uint32_t> widthAgg;
vector<SP_ROWAGG_GRPBY_t> groupBy; vector<SP_ROWAGG_GRPBY_t> groupBy;
vector<SP_ROWAGG_FUNC_t> functionVec; vector<SP_ROWAGG_FUNC_t> functionVec;
@ -1108,6 +1111,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(ti.scale); scaleAgg.push_back(ti.scale);
precisionAgg.push_back(ti.precision); precisionAgg.push_back(ti.precision);
typeAgg.push_back(ti.dtype); typeAgg.push_back(ti.dtype);
csNumAgg.push_back(ti.csNum);
widthAgg.push_back(ti.width); widthAgg.push_back(ti.width);
SP_ROWAGG_FUNC_t funct(new RowAggFunctionCol( SP_ROWAGG_FUNC_t funct(new RowAggFunctionCol(
aggOp, stats, 0, outIdx, jobInfo.cntStarPos)); aggOp, stats, 0, outIdx, jobInfo.cntStarPos));
@ -1126,6 +1130,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(ti.scale); scaleAgg.push_back(ti.scale);
precisionAgg.push_back(ti.precision); precisionAgg.push_back(ti.precision);
typeAgg.push_back(ti.dtype); typeAgg.push_back(ti.dtype);
csNumAgg.push_back(ti.csNum);
widthAgg.push_back(width); widthAgg.push_back(width);
SP_ROWAGG_FUNC_t funct(new RowAggFunctionCol( SP_ROWAGG_FUNC_t funct(new RowAggFunctionCol(
aggOp, stats, 0, outIdx, -1)); aggOp, stats, 0, outIdx, -1));
@ -1174,6 +1179,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(width[colProj]); widthAgg.push_back(width[colProj]);
if (groupBy[it->second]->fOutputColumnIndex == (uint32_t) - 1) if (groupBy[it->second]->fOutputColumnIndex == (uint32_t) - 1)
@ -1199,6 +1205,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(ti.scale); scaleAgg.push_back(ti.scale);
precisionAgg.push_back(ti.precision); precisionAgg.push_back(ti.precision);
typeAgg.push_back(ti.dtype); typeAgg.push_back(ti.dtype);
csNumAgg.push_back(ti.csNum);
widthAgg.push_back(ti.width); widthAgg.push_back(ti.width);
++outIdx; ++outIdx;
continue; continue;
@ -1212,6 +1219,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(width[colProj]); widthAgg.push_back(width[colProj]);
++outIdx; ++outIdx;
continue; continue;
@ -1224,6 +1232,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(width[colProj]); widthAgg.push_back(width[colProj]);
++outIdx; ++outIdx;
continue; continue;
@ -1291,7 +1300,8 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
widthAgg.push_back(width[colProj]); csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(width[colProj]);
} }
break; break;
@ -1321,6 +1331,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
oidsAgg.push_back(oidsProj[colProj]); oidsAgg.push_back(oidsProj[colProj]);
keysAgg.push_back(key); keysAgg.push_back(key);
typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAgg.push_back(csNumProj[colProj]);
precisionAgg.push_back(-1); precisionAgg.push_back(-1);
widthAgg.push_back(sizeof(long double)); widthAgg.push_back(sizeof(long double));
scaleAgg.push_back(0); scaleAgg.push_back(0);
@ -1336,6 +1347,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
// work around count() in select subquery // work around count() in select subquery
precisionAgg.push_back(9999); precisionAgg.push_back(9999);
typeAgg.push_back(CalpontSystemCatalog::UBIGINT); typeAgg.push_back(CalpontSystemCatalog::UBIGINT);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(bigIntWidth); widthAgg.push_back(bigIntWidth);
} }
break; break;
@ -1365,6 +1377,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(0); precisionAgg.push_back(0);
typeAgg.push_back(CalpontSystemCatalog::DOUBLE); typeAgg.push_back(CalpontSystemCatalog::DOUBLE);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(sizeof(double)); widthAgg.push_back(sizeof(double));
} }
break; break;
@ -1387,6 +1400,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
typeAgg.push_back(CalpontSystemCatalog::BIGINT); typeAgg.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(bigIntWidth); widthAgg.push_back(bigIntWidth);
} }
break; break;
@ -1406,6 +1420,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(udafFuncCol->fUDAFContext.getScale()); scaleAgg.push_back(udafFuncCol->fUDAFContext.getScale());
precisionAgg.push_back(udafFuncCol->fUDAFContext.getPrecision()); precisionAgg.push_back(udafFuncCol->fUDAFContext.getPrecision());
typeAgg.push_back(udafFuncCol->fUDAFContext.getResultType()); typeAgg.push_back(udafFuncCol->fUDAFContext.getResultType());
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(udafFuncCol->fUDAFContext.getColWidth()); widthAgg.push_back(udafFuncCol->fUDAFContext.getColWidth());
break; break;
} }
@ -1507,6 +1522,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
precisionAgg.push_back(0); precisionAgg.push_back(0);
precisionAgg.push_back(0); precisionAgg.push_back(0);
typeAgg.push_back(CalpontSystemCatalog::UBIGINT); typeAgg.push_back(CalpontSystemCatalog::UBIGINT);
csNumAgg.push_back(8);
widthAgg.push_back(bigUintWidth); widthAgg.push_back(bigUintWidth);
continue; continue;
} }
@ -1522,6 +1538,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(0); scaleAgg.push_back(0);
precisionAgg.push_back(-1); precisionAgg.push_back(-1);
typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAgg.push_back(8);
widthAgg.push_back(sizeof(long double)); widthAgg.push_back(sizeof(long double));
++lastCol; ++lastCol;
@ -1531,6 +1548,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
scaleAgg.push_back(0); scaleAgg.push_back(0);
precisionAgg.push_back(-1); precisionAgg.push_back(-1);
typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAgg.push_back(8);
widthAgg.push_back(sizeof(long double)); widthAgg.push_back(sizeof(long double));
++lastCol; ++lastCol;
} }
@ -1541,7 +1559,7 @@ void TupleAggregateStep::prep1PhaseAggregate(
for (uint64_t i = 0; i < oidsAgg.size(); i++) for (uint64_t i = 0; i < oidsAgg.size(); i++)
posAgg.push_back(posAgg[i] + widthAgg[i]); posAgg.push_back(posAgg[i] + widthAgg[i]);
RowGroup aggRG(oidsAgg.size(), posAgg, oidsAgg, keysAgg, typeAgg, scaleAgg, precisionAgg, RowGroup aggRG(oidsAgg.size(), posAgg, oidsAgg, keysAgg, typeAgg, csNumAgg, scaleAgg, precisionAgg,
jobInfo.stringTableThreshold); jobInfo.stringTableThreshold);
SP_ROWAGG_UM_t rowAgg(new RowAggregationUM(groupBy, functionVec, jobInfo.rm, jobInfo.umMemLimit)); SP_ROWAGG_UM_t rowAgg(new RowAggregationUM(groupBy, functionVec, jobInfo.rm, jobInfo.umMemLimit));
rowAgg->timeZone(jobInfo.timeZone); rowAgg->timeZone(jobInfo.timeZone);
@ -1588,6 +1606,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
const vector<uint32_t>& scaleProj = projRG.getScale(); const vector<uint32_t>& scaleProj = projRG.getScale();
const vector<uint32_t>& precisionProj = projRG.getPrecision(); const vector<uint32_t>& precisionProj = projRG.getPrecision();
const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes(); const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes();
const vector<uint32_t>& csNumProj = projRG.getCharsetNumbers();
vector<uint32_t> posAgg, posAggDist; vector<uint32_t> posAgg, posAggDist;
vector<uint32_t> oidsAgg, oidsAggDist; vector<uint32_t> oidsAgg, oidsAggDist;
@ -1595,6 +1614,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
vector<uint32_t> scaleAgg, scaleAggDist; vector<uint32_t> scaleAgg, scaleAggDist;
vector<uint32_t> precisionAgg, precisionAggDist; vector<uint32_t> precisionAgg, precisionAggDist;
vector<CalpontSystemCatalog::ColDataType> typeAgg, typeAggDist; vector<CalpontSystemCatalog::ColDataType> typeAgg, typeAggDist;
vector<uint32_t> csNumAgg, csNumAggDist;
vector<uint32_t> widthProj, widthAgg, widthAggDist; vector<uint32_t> widthProj, widthAgg, widthAggDist;
vector<SP_ROWAGG_GRPBY_t> groupBy, groupByNoDist; vector<SP_ROWAGG_GRPBY_t> groupBy, groupByNoDist;
vector<SP_ROWAGG_FUNC_t> functionVec1, functionVec2, functionNoDistVec; vector<SP_ROWAGG_FUNC_t> functionVec1, functionVec2, functionNoDistVec;
@ -1662,6 +1682,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(widthProj[colProj]); widthAgg.push_back(widthProj[colProj]);
aggFuncMap.insert(make_pair(boost::make_tuple(keysAgg[colAgg], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAgg)); aggFuncMap.insert(make_pair(boost::make_tuple(keysAgg[colAgg], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAgg));
@ -1703,6 +1724,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(widthProj[colProj]); widthAgg.push_back(widthProj[colProj]);
aggFuncMap.insert(make_pair(boost::make_tuple(keysAgg[colAgg], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAgg)); aggFuncMap.insert(make_pair(boost::make_tuple(keysAgg[colAgg], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAgg));
@ -1731,6 +1753,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(ti.scale); scaleAgg.push_back(ti.scale);
precisionAgg.push_back(ti.precision); precisionAgg.push_back(ti.precision);
typeAgg.push_back(ti.dtype); typeAgg.push_back(ti.dtype);
csNumAgg.push_back(ti.csNum);
widthAgg.push_back(width); widthAgg.push_back(width);
SP_ROWAGG_FUNC_t funct(new RowAggFunctionCol( SP_ROWAGG_FUNC_t funct(new RowAggFunctionCol(
aggOp, stats, colAgg, colAgg, -1)); aggOp, stats, colAgg, colAgg, -1));
@ -1824,6 +1847,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(widthProj[colProj]); widthAgg.push_back(widthProj[colProj]);
colAgg++; colAgg++;
} }
@ -1853,6 +1877,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
oidsAgg.push_back(oidsProj[colProj]); oidsAgg.push_back(oidsProj[colProj]);
keysAgg.push_back(aggKey); keysAgg.push_back(aggKey);
typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAgg.push_back(8);
precisionAgg.push_back(-1); precisionAgg.push_back(-1);
widthAgg.push_back(sizeof(long double)); widthAgg.push_back(sizeof(long double));
scaleAgg.push_back(0); scaleAgg.push_back(0);
@ -1884,6 +1909,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
typeAgg.push_back(CalpontSystemCatalog::BIGINT); typeAgg.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAgg.push_back(8);
widthAgg.push_back(bigIntWidth); widthAgg.push_back(bigIntWidth);
colAgg++; colAgg++;
} }
@ -1924,6 +1950,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(0); scaleAgg.push_back(0);
precisionAgg.push_back(-1); precisionAgg.push_back(-1);
typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAgg.push_back(8);
widthAgg.push_back(sizeof(long double)); widthAgg.push_back(sizeof(long double));
++colAgg; ++colAgg;
@ -1933,6 +1960,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(0); scaleAgg.push_back(0);
precisionAgg.push_back(-1); precisionAgg.push_back(-1);
typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAgg.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAgg.push_back(8);
widthAgg.push_back(sizeof(long double)); widthAgg.push_back(sizeof(long double));
++colAgg; ++colAgg;
} }
@ -1956,6 +1984,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
typeAgg.push_back(CalpontSystemCatalog::BIGINT); typeAgg.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAgg.push_back(8);
widthAgg.push_back(bigIntWidth); widthAgg.push_back(bigIntWidth);
colAgg++; colAgg++;
} }
@ -1976,6 +2005,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(udafFuncCol->fUDAFContext.getScale()); scaleAgg.push_back(udafFuncCol->fUDAFContext.getScale());
precisionAgg.push_back(udafFuncCol->fUDAFContext.getPrecision()); precisionAgg.push_back(udafFuncCol->fUDAFContext.getPrecision());
typeAgg.push_back(udafFuncCol->fUDAFContext.getResultType()); typeAgg.push_back(udafFuncCol->fUDAFContext.getResultType());
csNumAgg.push_back(udafFuncCol->fUDAFContext.getCharsetNumber());
widthAgg.push_back(udafFuncCol->fUDAFContext.getColWidth()); widthAgg.push_back(udafFuncCol->fUDAFContext.getColWidth());
++colAgg; ++colAgg;
// Column for index of UDAF UserData struct // Column for index of UDAF UserData struct
@ -1984,6 +2014,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(0); scaleAgg.push_back(0);
precisionAgg.push_back(0); precisionAgg.push_back(0);
typeAgg.push_back(CalpontSystemCatalog::UBIGINT); typeAgg.push_back(CalpontSystemCatalog::UBIGINT);
csNumAgg.push_back(8);
widthAgg.push_back(sizeof(uint64_t)); widthAgg.push_back(sizeof(uint64_t));
funct->fAuxColumnIndex = colAgg++; funct->fAuxColumnIndex = colAgg++;
// If the first param is const // If the first param is const
@ -2004,6 +2035,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAgg.push_back(scaleProj[colProj]); scaleAgg.push_back(scaleProj[colProj]);
precisionAgg.push_back(precisionProj[colProj]); precisionAgg.push_back(precisionProj[colProj]);
typeAgg.push_back(typeProj[colProj]); typeAgg.push_back(typeProj[colProj]);
csNumAgg.push_back(csNumProj[colProj]);
widthAgg.push_back(widthProj[colProj]); widthAgg.push_back(widthProj[colProj]);
multiParmIndexes.push_back(colAgg); multiParmIndexes.push_back(colAgg);
++colAgg; ++colAgg;
@ -2174,6 +2206,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
oidsAggDist.push_back(oidsAgg[colAgg]); oidsAggDist.push_back(oidsAgg[colAgg]);
keysAggDist.push_back(retKey); keysAggDist.push_back(retKey);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
@ -2188,6 +2221,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
// work around count() in select subquery // work around count() in select subquery
precisionAggDist.push_back(9999); precisionAggDist.push_back(9999);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
break; break;
@ -2214,6 +2248,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(scaleAgg[colAgg]); scaleAggDist.push_back(scaleAgg[colAgg]);
precisionAggDist.push_back(precisionAgg[colAgg]); precisionAggDist.push_back(precisionAgg[colAgg]);
typeAggDist.push_back(typeAgg[colAgg]); typeAggDist.push_back(typeAgg[colAgg]);
csNumAggDist.push_back(csNumAgg[colAgg]);
uint32_t width = widthAgg[colAgg]; uint32_t width = widthAgg[colAgg];
if (aggOp == ROWAGG_GROUP_CONCAT) if (aggOp == ROWAGG_GROUP_CONCAT)
@ -2250,6 +2285,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
keysAggDist.push_back(retKey); keysAggDist.push_back(retKey);
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
} }
@ -2272,7 +2308,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
typeAggDist.push_back(CalpontSystemCatalog::BIGINT); typeAggDist.push_back(CalpontSystemCatalog::BIGINT);
precisionAggDist.push_back(19); precisionAggDist.push_back(19);
} }
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
} }
@ -2287,6 +2323,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(ti.scale); scaleAggDist.push_back(ti.scale);
precisionAggDist.push_back(ti.precision); precisionAggDist.push_back(ti.precision);
typeAggDist.push_back(ti.dtype); typeAggDist.push_back(ti.dtype);
csNumAggDist.push_back(ti.csNum);
widthAggDist.push_back(ti.width); widthAggDist.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -2299,6 +2336,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(ti.scale); scaleAggDist.push_back(ti.scale);
precisionAggDist.push_back(ti.precision); precisionAggDist.push_back(ti.precision);
typeAggDist.push_back(ti.dtype); typeAggDist.push_back(ti.dtype);
csNumAggDist.push_back(ti.csNum);
widthAggDist.push_back(ti.width); widthAggDist.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -2313,6 +2351,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(ti.scale); scaleAggDist.push_back(ti.scale);
precisionAggDist.push_back(ti.precision); precisionAggDist.push_back(ti.precision);
typeAggDist.push_back(ti.dtype); typeAggDist.push_back(ti.dtype);
csNumAggDist.push_back(ti.csNum);
widthAggDist.push_back(ti.width); widthAggDist.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -2332,6 +2371,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(scaleProj[k] >> 8); scaleAggDist.push_back(scaleProj[k] >> 8);
precisionAggDist.push_back(precisionProj[k]); precisionAggDist.push_back(precisionProj[k]);
typeAggDist.push_back(typeProj[k]); typeAggDist.push_back(typeProj[k]);
csNumAggDist.push_back(csNumProj[k]);
widthAggDist.push_back(widthProj[k]); widthAggDist.push_back(widthProj[k]);
returnColMissing = false; returnColMissing = false;
@ -2352,6 +2392,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(scaleProj[k] >> 8); scaleAggDist.push_back(scaleProj[k] >> 8);
precisionAggDist.push_back(precisionProj[k]); precisionAggDist.push_back(precisionProj[k]);
typeAggDist.push_back(typeProj[k]); typeAggDist.push_back(typeProj[k]);
csNumAggDist.push_back(csNumProj[k]);
widthAggDist.push_back(widthProj[k]); widthAggDist.push_back(widthProj[k]);
returnColMissing = false; returnColMissing = false;
@ -2476,6 +2517,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(19); precisionAggDist.push_back(19);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
} }
@ -2508,6 +2550,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(19); precisionAggDist.push_back(19);
typeAggDist.push_back(CalpontSystemCatalog::BIGINT); typeAggDist.push_back(CalpontSystemCatalog::BIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
} }
@ -2533,6 +2576,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(sizeof(uint64_t)); widthAggDist.push_back(sizeof(uint64_t));
continue; continue;
} }
@ -2548,6 +2592,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
++lastCol; ++lastCol;
@ -2557,6 +2602,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
++lastCol; ++lastCol;
} }
@ -2568,7 +2614,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
for (uint64_t i = 0; i < oidsAgg.size(); i++) for (uint64_t i = 0; i < oidsAgg.size(); i++)
posAgg.push_back(posAgg[i] + widthAgg[i]); posAgg.push_back(posAgg[i] + widthAgg[i]);
RowGroup aggRG(oidsAgg.size(), posAgg, oidsAgg, keysAgg, typeAgg, scaleAgg, precisionAgg, RowGroup aggRG(oidsAgg.size(), posAgg, oidsAgg, keysAgg, typeAgg, csNumAgg, scaleAgg, precisionAgg,
jobInfo.stringTableThreshold); jobInfo.stringTableThreshold);
SP_ROWAGG_UM_t rowAgg(new RowAggregationUM(groupBy, functionVec1, jobInfo.rm, jobInfo.umMemLimit)); SP_ROWAGG_UM_t rowAgg(new RowAggregationUM(groupBy, functionVec1, jobInfo.rm, jobInfo.umMemLimit));
rowAgg->timeZone(jobInfo.timeZone); rowAgg->timeZone(jobInfo.timeZone);
@ -2579,7 +2625,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
posAggDist.push_back(posAggDist[i] + widthAggDist[i]); posAggDist.push_back(posAggDist[i] + widthAggDist[i]);
RowGroup aggRgDist(oidsAggDist.size(), posAggDist, oidsAggDist, keysAggDist, typeAggDist, RowGroup aggRgDist(oidsAggDist.size(), posAggDist, oidsAggDist, keysAggDist, typeAggDist,
scaleAggDist, precisionAggDist, jobInfo.stringTableThreshold); csNumAggDist, scaleAggDist, precisionAggDist, jobInfo.stringTableThreshold);
SP_ROWAGG_DIST rowAggDist(new RowAggregationDistinct(groupByNoDist, functionVec2, jobInfo.rm, jobInfo.umMemLimit)); SP_ROWAGG_DIST rowAggDist(new RowAggregationDistinct(groupByNoDist, functionVec2, jobInfo.rm, jobInfo.umMemLimit));
rowAggDist->timeZone(jobInfo.timeZone); rowAggDist->timeZone(jobInfo.timeZone);
@ -2609,6 +2655,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
vector<uint32_t> scaleAggGb, scaleAggSub; vector<uint32_t> scaleAggGb, scaleAggSub;
vector<uint32_t> precisionAggGb, precisionAggSub; vector<uint32_t> precisionAggGb, precisionAggSub;
vector<CalpontSystemCatalog::ColDataType> typeAggGb, typeAggSub; vector<CalpontSystemCatalog::ColDataType> typeAggGb, typeAggSub;
vector<uint32_t> csNumAggGb, csNumAggSub;
vector<uint32_t> widthAggGb, widthAggSub; vector<uint32_t> widthAggGb, widthAggSub;
// populate groupby column info // populate groupby column info
@ -2619,6 +2666,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggGb.push_back(scaleProj[i]); scaleAggGb.push_back(scaleProj[i]);
precisionAggGb.push_back(precisionProj[i]); precisionAggGb.push_back(precisionProj[i]);
typeAggGb.push_back(typeProj[i]); typeAggGb.push_back(typeProj[i]);
csNumAggGb.push_back(csNumProj[i]);
widthAggGb.push_back(widthProj[i]); widthAggGb.push_back(widthProj[i]);
} }
@ -2647,6 +2695,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggSub = scaleAggGb; scaleAggSub = scaleAggGb;
precisionAggSub = precisionAggGb; precisionAggSub = precisionAggGb;
typeAggSub = typeAggGb; typeAggSub = typeAggGb;
csNumAggSub = csNumAggGb;
widthAggSub = widthAggGb; widthAggSub = widthAggGb;
oidsAggSub.push_back(oidsProj[j]); oidsAggSub.push_back(oidsProj[j]);
@ -2654,6 +2703,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
scaleAggSub.push_back(scaleProj[j]); scaleAggSub.push_back(scaleProj[j]);
precisionAggSub.push_back(precisionProj[j]); precisionAggSub.push_back(precisionProj[j]);
typeAggSub.push_back(typeProj[j]); typeAggSub.push_back(typeProj[j]);
csNumAggSub.push_back(csNumProj[j]);
widthAggSub.push_back(widthProj[j]); widthAggSub.push_back(widthProj[j]);
// construct sub-rowgroup // construct sub-rowgroup
@ -2664,7 +2714,7 @@ void TupleAggregateStep::prep1PhaseDistinctAggregate(
posAggSub.push_back(posAggSub[k] + widthAggSub[k]); posAggSub.push_back(posAggSub[k] + widthAggSub[k]);
RowGroup subRg(oidsAggSub.size(), posAggSub, oidsAggSub, keysAggSub, typeAggSub, RowGroup subRg(oidsAggSub.size(), posAggSub, oidsAggSub, keysAggSub, typeAggSub,
scaleAggSub, precisionAggSub, jobInfo.stringTableThreshold); csNumAggSub, scaleAggSub, precisionAggSub, jobInfo.stringTableThreshold);
subRgVec.push_back(subRg); subRgVec.push_back(subRg);
// construct groupby vector // construct groupby vector
@ -2873,6 +2923,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
const vector<uint32_t>& scaleProj = projRG.getScale(); const vector<uint32_t>& scaleProj = projRG.getScale();
const vector<uint32_t>& precisionProj = projRG.getPrecision(); const vector<uint32_t>& precisionProj = projRG.getPrecision();
const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes(); const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes();
const vector<uint32_t>& csNumProj = projRG.getCharsetNumbers();
vector<uint32_t> posAggPm, posAggUm; vector<uint32_t> posAggPm, posAggUm;
vector<uint32_t> oidsAggPm, oidsAggUm; vector<uint32_t> oidsAggPm, oidsAggUm;
@ -2880,6 +2931,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
vector<uint32_t> scaleAggPm, scaleAggUm; vector<uint32_t> scaleAggPm, scaleAggUm;
vector<uint32_t> precisionAggPm, precisionAggUm; vector<uint32_t> precisionAggPm, precisionAggUm;
vector<CalpontSystemCatalog::ColDataType> typeAggPm, typeAggUm; vector<CalpontSystemCatalog::ColDataType> typeAggPm, typeAggUm;
vector<uint32_t> csNumAggPm, csNumAggUm;
vector<uint32_t> widthAggPm, widthAggUm; vector<uint32_t> widthAggPm, widthAggUm;
vector<SP_ROWAGG_GRPBY_t> groupByPm, groupByUm; vector<SP_ROWAGG_GRPBY_t> groupByPm, groupByUm;
vector<SP_ROWAGG_FUNC_t> functionVecPm, functionVecUm; vector<SP_ROWAGG_FUNC_t> functionVecPm, functionVecUm;
@ -2937,6 +2989,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
aggFuncMap.insert(make_pair(boost::make_tuple(keysAggPm[colAggPm], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAggPm)); aggFuncMap.insert(make_pair(boost::make_tuple(keysAggPm[colAggPm], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAggPm));
@ -2977,6 +3030,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
keysAggPm.push_back(key); keysAggPm.push_back(key);
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
@ -3071,6 +3125,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
colAggPm++; colAggPm++;
} }
@ -3100,6 +3155,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
oidsAggPm.push_back(oidsProj[colProj]); oidsAggPm.push_back(oidsProj[colProj]);
keysAggPm.push_back(aggKey); keysAggPm.push_back(aggKey);
typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggPm.push_back(8);
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(-1); precisionAggPm.push_back(-1);
widthAggPm.push_back(sizeof(long double)); widthAggPm.push_back(sizeof(long double));
@ -3120,6 +3176,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
// work around count() in select subquery // work around count() in select subquery
precisionAggPm.push_back(9999); precisionAggPm.push_back(9999);
typeAggPm.push_back(CalpontSystemCatalog::UBIGINT); typeAggPm.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggPm.push_back(8);
widthAggPm.push_back(bigIntWidth); widthAggPm.push_back(bigIntWidth);
colAggPm++; colAggPm++;
} }
@ -3151,6 +3208,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(0); precisionAggPm.push_back(0);
typeAggPm.push_back(CalpontSystemCatalog::DOUBLE); typeAggPm.push_back(CalpontSystemCatalog::DOUBLE);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(double)); widthAggPm.push_back(sizeof(double));
funct->fAuxColumnIndex = ++colAggPm; funct->fAuxColumnIndex = ++colAggPm;
@ -3160,6 +3218,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(-1); precisionAggPm.push_back(-1);
typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(long double)); widthAggPm.push_back(sizeof(long double));
++colAggPm; ++colAggPm;
@ -3169,6 +3228,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(-1); precisionAggPm.push_back(-1);
typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(long double)); widthAggPm.push_back(sizeof(long double));
++colAggPm; ++colAggPm;
} }
@ -3192,6 +3252,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
typeAggPm.push_back(CalpontSystemCatalog::BIGINT); typeAggPm.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAggPm.push_back(8);
widthAggPm.push_back(bigIntWidth); widthAggPm.push_back(bigIntWidth);
colAggPm++; colAggPm++;
} }
@ -3212,6 +3273,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(udafFuncCol->fUDAFContext.getScale()); scaleAggPm.push_back(udafFuncCol->fUDAFContext.getScale());
precisionAggPm.push_back(udafFuncCol->fUDAFContext.getPrecision()); precisionAggPm.push_back(udafFuncCol->fUDAFContext.getPrecision());
typeAggPm.push_back(udafFuncCol->fUDAFContext.getResultType()); typeAggPm.push_back(udafFuncCol->fUDAFContext.getResultType());
csNumAggPm.push_back(udafFuncCol->fUDAFContext.getCharsetNumber());
widthAggPm.push_back(udafFuncCol->fUDAFContext.getColWidth()); widthAggPm.push_back(udafFuncCol->fUDAFContext.getColWidth());
++colAggPm; ++colAggPm;
// Column for index of UDAF UserData struct // Column for index of UDAF UserData struct
@ -3220,6 +3282,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(0); precisionAggPm.push_back(0);
typeAggPm.push_back(CalpontSystemCatalog::UBIGINT); typeAggPm.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggPm.push_back(8);
widthAggPm.push_back(bigUintWidth); widthAggPm.push_back(bigUintWidth);
funct->fAuxColumnIndex = colAggPm++; funct->fAuxColumnIndex = colAggPm++;
// If the first param is const // If the first param is const
@ -3240,6 +3303,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
colAggPm++; colAggPm++;
// If the param is const // If the param is const
@ -3353,6 +3417,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(scaleAggPm[colPm]); scaleAggUm.push_back(scaleAggPm[colPm]);
precisionAggUm.push_back(precisionAggPm[colPm]); precisionAggUm.push_back(precisionAggPm[colPm]);
typeAggUm.push_back(typeAggPm[colPm]); typeAggUm.push_back(typeAggPm[colPm]);
csNumAggUm.push_back(csNumAggPm[colPm]);
widthAggUm.push_back(widthAggPm[colPm]); widthAggUm.push_back(widthAggPm[colPm]);
} }
@ -3379,6 +3444,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
keysAggUm.push_back(retKey); keysAggUm.push_back(retKey);
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggUm.push_back(8);
precisionAggUm.push_back(-1); precisionAggUm.push_back(-1);
widthAggUm.push_back(sizeof(long double)); widthAggUm.push_back(sizeof(long double));
} }
@ -3393,6 +3459,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(19); precisionAggUm.push_back(19);
typeAggUm.push_back(CalpontSystemCatalog::UBIGINT); typeAggUm.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggUm.push_back(8);
widthAggUm.push_back(bigIntWidth); widthAggUm.push_back(bigIntWidth);
} }
} }
@ -3407,6 +3474,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(ti.scale); scaleAggUm.push_back(ti.scale);
precisionAggUm.push_back(ti.precision); precisionAggUm.push_back(ti.precision);
typeAggUm.push_back(ti.dtype); typeAggUm.push_back(ti.dtype);
csNumAggUm.push_back(ti.csNum);
widthAggUm.push_back(ti.width); widthAggUm.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -3420,6 +3488,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(ti.scale); scaleAggUm.push_back(ti.scale);
precisionAggUm.push_back(ti.precision); precisionAggUm.push_back(ti.precision);
typeAggUm.push_back(ti.dtype); typeAggUm.push_back(ti.dtype);
csNumAggUm.push_back(ti.csNum);
widthAggUm.push_back(ti.width); widthAggUm.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -3432,6 +3501,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(ti.scale); scaleAggUm.push_back(ti.scale);
precisionAggUm.push_back(ti.precision); precisionAggUm.push_back(ti.precision);
typeAggUm.push_back(ti.dtype); typeAggUm.push_back(ti.dtype);
csNumAggUm.push_back(ti.csNum);
widthAggUm.push_back(ti.width); widthAggUm.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -3560,6 +3630,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(19); precisionAggUm.push_back(19);
typeAggUm.push_back(CalpontSystemCatalog::UBIGINT); typeAggUm.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggUm.push_back(8);
widthAggUm.push_back(bigIntWidth); widthAggUm.push_back(bigIntWidth);
} }
} }
@ -3585,6 +3656,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(0); precisionAggUm.push_back(0);
typeAggUm.push_back(CalpontSystemCatalog::UBIGINT); typeAggUm.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggUm.push_back(8);
widthAggUm.push_back(bigUintWidth); widthAggUm.push_back(bigUintWidth);
continue; continue;
} }
@ -3600,6 +3672,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(-1); precisionAggUm.push_back(-1);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggUm.push_back(8);
widthAggUm.push_back(sizeof(long double)); widthAggUm.push_back(sizeof(long double));
++lastCol; ++lastCol;
@ -3609,6 +3682,7 @@ void TupleAggregateStep::prep2PhasesAggregate(
scaleAggUm.push_back(0); scaleAggUm.push_back(0);
precisionAggUm.push_back(-1); precisionAggUm.push_back(-1);
typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggUm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggUm.push_back(8);
widthAggUm.push_back(sizeof(long double)); widthAggUm.push_back(sizeof(long double));
++lastCol; ++lastCol;
} }
@ -3620,8 +3694,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
for (uint64_t i = 0; i < oidsAggUm.size(); i++) for (uint64_t i = 0; i < oidsAggUm.size(); i++)
posAggUm.push_back(posAggUm[i] + widthAggUm[i]); posAggUm.push_back(posAggUm[i] + widthAggUm[i]);
RowGroup aggRgUm(oidsAggUm.size(), posAggUm, oidsAggUm, keysAggUm, typeAggUm, scaleAggUm, RowGroup aggRgUm(oidsAggUm.size(), posAggUm, oidsAggUm, keysAggUm, typeAggUm,
precisionAggUm, jobInfo.stringTableThreshold); csNumAggUm, scaleAggUm, precisionAggUm, jobInfo.stringTableThreshold);
SP_ROWAGG_UM_t rowAggUm(new RowAggregationUMP2(groupByUm, functionVecUm, jobInfo.rm, jobInfo.umMemLimit)); SP_ROWAGG_UM_t rowAggUm(new RowAggregationUMP2(groupByUm, functionVecUm, jobInfo.rm, jobInfo.umMemLimit));
rowAggUm->timeZone(jobInfo.timeZone); rowAggUm->timeZone(jobInfo.timeZone);
rowgroups.push_back(aggRgUm); rowgroups.push_back(aggRgUm);
@ -3632,8 +3706,8 @@ void TupleAggregateStep::prep2PhasesAggregate(
for (uint64_t i = 0; i < oidsAggPm.size(); i++) for (uint64_t i = 0; i < oidsAggPm.size(); i++)
posAggPm.push_back(posAggPm[i] + widthAggPm[i]); posAggPm.push_back(posAggPm[i] + widthAggPm[i]);
RowGroup aggRgPm(oidsAggPm.size(), posAggPm, oidsAggPm, keysAggPm, typeAggPm, scaleAggPm, RowGroup aggRgPm(oidsAggPm.size(), posAggPm, oidsAggPm, keysAggPm, typeAggPm,
precisionAggPm, jobInfo.stringTableThreshold); csNumAggPm, scaleAggPm, precisionAggPm, jobInfo.stringTableThreshold);
SP_ROWAGG_PM_t rowAggPm(new RowAggregation(groupByPm, functionVecPm)); SP_ROWAGG_PM_t rowAggPm(new RowAggregation(groupByPm, functionVecPm));
rowAggPm->timeZone(jobInfo.timeZone); rowAggPm->timeZone(jobInfo.timeZone);
rowgroups.push_back(aggRgPm); rowgroups.push_back(aggRgPm);
@ -3717,6 +3791,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
const vector<uint32_t>& scaleProj = projRG.getScale(); const vector<uint32_t>& scaleProj = projRG.getScale();
const vector<uint32_t>& precisionProj = projRG.getPrecision(); const vector<uint32_t>& precisionProj = projRG.getPrecision();
const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes(); const vector<CalpontSystemCatalog::ColDataType>& typeProj = projRG.getColTypes();
const vector<uint32_t>& csNumProj = projRG.getCharsetNumbers();
vector<uint32_t> posAggPm, posAggUm, posAggDist; vector<uint32_t> posAggPm, posAggUm, posAggDist;
vector<uint32_t> oidsAggPm, oidsAggUm, oidsAggDist; vector<uint32_t> oidsAggPm, oidsAggUm, oidsAggDist;
@ -3724,6 +3799,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
vector<uint32_t> scaleAggPm, scaleAggUm, scaleAggDist; vector<uint32_t> scaleAggPm, scaleAggUm, scaleAggDist;
vector<uint32_t> precisionAggPm, precisionAggUm, precisionAggDist; vector<uint32_t> precisionAggPm, precisionAggUm, precisionAggDist;
vector<CalpontSystemCatalog::ColDataType> typeAggPm, typeAggUm, typeAggDist; vector<CalpontSystemCatalog::ColDataType> typeAggPm, typeAggUm, typeAggDist;
vector<uint32_t> csNumAggPm, csNumAggUm, csNumAggDist;
vector<uint32_t> widthAggPm, widthAggUm, widthAggDist; vector<uint32_t> widthAggPm, widthAggUm, widthAggDist;
vector<SP_ROWAGG_GRPBY_t> groupByPm, groupByUm, groupByNoDist; vector<SP_ROWAGG_GRPBY_t> groupByPm, groupByUm, groupByNoDist;
@ -3785,6 +3861,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
aggFuncMap.insert(make_pair(boost::make_tuple(keysAggPm[colAggPm], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAggPm)); aggFuncMap.insert(make_pair(boost::make_tuple(keysAggPm[colAggPm], 0, pUDAFFunc, udafc ? udafc->getContext().getParamKeys() : NULL), colAggPm));
@ -3826,6 +3903,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
@ -3927,6 +4005,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
colAggPm++; colAggPm++;
} }
@ -3956,6 +4035,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
oidsAggPm.push_back(oidsProj[colProj]); oidsAggPm.push_back(oidsProj[colProj]);
keysAggPm.push_back(aggKey); keysAggPm.push_back(aggKey);
typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggPm.push_back(8);
precisionAggPm.push_back(-1); precisionAggPm.push_back(-1);
widthAggPm.push_back(sizeof(long double)); widthAggPm.push_back(sizeof(long double));
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
@ -3987,6 +4067,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
typeAggPm.push_back(CalpontSystemCatalog::BIGINT); typeAggPm.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAggPm.push_back(8);
widthAggPm.push_back(bigIntWidth); widthAggPm.push_back(bigIntWidth);
colAggPm++; colAggPm++;
} }
@ -4018,6 +4099,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(0); precisionAggPm.push_back(0);
typeAggPm.push_back(CalpontSystemCatalog::DOUBLE); typeAggPm.push_back(CalpontSystemCatalog::DOUBLE);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(double)); widthAggPm.push_back(sizeof(double));
funct->fAuxColumnIndex = ++colAggPm; funct->fAuxColumnIndex = ++colAggPm;
@ -4027,6 +4109,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(-1); precisionAggPm.push_back(-1);
typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(long double)); widthAggPm.push_back(sizeof(long double));
++colAggPm; ++colAggPm;
@ -4036,6 +4119,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(-1); precisionAggPm.push_back(-1);
typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggPm.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(long double)); widthAggPm.push_back(sizeof(long double));
++colAggPm; ++colAggPm;
} }
@ -4059,6 +4143,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
typeAggPm.push_back(CalpontSystemCatalog::BIGINT); typeAggPm.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAggPm.push_back(8);
widthAggPm.push_back(bigIntWidth); widthAggPm.push_back(bigIntWidth);
++colAggPm; ++colAggPm;
} }
@ -4079,6 +4164,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(udafFuncCol->fUDAFContext.getScale()); scaleAggPm.push_back(udafFuncCol->fUDAFContext.getScale());
precisionAggPm.push_back(udafFuncCol->fUDAFContext.getPrecision()); precisionAggPm.push_back(udafFuncCol->fUDAFContext.getPrecision());
typeAggPm.push_back(udafFuncCol->fUDAFContext.getResultType()); typeAggPm.push_back(udafFuncCol->fUDAFContext.getResultType());
csNumAggPm.push_back(udafFuncCol->fUDAFContext.getCharsetNumber());
widthAggPm.push_back(udafFuncCol->fUDAFContext.getColWidth()); widthAggPm.push_back(udafFuncCol->fUDAFContext.getColWidth());
++colAggPm; ++colAggPm;
// Column for index of UDAF UserData struct // Column for index of UDAF UserData struct
@ -4087,6 +4173,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(0); scaleAggPm.push_back(0);
precisionAggPm.push_back(0); precisionAggPm.push_back(0);
typeAggPm.push_back(CalpontSystemCatalog::UBIGINT); typeAggPm.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggPm.push_back(8);
widthAggPm.push_back(sizeof(uint64_t)); widthAggPm.push_back(sizeof(uint64_t));
funct->fAuxColumnIndex = colAggPm++; funct->fAuxColumnIndex = colAggPm++;
// If the first param is const // If the first param is const
@ -4107,6 +4194,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggPm.push_back(scaleProj[colProj]); scaleAggPm.push_back(scaleProj[colProj]);
precisionAggPm.push_back(precisionProj[colProj]); precisionAggPm.push_back(precisionProj[colProj]);
typeAggPm.push_back(typeProj[colProj]); typeAggPm.push_back(typeProj[colProj]);
csNumAggPm.push_back(csNumProj[colProj]);
widthAggPm.push_back(width[colProj]); widthAggPm.push_back(width[colProj]);
multiParmIndexes.push_back(colAggPm); multiParmIndexes.push_back(colAggPm);
++colAggPm; ++colAggPm;
@ -4208,6 +4296,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
precisionAggUm.push_back(precisionAggPm[idx]); precisionAggUm.push_back(precisionAggPm[idx]);
widthAggUm.push_back(widthAggPm[idx]); widthAggUm.push_back(widthAggPm[idx]);
typeAggUm.push_back(typeAggPm[idx]); typeAggUm.push_back(typeAggPm[idx]);
csNumAggUm.push_back(csNumAggPm[idx]);
} }
} }
@ -4325,6 +4414,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
oidsAggDist.push_back(oidsAggUm[colUm]); oidsAggDist.push_back(oidsAggUm[colUm]);
keysAggDist.push_back(retKey); keysAggDist.push_back(retKey);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
@ -4342,6 +4432,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
// work around count() in select subquery // work around count() in select subquery
precisionAggDist.push_back(9999); precisionAggDist.push_back(9999);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
break; break;
@ -4365,6 +4456,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(scaleAggUm[colUm]); scaleAggDist.push_back(scaleAggUm[colUm]);
precisionAggDist.push_back(precisionAggUm[colUm]); precisionAggDist.push_back(precisionAggUm[colUm]);
typeAggDist.push_back(typeAggUm[colUm]); typeAggDist.push_back(typeAggUm[colUm]);
csNumAggDist.push_back(csNumAggUm[colUm]);
widthAggDist.push_back(widthAggUm[colUm]); widthAggDist.push_back(widthAggUm[colUm]);
} }
@ -4391,6 +4483,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
keysAggDist.push_back(retKey); keysAggDist.push_back(retKey);
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
} }
@ -4412,6 +4505,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
precisionAggDist.push_back(19); precisionAggDist.push_back(19);
typeAggDist.push_back(CalpontSystemCatalog::BIGINT); typeAggDist.push_back(CalpontSystemCatalog::BIGINT);
} }
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
} }
@ -4426,6 +4520,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(ti.scale); scaleAggDist.push_back(ti.scale);
precisionAggDist.push_back(ti.precision); precisionAggDist.push_back(ti.precision);
typeAggDist.push_back(ti.dtype); typeAggDist.push_back(ti.dtype);
csNumAggDist.push_back(ti.csNum);
widthAggDist.push_back(ti.width); widthAggDist.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -4439,6 +4534,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(ti.scale); scaleAggDist.push_back(ti.scale);
precisionAggDist.push_back(ti.precision); precisionAggDist.push_back(ti.precision);
typeAggDist.push_back(ti.dtype); typeAggDist.push_back(ti.dtype);
csNumAggDist.push_back(ti.csNum);
widthAggDist.push_back(ti.width); widthAggDist.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -4451,6 +4547,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(ti.scale); scaleAggDist.push_back(ti.scale);
precisionAggDist.push_back(ti.precision); precisionAggDist.push_back(ti.precision);
typeAggDist.push_back(ti.dtype); typeAggDist.push_back(ti.dtype);
csNumAggDist.push_back(ti.csNum);
widthAggDist.push_back(ti.width); widthAggDist.push_back(ti.width);
returnColMissing = false; returnColMissing = false;
@ -4570,6 +4667,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(19); precisionAggDist.push_back(19);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
} }
@ -4602,6 +4700,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(19); precisionAggDist.push_back(19);
typeAggDist.push_back(CalpontSystemCatalog::BIGINT); typeAggDist.push_back(CalpontSystemCatalog::BIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(bigIntWidth); widthAggDist.push_back(bigIntWidth);
} }
} }
@ -4627,6 +4726,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(0); precisionAggDist.push_back(0);
typeAggDist.push_back(CalpontSystemCatalog::UBIGINT); typeAggDist.push_back(CalpontSystemCatalog::UBIGINT);
csNumAggDist.push_back(8);
widthAggDist.push_back(sizeof(uint64_t)); widthAggDist.push_back(sizeof(uint64_t));
continue; continue;
} }
@ -4642,6 +4742,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
++lastCol; ++lastCol;
@ -4651,6 +4752,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggDist.push_back(0); scaleAggDist.push_back(0);
precisionAggDist.push_back(-1); precisionAggDist.push_back(-1);
typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE); typeAggDist.push_back(CalpontSystemCatalog::LONGDOUBLE);
csNumAggDist.push_back(8);
widthAggDist.push_back(sizeof(long double)); widthAggDist.push_back(sizeof(long double));
++lastCol; ++lastCol;
} }
@ -4663,8 +4765,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
for (uint64_t i = 0; i < oidsAggUm.size(); i++) for (uint64_t i = 0; i < oidsAggUm.size(); i++)
posAggUm.push_back(posAggUm[i] + widthAggUm[i]); posAggUm.push_back(posAggUm[i] + widthAggUm[i]);
RowGroup aggRgUm(oidsAggUm.size(), posAggUm, oidsAggUm, keysAggUm, typeAggUm, scaleAggUm, RowGroup aggRgUm(oidsAggUm.size(), posAggUm, oidsAggUm, keysAggUm, typeAggUm,
precisionAggUm, jobInfo.stringTableThreshold); csNumAggUm, scaleAggUm, precisionAggUm, jobInfo.stringTableThreshold);
SP_ROWAGG_UM_t rowAggUm(new RowAggregationUMP2(groupByUm, functionNoDistVec, jobInfo.rm, jobInfo.umMemLimit)); SP_ROWAGG_UM_t rowAggUm(new RowAggregationUMP2(groupByUm, functionNoDistVec, jobInfo.rm, jobInfo.umMemLimit));
rowAggUm->timeZone(jobInfo.timeZone); rowAggUm->timeZone(jobInfo.timeZone);
@ -4673,8 +4775,9 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
for (uint64_t i = 0; i < oidsAggDist.size(); i++) for (uint64_t i = 0; i < oidsAggDist.size(); i++)
posAggDist.push_back(posAggDist[i] + widthAggDist[i]); posAggDist.push_back(posAggDist[i] + widthAggDist[i]);
RowGroup aggRgDist(oidsAggDist.size(), posAggDist, oidsAggDist, keysAggDist, typeAggDist, RowGroup aggRgDist(oidsAggDist.size(), posAggDist, oidsAggDist, keysAggDist,
scaleAggDist, precisionAggDist, jobInfo.stringTableThreshold); typeAggDist, csNumAggDist, scaleAggDist,
precisionAggDist, jobInfo.stringTableThreshold);
SP_ROWAGG_DIST rowAggDist(new RowAggregationDistinct(groupByNoDist, functionVecUm, jobInfo.rm, jobInfo.umMemLimit)); SP_ROWAGG_DIST rowAggDist(new RowAggregationDistinct(groupByNoDist, functionVecUm, jobInfo.rm, jobInfo.umMemLimit));
rowAggDist->timeZone(jobInfo.timeZone); rowAggDist->timeZone(jobInfo.timeZone);
@ -4695,6 +4798,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
vector<uint32_t> scaleAggGb, scaleAggSub; vector<uint32_t> scaleAggGb, scaleAggSub;
vector<uint32_t> precisionAggGb, precisionAggSub; vector<uint32_t> precisionAggGb, precisionAggSub;
vector<CalpontSystemCatalog::ColDataType> typeAggGb, typeAggSub; vector<CalpontSystemCatalog::ColDataType> typeAggGb, typeAggSub;
vector<uint32_t> csNumAggGb, csNumAggSub;
vector<uint32_t> widthAggGb, widthAggSub; vector<uint32_t> widthAggGb, widthAggSub;
// populate groupby column info // populate groupby column info
@ -4705,6 +4809,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggGb.push_back(scaleAggUm[i]); scaleAggGb.push_back(scaleAggUm[i]);
precisionAggGb.push_back(precisionAggUm[i]); precisionAggGb.push_back(precisionAggUm[i]);
typeAggGb.push_back(typeAggUm[i]); typeAggGb.push_back(typeAggUm[i]);
csNumAggGb.push_back(csNumAggUm[i]);
widthAggGb.push_back(widthAggUm[i]); widthAggGb.push_back(widthAggUm[i]);
} }
@ -4733,6 +4838,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggSub = scaleAggGb; scaleAggSub = scaleAggGb;
precisionAggSub = precisionAggGb; precisionAggSub = precisionAggGb;
typeAggSub = typeAggGb; typeAggSub = typeAggGb;
csNumAggSub = csNumAggGb;
widthAggSub = widthAggGb; widthAggSub = widthAggGb;
oidsAggSub.push_back(oidsAggUm[j]); oidsAggSub.push_back(oidsAggUm[j]);
@ -4740,6 +4846,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
scaleAggSub.push_back(scaleAggUm[j]); scaleAggSub.push_back(scaleAggUm[j]);
precisionAggSub.push_back(precisionAggUm[j]); precisionAggSub.push_back(precisionAggUm[j]);
typeAggSub.push_back(typeAggUm[j]); typeAggSub.push_back(typeAggUm[j]);
csNumAggSub.push_back(csNumAggUm[i]);
widthAggSub.push_back(widthAggUm[j]); widthAggSub.push_back(widthAggUm[j]);
// construct sub-rowgroup // construct sub-rowgroup
@ -4750,7 +4857,7 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
posAggSub.push_back(posAggSub[k] + widthAggSub[k]); posAggSub.push_back(posAggSub[k] + widthAggSub[k]);
RowGroup subRg(oidsAggSub.size(), posAggSub, oidsAggSub, keysAggSub, typeAggSub, RowGroup subRg(oidsAggSub.size(), posAggSub, oidsAggSub, keysAggSub, typeAggSub,
scaleAggSub, precisionAggSub, jobInfo.stringTableThreshold); csNumAggSub, scaleAggSub, precisionAggSub, jobInfo.stringTableThreshold);
subRgVec.push_back(subRg); subRgVec.push_back(subRg);
// construct groupby vector // construct groupby vector
@ -4908,8 +5015,8 @@ void TupleAggregateStep::prep2PhasesDistinctAggregate(
for (uint64_t i = 0; i < oidsAggPm.size(); i++) for (uint64_t i = 0; i < oidsAggPm.size(); i++)
posAggPm.push_back(posAggPm[i] + widthAggPm[i]); posAggPm.push_back(posAggPm[i] + widthAggPm[i]);
RowGroup aggRgPm(oidsAggPm.size(), posAggPm, oidsAggPm, keysAggPm, typeAggPm, scaleAggPm, RowGroup aggRgPm(oidsAggPm.size(), posAggPm, oidsAggPm, keysAggPm, typeAggPm,
precisionAggPm, jobInfo.stringTableThreshold); csNumAggPm, scaleAggPm, precisionAggPm, jobInfo.stringTableThreshold);
SP_ROWAGG_PM_t rowAggPm(new RowAggregation(groupByPm, functionVecPm)); SP_ROWAGG_PM_t rowAggPm(new RowAggregation(groupByPm, functionVecPm));
rowAggPm->timeZone(jobInfo.timeZone); rowAggPm->timeZone(jobInfo.timeZone);
rowgroups.push_back(aggRgPm); rowgroups.push_back(aggRgPm);

4
dbcon/joblist/tupleannexstep.cpp
View File

@ -201,6 +201,7 @@ void TupleAnnexStep::initialize(const RowGroup& rgIn, const JobInfo& jobInfo)
vector<uint32_t> scale, scaleIn = rgIn.getScale(); vector<uint32_t> scale, scaleIn = rgIn.getScale();
vector<uint32_t> precision, precisionIn = rgIn.getPrecision(); vector<uint32_t> precision, precisionIn = rgIn.getPrecision();
vector<CalpontSystemCatalog::ColDataType> types, typesIn = rgIn.getColTypes(); vector<CalpontSystemCatalog::ColDataType> types, typesIn = rgIn.getColTypes();
vector<uint32_t> csNums, csNumsIn = rgIn.getCharsetNumbers();
vector<uint32_t> pos, posIn = rgIn.getOffsets(); vector<uint32_t> pos, posIn = rgIn.getOffsets();
size_t n = jobInfo.nonConstDelCols.size(); size_t n = jobInfo.nonConstDelCols.size();
@ -210,9 +211,10 @@ void TupleAnnexStep::initialize(const RowGroup& rgIn, const JobInfo& jobInfo)
scale.insert(scale.end(), scaleIn.begin(), scaleIn.begin() + n); scale.insert(scale.end(), scaleIn.begin(), scaleIn.begin() + n);
precision.insert(precision.end(), precisionIn.begin(), precisionIn.begin() + n); precision.insert(precision.end(), precisionIn.begin(), precisionIn.begin() + n);
types.insert(types.end(), typesIn.begin(), typesIn.begin() + n); types.insert(types.end(), typesIn.begin(), typesIn.begin() + n);
csNums.insert(csNums.end(), csNumsIn.begin(), csNumsIn.begin() + n);
pos.insert(pos.end(), posIn.begin(), posIn.begin() + n + 1); pos.insert(pos.end(), posIn.begin(), posIn.begin() + n + 1);
fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
} }
else else
{ {

10
dbcon/joblist/tupleconstantstep.cpp
View File

@ -108,6 +108,7 @@ void TupleConstantStep::initialize(const JobInfo& jobInfo, const RowGroup* rgIn)
vector<uint32_t> scale, scaleIn = fRowGroupIn.getScale(); vector<uint32_t> scale, scaleIn = fRowGroupIn.getScale();
vector<uint32_t> precision, precisionIn = fRowGroupIn.getPrecision(); vector<uint32_t> precision, precisionIn = fRowGroupIn.getPrecision();
vector<CalpontSystemCatalog::ColDataType> types, typesIn = fRowGroupIn.getColTypes(); vector<CalpontSystemCatalog::ColDataType> types, typesIn = fRowGroupIn.getColTypes();
vector<uint32_t> csNums, csNumsIn = fRowGroupIn.getCharsetNumbers();
vector<uint32_t> pos; vector<uint32_t> pos;
pos.push_back(2); pos.push_back(2);
@ -120,6 +121,7 @@ void TupleConstantStep::initialize(const JobInfo& jobInfo, const RowGroup* rgIn)
scaleIn = fRowGroupIn.getScale(); scaleIn = fRowGroupIn.getScale();
precisionIn = fRowGroupIn.getPrecision(); precisionIn = fRowGroupIn.getPrecision();
typesIn = fRowGroupIn.getColTypes(); typesIn = fRowGroupIn.getColTypes();
csNumsIn = fRowGroupIn.getCharsetNumbers();
} }
for (uint64_t i = 0, j = 0; i < jobInfo.deliveredCols.size(); i++) for (uint64_t i = 0, j = 0; i < jobInfo.deliveredCols.size(); i++)
@ -145,6 +147,7 @@ void TupleConstantStep::initialize(const JobInfo& jobInfo, const RowGroup* rgIn)
scale.push_back(ct.scale); scale.push_back(ct.scale);
precision.push_back(ct.precision); precision.push_back(ct.precision);
types.push_back(ct.colDataType); types.push_back(ct.colDataType);
csNums.push_back(ct.charsetNumber);
pos.push_back(pos.back() + ct.colWidth); pos.push_back(pos.back() + ct.colWidth);
fIndexConst.push_back(i); fIndexConst.push_back(i);
@ -164,6 +167,7 @@ void TupleConstantStep::initialize(const JobInfo& jobInfo, const RowGroup* rgIn)
scale.push_back(scaleIn[j]); scale.push_back(scaleIn[j]);
precision.push_back(precisionIn[j]); precision.push_back(precisionIn[j]);
types.push_back(typesIn[j]); types.push_back(typesIn[j]);
csNums.push_back(csNumsIn[j]);
pos.push_back(pos.back() + fRowGroupIn.getColumnWidth(j)); pos.push_back(pos.back() + fRowGroupIn.getColumnWidth(j));
j++; j++;
@ -171,7 +175,7 @@ void TupleConstantStep::initialize(const JobInfo& jobInfo, const RowGroup* rgIn)
} }
} }
fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, scale, precision, fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision,
jobInfo.stringTableThreshold); jobInfo.stringTableThreshold);
fRowGroupOut.initRow(&fRowOut); fRowGroupOut.initRow(&fRowOut);
fRowGroupOut.initRow(&fRowConst, true); fRowGroupOut.initRow(&fRowConst, true);
@ -644,6 +648,7 @@ void TupleConstantOnlyStep::initialize(const JobInfo& jobInfo, const rowgroup::R
vector<uint32_t> scale; vector<uint32_t> scale;
vector<uint32_t> precision; vector<uint32_t> precision;
vector<CalpontSystemCatalog::ColDataType> types; vector<CalpontSystemCatalog::ColDataType> types;
vector<uint32_t> csNums;
vector<uint32_t> pos; vector<uint32_t> pos;
pos.push_back(2); pos.push_back(2);
@ -673,12 +678,13 @@ void TupleConstantOnlyStep::initialize(const JobInfo& jobInfo, const rowgroup::R
scale.push_back(ct.scale); scale.push_back(ct.scale);
precision.push_back(ct.precision); precision.push_back(ct.precision);
types.push_back(ct.colDataType); types.push_back(ct.colDataType);
csNums.push_back(ct.charsetNumber);
pos.push_back(pos.back() + ct.colWidth); pos.push_back(pos.back() + ct.colWidth);
fIndexConst.push_back(i); fIndexConst.push_back(i);
} }
fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold, false); fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold, false);
fRowGroupOut.initRow(&fRowOut); fRowGroupOut.initRow(&fRowOut);
fRowGroupOut.initRow(&fRowConst, true); fRowGroupOut.initRow(&fRowConst, true);

4
dbcon/joblist/tuplehavingstep.cpp
View File

@ -102,6 +102,7 @@ void TupleHavingStep::initialize(const RowGroup& rgIn, const JobInfo& jobInfo)
vector<uint32_t> scale, scaleIn = fRowGroupIn.getScale(); vector<uint32_t> scale, scaleIn = fRowGroupIn.getScale();
vector<uint32_t> precision, precisionIn = fRowGroupIn.getPrecision(); vector<uint32_t> precision, precisionIn = fRowGroupIn.getPrecision();
vector<CalpontSystemCatalog::ColDataType> types, typesIn = fRowGroupIn.getColTypes(); vector<CalpontSystemCatalog::ColDataType> types, typesIn = fRowGroupIn.getColTypes();
vector<uint32_t> csNums, csNumsIn = fRowGroupIn.getCharsetNumbers();
vector<uint32_t> pos, posIn = fRowGroupIn.getOffsets(); vector<uint32_t> pos, posIn = fRowGroupIn.getOffsets();
size_t n = 0; size_t n = 0;
@ -116,9 +117,10 @@ void TupleHavingStep::initialize(const RowGroup& rgIn, const JobInfo& jobInfo)
scale.insert(scale.end(), scaleIn.begin(), scaleIn.begin() + n); scale.insert(scale.end(), scaleIn.begin(), scaleIn.begin() + n);
precision.insert(precision.end(), precisionIn.begin(), precisionIn.begin() + n); precision.insert(precision.end(), precisionIn.begin(), precisionIn.begin() + n);
types.insert(types.end(), typesIn.begin(), typesIn.begin() + n); types.insert(types.end(), typesIn.begin(), typesIn.begin() + n);
csNums.insert(csNums.end(), csNumsIn.begin(), csNumsIn.begin() + n);
pos.insert(pos.end(), posIn.begin(), posIn.begin() + n + 1); pos.insert(pos.end(), posIn.begin(), posIn.begin() + n + 1);
fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, scale, precision, jobInfo.stringTableThreshold); fRowGroupOut = RowGroup(oids.size(), pos, oids, keys, types, csNums, scale, precision, jobInfo.stringTableThreshold);
fRowGroupOut.initRow(&fRowOut); fRowGroupOut.initRow(&fRowOut);
} }

5
dbcon/joblist/windowfunctionstep.cpp
View File

@ -631,6 +631,7 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
const vector<uint32_t>& oids = rg.getOIDs(); const vector<uint32_t>& oids = rg.getOIDs();
const vector<uint32_t>& keys = rg.getKeys(); const vector<uint32_t>& keys = rg.getKeys();
const vector<CalpontSystemCatalog::ColDataType>& types = rg.getColTypes(); const vector<CalpontSystemCatalog::ColDataType>& types = rg.getColTypes();
const vector<uint32_t>& csNums = rg.getCharsetNumbers();
const vector<uint32_t>& scales = rg.getScale(); const vector<uint32_t>& scales = rg.getScale();
const vector<uint32_t>& precisions = rg.getPrecision(); const vector<uint32_t>& precisions = rg.getPrecision();
@ -869,6 +870,7 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
vector<uint32_t> scales1; vector<uint32_t> scales1;
vector<uint32_t> precisions1; vector<uint32_t> precisions1;
vector<CalpontSystemCatalog::ColDataType> types1; vector<CalpontSystemCatalog::ColDataType> types1;
vector<uint32_t> csNums1;
pos1.push_back(2); pos1.push_back(2);
for (size_t i = 0; i < retColCount; i++) for (size_t i = 0; i < retColCount; i++)
@ -880,10 +882,11 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
scales1.push_back(scales[j]); scales1.push_back(scales[j]);
precisions1.push_back(precisions[j]); precisions1.push_back(precisions[j]);
types1.push_back(types[j]); types1.push_back(types[j]);
csNums1.push_back(csNums[j]);
} }
fRowGroupDelivered = RowGroup( fRowGroupDelivered = RowGroup(
retColCount, pos1, oids1, keys1, types1, scales1, precisions1, jobInfo.stringTableThreshold); retColCount, pos1, oids1, keys1, types1, csNums1, scales1, precisions1, jobInfo.stringTableThreshold);
if (jobInfo.trace) if (jobInfo.trace)
cout << "delivered RG: " << fRowGroupDelivered.toString() << endl << endl; cout << "delivered RG: " << fRowGroupDelivered.toString() << endl << endl;

4
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -2955,6 +2955,7 @@ SimpleColumn* getSmallestColumn(boost::shared_ptr<CalpontSystemCatalog> csc,
sc->viewName(lower(tan.view)); sc->viewName(lower(tan.view));
sc->timeZone(gwi.thd->variables.time_zone->get_name()->ptr()); sc->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
sc->resultType(csc->colType(oidlist[minWidthColOffset].objnum)); sc->resultType(csc->colType(oidlist[minWidthColOffset].objnum));
sc->charsetNumber(3000);
return sc; return sc;
} }
@ -3118,7 +3119,7 @@ CalpontSystemCatalog::ColType colType_MysqlToIDB (const Item* item)
<< item->result_type() << endl ); << item->result_type() << endl );
break; break;
} }
ct.charsetNumber = item->collation.collation->number;
return ct; return ct;
} }
@ -5013,6 +5014,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
colType.dataType = resultType.colDataType; colType.dataType = resultType.colDataType;
colType.precision = resultType.precision; colType.precision = resultType.precision;
colType.scale = resultType.scale; colType.scale = resultType.scale;
colType.charsetNumber = resultType.charsetNumber;
colTypes[i] = colType; colTypes[i] = colType;
} }

1
dbcon/mysql/ha_window_function.cpp
View File

@ -405,6 +405,7 @@ ReturnedColumn* buildWindowFunctionColumn(Item* item, gp_walk_info& gwi, bool& n
colType.dataType = resultType.colDataType; colType.dataType = resultType.colDataType;
colType.precision = resultType.precision; colType.precision = resultType.precision;
colType.scale = resultType.scale; colType.scale = resultType.scale;
colType.charsetNumber = resultType.charsetNumber;
colTypes[i] = colType; colTypes[i] = colType;
} }

17
ddlproc/ddlproc.cpp
View File

@ -18,6 +18,10 @@
/****************************************************************************************** /******************************************************************************************
******************************************************************************************/ ******************************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <string> #include <string>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
@ -39,8 +43,8 @@ using namespace oam;
#include "distributedenginecomm.h" #include "distributedenginecomm.h"
using namespace joblist; using namespace joblist;
#include "boost/filesystem/operations.hpp" //#include "boost/filesystem/operations.hpp"
#include "boost/filesystem/path.hpp" //#include "boost/filesystem/path.hpp"
#include "boost/progress.hpp" #include "boost/progress.hpp"
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
@ -64,9 +68,6 @@ using namespace execplan;
#include "crashtrace.h" #include "crashtrace.h"
#include "installdir.h" #include "installdir.h"
namespace fs = boost::filesystem;
namespace namespace
{ {
DistributedEngineComm* Dec; DistributedEngineComm* Dec;
@ -98,8 +99,10 @@ void added_a_pm(int)
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
// Initialize the charset library
my_init();
// This is unset due to the way we start it // This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("DDLProc"); program_invocation_short_name = const_cast<char*>("DDLProc");

15
dmlproc/dmlproc.cpp
View File

@ -20,13 +20,17 @@
* *
* *
***********************************************************************/ ***********************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include <string> #include <string>
#include <set> #include <set>
#include <clocale> #include <clocale>
#include "boost/filesystem/operations.hpp" //#include "boost/filesystem/operations.hpp"
#include "boost/filesystem/path.hpp" //#include "boost/filesystem/path.hpp"
#include "boost/progress.hpp" #include "boost/progress.hpp"
using namespace std; using namespace std;
@ -84,8 +88,6 @@ using namespace joblist;
#include "crashtrace.h" #include "crashtrace.h"
#include "installdir.h" #include "installdir.h"
namespace fs = boost::filesystem;
threadpool::ThreadPool DMLServer::fDmlPackagepool(10, 0); threadpool::ThreadPool DMLServer::fDmlPackagepool(10, 0);
namespace namespace
@ -514,7 +516,10 @@ int main(int argc, char* argv[])
BRM::DBRM dbrm; BRM::DBRM dbrm;
Oam oam; Oam oam;
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
// Initialize the charset library
my_init();
// This is unset due to the way we start it // This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("DMLProc"); program_invocation_short_name = const_cast<char*>("DMLProc");

10
exemgr/main.cpp
View File

@ -39,13 +39,16 @@
* on the Front-End Processor where it is returned to the DBMS * on the Front-End Processor where it is returned to the DBMS
* front-end. * front-end.
*/ */
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <iostream> #include <iostream>
#include <cstdint> #include <cstdint>
#include <csignal> #include <csignal>
#include <sys/resource.h> #include <sys/resource.h>
#undef root_name
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "calpontselectexecutionplan.h" #include "calpontselectexecutionplan.h"
@ -1434,7 +1437,10 @@ void cleanTempDir()
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
// Initialize the charset library
my_init();
// This is unset due to the way we start it // This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("ExeMgr"); program_invocation_short_name = const_cast<char*>("ExeMgr");

1
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -185,6 +185,7 @@ int main(int argc, char* argv[])
setuid(0); // set effective ID to root; ignore return status setuid(0); // set effective ID to root; ignore return status
#endif #endif
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
Oam oam; Oam oam;
char* pcommand = 0; char* pcommand = 0;

10
primitives/primproc/primproc.cpp
View File

@ -21,7 +21,9 @@
* *
* *
***********************************************************************/ ***********************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <unistd.h> #include <unistd.h>
#include <string> #include <string>
@ -316,6 +318,12 @@ int main(int argc, char* argv[])
// This is unset due to the way we start it // This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("PrimProc"); program_invocation_short_name = const_cast<char*>("PrimProc");
// Set locale language
setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
// Initialize the charset library
my_init();
int gDebug = 0; int gDebug = 0;
int c; int c;

27
procmgr/main.cpp
View File

@ -102,31 +102,8 @@ int main(int argc, char** argv)
setuid(0); // set effective ID to root; ignore return status setuid(0); // set effective ID to root; ignore return status
#endif #endif
// Set locale language // Set locale language
const char* pLoc = utf8::idb_setlocale(); setlocale(LC_ALL, "");
try setlocale(LC_NUMERIC, "C");
{
logging::LoggingID lid(17); // ProcessManager
logging::MessageLog ml(lid);
logging::Message msg(1);
logging::Message::Args args;
if (pLoc)
{
// Log one line
args.add("Set locale to ");
args.add(pLoc);
msg.format( args );
}
else
{
args.add("Failed to set locale ");
msg.format( args );
}
ml.logErrorMessage(msg);
}
catch (...)
{
// Ignoring for time being.
}
idbdatafile::IDBPolicy::configIDBPolicy(); idbdatafile::IDBPolicy::configIDBPolicy();

3
procmon/main.cpp
View File

@ -178,7 +178,8 @@ int main(int argc, char** argv)
USER = p; USER = p;
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
//get tmp log directory //get tmp log directory
tmpLogDir = startup::StartUp::tmpDir(); tmpLogDir = startup::StartUp::tmpDir();

1
tools/dbloadxml/colxml.cpp
View File

@ -50,6 +50,7 @@ int main(int argc, char** argv)
std::cerr << " colxml: couldn't set uid " << std::endl; std::cerr << " colxml: couldn't set uid " << std::endl;
} }
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings WriteEngine::Config::initConfigCache(); // load Columnstore.xml config settings
//Bug 6137 //Bug 6137

13
utils/funcexp/func_case.cpp
View File

@ -22,6 +22,10 @@
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <string> #include <string>
//#define NDEBUG //#define NDEBUG
#include <cassert> #include <cassert>
@ -180,20 +184,21 @@ inline uint64_t simple_case_cmp(Row& row,
case execplan::CalpontSystemCatalog::VARCHAR: case execplan::CalpontSystemCatalog::VARCHAR:
{ {
const string& ev = parm[n]->data()->getStrVal(row, isNull); const string& ev = parm[n]->data()->getStrVal(row, isNull);
if (isNull) if (isNull)
break; break;
CHARSET_INFO* cs = parm[n]->data()->resultType().getCharset();
for (i = 1; i <= whereCount; i++) for (i = 1; i <= whereCount; i++)
{ {
//BUG 5362 //BUG 5362
if (utf8::idb_strcoll(ev.c_str(), parm[i]->data()->getStrVal(row, isNull).c_str()) == 0 && !isNull) const string& p1 = parm[i]->data()->getStrVal(row, isNull);
if (isNull)
break;
if (cs->strnncoll(ev.c_str(), ev.length(), p1.c_str(), p1.length()) == 0)
{ {
foundIt = true; foundIt = true;
break; break;
} }
else
isNull = false;
} }
break; break;

5
utils/funcexp/func_char_length.cpp
View File

@ -49,7 +49,7 @@ namespace funcexp
CalpontSystemCatalog::ColType Func_char_length::operationType( FunctionParm& fp, CalpontSystemCatalog::ColType& resultType ) CalpontSystemCatalog::ColType Func_char_length::operationType( FunctionParm& fp, CalpontSystemCatalog::ColType& resultType )
{ {
return resultType; return fp[0]->data()->resultType();
} }
int64_t Func_char_length::getIntVal(rowgroup::Row& row, int64_t Func_char_length::getIntVal(rowgroup::Row& row,
@ -86,8 +86,7 @@ int64_t Func_char_length::getIntVal(rowgroup::Row& row,
return 0; return 0;
const char* b = tstr.c_str(); const char* b = tstr.c_str();
const char* e = tstr.c_str() + tstr.length(); const char* e = tstr.c_str() + tstr.length();
const CHARSET_INFO* cs = get_charset(parm[0]->data()->resultType().charsetNumber, MYF(MY_WME)); return (int64_t)parm[0]->data()->resultType().getCharset()->numchars(b, e);
return (int64_t)cs->numchars(b, e);
} }
case execplan::CalpontSystemCatalog::DATE: case execplan::CalpontSystemCatalog::DATE:

13
utils/funcexp/func_greatest.cpp
View File

@ -22,6 +22,10 @@
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -148,6 +152,7 @@ std::string Func_greatest::getStrVal(rowgroup::Row& row,
execplan::CalpontSystemCatalog::ColType& op_ct) execplan::CalpontSystemCatalog::ColType& op_ct)
{ {
const string& str = fp[0]->data()->getStrVal(row, isNull); const string& str = fp[0]->data()->getStrVal(row, isNull);
CHARSET_INFO* cs = fp[0]->data()->resultType().getCharset();
string greatestStr = str; string greatestStr = str;
@ -155,12 +160,10 @@ std::string Func_greatest::getStrVal(rowgroup::Row& row,
{ {
const string& str1 = fp[i]->data()->getStrVal(row, isNull); const string& str1 = fp[i]->data()->getStrVal(row, isNull);
int tmp = utf8::idb_strcoll(greatestStr.c_str(), str1.c_str()); if (cs->strnncoll(greatestStr.c_str(), greatestStr.length(), str1.c_str(), str1.length()) < 0)
{
if ( tmp < 0 )
// if ( greatestStr < str1 )
greatestStr = str1; greatestStr = str1;
}
} }
return greatestStr; return greatestStr;

16
utils/funcexp/func_in.cpp
View File

@ -22,6 +22,10 @@
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
using namespace std; using namespace std;
@ -52,11 +56,6 @@ inline bool numericEQ(result_t op1, result_t op2)
return op1 == op2; return op1 == op2;
} }
inline bool strEQ(string op1, string op2)
{
return utf8::idb_strcoll(op1.c_str(), op2.c_str()) == 0;
}
inline bool getBoolForIn(rowgroup::Row& row, inline bool getBoolForIn(rowgroup::Row& row,
funcexp::FunctionParm& pm, funcexp::FunctionParm& pm,
bool& isNull, bool& isNull,
@ -273,15 +272,16 @@ inline bool getBoolForIn(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TEXT: case execplan::CalpontSystemCatalog::TEXT:
{ {
const string& val = pm[0]->data()->getStrVal(row, isNull); const string& val = pm[0]->data()->getStrVal(row, isNull);
if (isNull) if (isNull)
return false; return false;
CHARSET_INFO* cs = pm[0]->data()->resultType().getCharset();
for (uint32_t i = 1; i < pm.size(); i++) for (uint32_t i = 1; i < pm.size(); i++)
{ {
isNull = false; isNull = false;
const string& str1 = pm[i]->data()->getStrVal(row, isNull);
if ( utf8::idb_strcoll(val.c_str(), pm[i]->data()->getStrVal(row, isNull).c_str()) == 0 && !isNull) if (cs->strnncoll(val.c_str(), val.length(), str1.c_str(), str1.length()) == 0 && !isNull)
return true; return true;
if (isNull && isNotIn) if (isNull && isNotIn)

65
utils/funcexp/func_instr.cpp
View File

@ -20,6 +20,10 @@
* *
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <m_ctype.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
@ -42,37 +46,50 @@ CalpontSystemCatalog::ColType Func_instr::operationType( FunctionParm& fp, Calpo
return ct; return ct;
} }
size_t Func_instr::in_str(const string& str, const string& substr, size_t start)
{
// convert both inputs to wide character strings
std::wstring wcstr = utf8::utf8_to_wstring(str);
std::wstring wcsubstr = utf8::utf8_to_wstring(substr);
if ((str.length() && !wcstr.length()) ||
(substr.length() && !wcsubstr.length()))
// this means one or both of the strings had conversion errors to wide character
return 0;
size_t pos = wcstr.find(wcsubstr, start - 1);
return (pos != string::npos ? pos + 1 : 0);
}
int64_t Func_instr::getIntVal(rowgroup::Row& row, int64_t Func_instr::getIntVal(rowgroup::Row& row,
FunctionParm& parm, FunctionParm& parm,
bool& isNull, bool& isNull,
CalpontSystemCatalog::ColType&) CalpontSystemCatalog::ColType& colType)
{ {
uint64_t start = 1; int64_t start = 0;
int64_t start0= 0;
if (parm.size() == 3) my_match_t match;
start = parm[2]->data()->getIntVal(row, isNull);
const std::string& str = parm[0]->data()->getStrVal(row, isNull);
if (isNull || start == 0) if (isNull)
return 0;
const char* s1 = str.c_str();
uint32_t l1 = (uint32_t)str.length();
const std::string& substr =parm[1]->data()->getStrVal(row, isNull);
if (isNull)
return 0; return 0;
//Bug 5110 : to support utf8 char type, we have to convert and search const char* s2 = substr.c_str();
return in_str(parm[0]->data()->getStrVal(row, isNull), parm[1]->data()->getStrVal(row, isNull), start); uint32_t l2 = (uint32_t)substr.length();
if (l2 < 1)
return start + 1;
CHARSET_INFO* cs = colType.getCharset();
if (parm.size() == 3)
{
start0 = start = parm[2]->data()->getIntVal(row, isNull) - 1;
if ((start < 0) || (start > l1))
return 0;
start = (int64_t)cs->charpos(s1, s1+l1, start); // adjust start for multi-byte
if (start + l2 > l1) // Substring is longer than str at pos.
return 0;
}
if (!cs->instr(s1+start, l1-start,
s2, l2,
&match, 1))
return 0;
return (int64_t)match.mb_len + start0 + 1;
} }

31
utils/funcexp/func_lcase.cpp
View File

@ -20,6 +20,10 @@
* *
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <m_ctype.h>
#include <string> #include <string>
using namespace std; using namespace std;
@ -56,31 +60,22 @@ CalpontSystemCatalog::ColType Func_lcase::operationType(FunctionParm& fp, Calpon
std::string Func_lcase::getStrVal(rowgroup::Row& row, std::string Func_lcase::getStrVal(rowgroup::Row& row,
FunctionParm& fp, FunctionParm& fp,
bool& isNull, bool& isNull,
execplan::CalpontSystemCatalog::ColType&) execplan::CalpontSystemCatalog::ColType& colType)
{ {
// string str = fp[0]->data()->getStrVal(row, isNull);
// transform (str.begin(), str.end(), str.begin(), to_lower());
const string& tstr = fp[0]->data()->getStrVal(row, isNull); const string& tstr = fp[0]->data()->getStrVal(row, isNull);
if (isNull) if (isNull)
return ""; return "";
size_t strwclen = utf8::idb_mbstowcs(0, tstr.c_str(), 0) + 1; CHARSET_INFO* cs = colType.getCharset();
wchar_t* wcbuf = new wchar_t[strwclen]; uint64_t inLen = tstr.length();
strwclen = utf8::idb_mbstowcs(wcbuf, tstr.c_str(), strwclen); uint64_t bufLen= inLen * cs->casedn_multiply;
wstring wstr(wcbuf, strwclen); char* outBuf = new char[bufLen];
uint64_t outLen = cs->casedn(tstr.c_str(), inLen, outBuf, bufLen);
for (uint32_t i = 0; i < strwclen; i++) string ret = string(outBuf, outLen);
wstr[i] = std::towlower(wstr[i]); delete [] outBuf;
size_t strmblen = utf8::idb_wcstombs(0, wstr.c_str(), 0) + 1;
char* outbuf = new char[strmblen];
strmblen = utf8::idb_wcstombs(outbuf, wstr.c_str(), strmblen);
std::string ret(outbuf, strmblen);
delete [] outbuf;
delete [] wcbuf;
return ret; return ret;
} }

13
utils/funcexp/func_least.cpp
View File

@ -22,6 +22,10 @@
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -127,17 +131,16 @@ std::string Func_least::getStrVal(rowgroup::Row& row,
execplan::CalpontSystemCatalog::ColType& op_ct) execplan::CalpontSystemCatalog::ColType& op_ct)
{ {
string leastStr = fp[0]->data()->getStrVal(row, isNull); string leastStr = fp[0]->data()->getStrVal(row, isNull);
CHARSET_INFO* cs = fp[0]->data()->resultType().getCharset();
for (uint32_t i = 1; i < fp.size(); i++) for (uint32_t i = 1; i < fp.size(); i++)
{ {
const string& str1 = fp[i]->data()->getStrVal(row, isNull); const string& str1 = fp[i]->data()->getStrVal(row, isNull);
int tmp = utf8::idb_strcoll(leastStr.c_str(), str1.c_str()); if (cs->strnncoll(leastStr.c_str(), leastStr.length(), str1.c_str(), str1.length()) > 0)
{
if ( tmp > 0 )
// if ( leastStr > str1 )
leastStr = str1; leastStr = str1;
}
} }
return leastStr; return leastStr;

8
utils/funcexp/func_nullif.cpp
View File

@ -22,6 +22,11 @@
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#undef LONGLONG_MIN
#include <my_sys.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -363,6 +368,7 @@ string Func_nullif::getStrVal(rowgroup::Row& row,
CalpontSystemCatalog::ColType& op_ct) CalpontSystemCatalog::ColType& op_ct)
{ {
string exp1 = parm[0]->data()->getStrVal(row, isNull); string exp1 = parm[0]->data()->getStrVal(row, isNull);
CHARSET_INFO* cs = parm[0]->data()->resultType().getCharset();
if (isNull) if (isNull)
{ {
@ -395,7 +401,7 @@ string Func_nullif::getStrVal(rowgroup::Row& row,
exp2 = exp2 + " 00:00:00"; exp2 = exp2 + " 00:00:00";
} }
if ( utf8::idb_strcoll(exp1.c_str(), exp2.c_str()) == 0 ) if (cs->strnncoll(exp1.c_str(), exp1.length(), exp2.c_str(), exp2.length()) == 0)
{ {
isNull = true; isNull = true;
return ""; return "";

13
utils/funcexp/func_strcmp.cpp
View File

@ -21,6 +21,10 @@
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -39,6 +43,10 @@ using namespace joblist;
#include "utils_utf8.h" #include "utils_utf8.h"
using namespace funcexp; using namespace funcexp;
// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;
class to_lower class to_lower
{ {
public: public:
@ -64,10 +72,11 @@ int64_t Func_strcmp::getIntVal(rowgroup::Row& row,
bool& isNull, bool& isNull,
execplan::CalpontSystemCatalog::ColType& op_ct) execplan::CalpontSystemCatalog::ColType& op_ct)
{ {
CHARSET_INFO* cs = fp[0]->data()->resultType().getCharset();
const string& str = fp[0]->data()->getStrVal(row, isNull); const string& str = fp[0]->data()->getStrVal(row, isNull);
const string& str1 = fp[1]->data()->getStrVal(row, isNull); const string& str1 = fp[1]->data()->getStrVal(row, isNull);
int ret = utf8::idb_strcoll(str.c_str(), str1.c_str());
int ret = cs->strnncoll(str.c_str(), str.length(), str1.c_str(), str1.length());
// mysql's strcmp returns only -1, 0, and 1 // mysql's strcmp returns only -1, 0, and 1
return (ret < 0 ? -1 : (ret > 0 ? 1 : 0)); return (ret < 0 ? -1 : (ret > 0 ? 1 : 0));
} }

31
utils/funcexp/func_ucase.cpp
View File

@ -20,6 +20,10 @@
* *
* *
****************************************************************************/ ****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <m_ctype.h>
#include <string> #include <string>
using namespace std; using namespace std;
@ -55,31 +59,22 @@ CalpontSystemCatalog::ColType Func_ucase::operationType(FunctionParm& fp, Calpon
std::string Func_ucase::getStrVal(rowgroup::Row& row, std::string Func_ucase::getStrVal(rowgroup::Row& row,
FunctionParm& fp, FunctionParm& fp,
bool& isNull, bool& isNull,
execplan::CalpontSystemCatalog::ColType&) execplan::CalpontSystemCatalog::ColType& colType)
{ {
// string str = fp[0]->data()->getStrVal(row, isNull);
// transform (str.begin(), str.end(), str.begin(), to_lower());
const string& tstr = fp[0]->data()->getStrVal(row, isNull); const string& tstr = fp[0]->data()->getStrVal(row, isNull);
if (isNull) if (isNull)
return ""; return "";
size_t strwclen = utf8::idb_mbstowcs(0, tstr.c_str(), 0) + 1; CHARSET_INFO* cs = colType.getCharset();
wchar_t* wcbuf = new wchar_t[strwclen]; uint64_t inLen = tstr.length();
strwclen = utf8::idb_mbstowcs(wcbuf, tstr.c_str(), strwclen); uint64_t bufLen= inLen * cs->caseup_multiply;
wstring wstr(wcbuf, strwclen); char* outBuf = new char[bufLen];
uint64_t outLen = cs->caseup(tstr.c_str(), inLen, outBuf, bufLen);
for (uint32_t i = 0; i < strwclen; i++) string ret = string(outBuf, outLen);
wstr[i] = std::towupper(wstr[i]); delete [] outBuf;
size_t strmblen = utf8::idb_wcstombs(0, wstr.c_str(), 0) + 1;
char* outbuf = new char[strmblen];
strmblen = utf8::idb_wcstombs(outbuf, wstr.c_str(), strmblen);
std::string ret(outbuf, strmblen);
delete [] outbuf;
delete [] wcbuf;
return ret; return ret;
} }

2
utils/funcexp/functor_int.h
View File

@ -84,8 +84,6 @@ public:
execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType); execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType);
size_t in_str(const std::string& str, const std::string& substr, size_t start);
int64_t getIntVal(rowgroup::Row& row, int64_t getIntVal(rowgroup::Row& row,
FunctionParm& fp, FunctionParm& fp,
bool& isNull, bool& isNull,

303
utils/funcexp/utils_utf8.h
View File

@ -1,303 +0,0 @@
/* Copyright (C) 2014 InfiniDB, Inc.
* Copyright (C) 2016 MariaDB Corporation.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; version 2 of
the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA. */
// $Id$
#ifndef _UTILS_UTF8_H_
#define _UTILS_UTF8_H_
#include <string>
#if defined(_MSC_VER)
#include <malloc.h>
#include <windows.h>
#elif defined(__FreeBSD__)
//#include <cstdlib>
#else
#include <alloca.h>
#endif
#include <cstdlib>
#include <clocale>
#include "liboamcpp.h"
/** @file */
namespace funcexp
{
namespace utf8
{
extern bool JPcodePoint; // code point ordering (Japanese UTF) flag, used in idb_strcoll
const int MAX_UTF8_BYTES_PER_CHAR = 4;
// A global loc object so we don't construct one at every compare
extern std::locale loc;
// Is there a way to construct a global reference to a facet?
// const std::collate<char>& coll = std::use_facet<std::collate<char> >(loc);
//Infinidb version of strlocale BUG 5362
//set System Locale "C" by default
//return the system Locale currently set in from Columnstore.xml
inline
std::string idb_setlocale()
{
// get and set locale language
std::string systemLang("C");
oam::Oam oam;
static bool loggedMsg = false;
try
{
oam.getSystemConfig("SystemLang", systemLang);
}
catch (...)
{
systemLang = "C";
}
char* pLoc = setlocale(LC_ALL, systemLang.c_str());
if (pLoc == NULL)
{
try
{
if (!loggedMsg)
{
//send alarm
alarmmanager::ALARMManager alarmMgr;
std::string alarmItem = "system";
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET);
// Log one line
logging::LoggingID lid(17); // ProcessManager -- probably the only one to find this for now
logging::MessageLog ml(lid);
logging::Message msg(1);
logging::Message::Args args;
args.add("Failed to set locale ");
args.add(systemLang.c_str());
args.add(": Setting to 'C'. Critical alarm generated");
msg.format( args );
ml.logErrorMessage(msg);
loggedMsg = true;
}
systemLang = "C";
}
catch (...)
{
// Ignoring for time being.
}
}
else
{
try
{
//send alarm
alarmmanager::ALARMManager alarmMgr;
std::string alarmItem = "system";
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::CLEAR);
}
catch (...)
{
// Ignoring for time being.
}
}
printf ("Locale is : %s\n", systemLang.c_str() );
//BUG 2991
setlocale(LC_NUMERIC, "C");
if (systemLang.find("ja_JP") != std::string::npos)
JPcodePoint = true;
// MCOL-1559 Save off the locale to save runtime cpus
std::locale localloc(systemLang.c_str());
loc = localloc;
return systemLang;
}
// Infinidb version of strcoll. BUG 5362
// strcoll() comparison while ja_JP.utf8 does not give correct results.
// For correct results strcmp() can be used.
inline
int idb_strcoll(const char* str1, const char* str2)
{
if (JPcodePoint)
return strcmp(str1, str2);
else
return strcoll(str1, str2);
}
// MCOL-1559 Add a trimmed version of strcoll
// The intent here is to make no copy of the original strings and
// not modify them, so we can't use trim to deal with the spaces.
inline
int idb_strtrimcoll(const std::string& str1, const std::string& str2)
{
static const std::string whitespaces (" ");
const char* s1 = str1.c_str();
const char* s2 = str2.c_str();
// Set found1 to the last non-whitespace char in str1
std::size_t found1 = str1.find_last_not_of(whitespaces);
// Set found2 to the first whitespace char in str2
std::size_t found2 = str2.find_last_not_of(whitespaces);
// Are both strings empty or all whitespace?
if (found1 == std::string::npos && found2 == std::string::npos)
{
return 0; // they match
}
// If str1 is empty or all spaces
if (found1 == std::string::npos)
{
return -1;
}
// If str2 is empty or all spaces
if (found2 == std::string::npos)
{
return 1;
}
// found1 and found2 point to the character that is not a space.
// compare wants it to point to one past.
found1 += 1;
found2 += 1;
// If no trimming needs doing, then strcoll is faster
if (found1 == str1.size() && found2 == str2.size())
{
return idb_strcoll(s1, s2);
}
// Compare the (trimmed) strings
const std::collate<char>& coll = std::use_facet<std::collate<char> >(loc);
int rtn = coll.compare(s1, s1+found1, s2, s2+found2);
return rtn;
}
// BUG 5241
// Infinidb specific mbstowcs(). This will handle both windows and unix platforms
// Params dest and max should have enough length to accomodate NULL
inline
size_t idb_mbstowcs(wchar_t* dest, const char* src, size_t max)
{
#ifdef _MSC_VER
// 4th param (-1) denotes to convert till hit NULL char
// if 6th param max = 0, will return the required buffer size
size_t strwclen = MultiByteToWideChar(CP_UTF8, 0, src, -1, dest, (int)max);
// decrement the count of NULL; will become -1 on failure
return --strwclen;
#else
return mbstowcs(dest, src, max);
#endif
}
// BUG 5241
// Infinidb specific wcstombs(). This will handle both windows and unix platforms
// Params dest and max should have enough length to accomodate NULL
inline
size_t idb_wcstombs(char* dest, const wchar_t* src, size_t max)
{
#ifdef _MSC_VER
// 4th param (-1) denotes to convert till hit NULL char
//if 6th param max = 0, will return the required buffer size
size_t strmblen = WideCharToMultiByte( CP_UTF8, 0, src, -1, dest, (int)max, NULL, NULL);
// decrement the count of NULL; will become -1 on failure
return --strmblen;
#else
return wcstombs(dest, src, max);
#endif
}
// convert UTF-8 string to wstring
inline
std::wstring utf8_to_wstring (const std::string& str)
{
size_t bufsize = str.length() + 1;
// Convert to wide characters. Do all further work in wide characters
wchar_t* wcbuf = new wchar_t[bufsize];
// Passing +1 so that windows is happy to see extra position to place NULL
size_t strwclen = idb_mbstowcs(wcbuf, str.c_str(), str.length() + 1);
// if result is -1 it means bad characters which may happen if locale is wrong.
// return an empty string
if ( strwclen == static_cast<size_t>(-1) )
strwclen = 0;
std::wstring ret(wcbuf, strwclen);
delete [] wcbuf;
return ret;
}
// convert wstring to UTF-8 string
inline
std::string wstring_to_utf8 (const std::wstring& str)
{
char* outbuf = new char[(str.length() * MAX_UTF8_BYTES_PER_CHAR) + 1];
// Passing +1 so that windows is happy to see extra position to place NULL
size_t strmblen = idb_wcstombs(outbuf, str.c_str(), str.length() * MAX_UTF8_BYTES_PER_CHAR + 1);
// if result is -1 it means bad characters which may happen if locale is wrong.
// return an empty string
if ( strmblen == static_cast<size_t>(-1) )
strmblen = 0;
std::string ret(outbuf, strmblen);
delete [] outbuf;
return ret;
}
inline
uint8_t utf8_truncate_point(const char* input, size_t length)
{
// Find the beginning of a multibyte char to truncate at and return the
// number of bytes to truncate
if (length < 3)
{
return 0;
}
const unsigned char* b = (const unsigned char*)(input) + length - 3;
if (b[2] & 0x80)
{
// First byte in a new multi-byte sequence
if (b[2] & 0x40) return 1;
// 3 byte sequence
else if ((b[1] & 0xe0) == 0xe0) return 2;
// 4 byte sequence
else if ((b[0] & 0xf0) == 0xf0) return 3;
}
return 0;
}
} //namespace utf8
} //namespace funcexp
#endif

34
utils/rowgroup/rowaggregation.cpp
View File

@ -24,6 +24,10 @@
* is the primary class. * is the primary class.
*/ */
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <unistd.h> #include <unistd.h>
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
@ -384,36 +388,16 @@ inline void RowAggregation::updateFloatMinMax(float val1, float val2, int64_t co
fRow.setFloatField(val1, col); fRow.setFloatField(val1, col);
} }
#define STRCOLL_ENH__
void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func) void RowAggregation::updateStringMinMax(string val1, string val2, int64_t col, int func)
{ {
if (isNull(fRowGroupOut, fRow, col)) CHARSET_INFO* cs = fRowGroupIn.getCharset(col);
int tmp = cs->strnncoll(val1.c_str(), val1.length(), val2.c_str(), val2.length());
if ((tmp < 0 && func == rowgroup::ROWAGG_MIN) ||
(tmp > 0 && func == rowgroup::ROWAGG_MAX))
{ {
fRow.setStringField(val1, col); fRow.setStringField(val1, col);
} }
#ifdef STRCOLL_ENH__
else
{
int tmp = utf8::idb_strcoll(val1.c_str(), val2.c_str());
if ((tmp < 0 && func == rowgroup::ROWAGG_MIN) ||
(tmp > 0 && func == rowgroup::ROWAGG_MAX))
{
fRow.setStringField(val1, col);
}
}
#else
else if (minMax(val1, val2, func))
{
fRow.setStringField(val1, col);
}
#endif
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

5
utils/rowgroup/rowaggregation.h
View File

@ -53,6 +53,9 @@
#include "mcsv1_udaf.h" #include "mcsv1_udaf.h"
#include "constantcolumn.h" #include "constantcolumn.h"
// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;
// To do: move code that depends on joblist to a proper subsystem. // To do: move code that depends on joblist to a proper subsystem.
namespace joblist namespace joblist
{ {
@ -706,7 +709,7 @@ protected:
// We need a separate copy for each thread. // We need a separate copy for each thread.
mcsv1sdk::mcsv1Context fRGContext; mcsv1sdk::mcsv1Context fRGContext;
// These are handy for testing the actual type of static_any for UDAF // These are handy for testing the actual type of static_any for UDAF
static const static_any::any& charTypeId; static const static_any::any& charTypeId;
static const static_any::any& scharTypeId; static const static_any::any& scharTypeId;

31
utils/rowgroup/rowgroup.cpp
View File

@ -505,8 +505,8 @@ Row::Row() : data(NULL), strings(NULL), userDataStore(NULL) { }
Row::Row(const Row& r) : columnCount(r.columnCount), baseRid(r.baseRid), Row::Row(const Row& r) : columnCount(r.columnCount), baseRid(r.baseRid),
oldOffsets(r.oldOffsets), stOffsets(r.stOffsets), oldOffsets(r.oldOffsets), stOffsets(r.stOffsets),
offsets(r.offsets), colWidths(r.colWidths), types(r.types), data(r.data), offsets(r.offsets), colWidths(r.colWidths), types(r.types), charsetNumbers(r.charsetNumbers),
scale(r.scale), precision(r.precision), strings(r.strings), data(r.data), scale(r.scale), precision(r.precision), strings(r.strings),
useStringTable(r.useStringTable), hasLongStringField(r.hasLongStringField), useStringTable(r.useStringTable), hasLongStringField(r.hasLongStringField),
sTableThreshold(r.sTableThreshold), forceInline(r.forceInline), userDataStore(NULL) sTableThreshold(r.sTableThreshold), forceInline(r.forceInline), userDataStore(NULL)
{ } { }
@ -522,6 +522,7 @@ Row& Row::operator=(const Row& r)
offsets = r.offsets; offsets = r.offsets;
colWidths = r.colWidths; colWidths = r.colWidths;
types = r.types; types = r.types;
charsetNumbers = r.charsetNumbers;
data = r.data; data = r.data;
scale = r.scale; scale = r.scale;
precision = r.precision; precision = r.precision;
@ -1006,6 +1007,7 @@ RowGroup::RowGroup(uint32_t colCount,
const vector<uint32_t>& roids, const vector<uint32_t>& roids,
const vector<uint32_t>& tkeys, const vector<uint32_t>& tkeys,
const vector<CalpontSystemCatalog::ColDataType>& colTypes, const vector<CalpontSystemCatalog::ColDataType>& colTypes,
const vector<uint32_t>& csNumbers,
const vector<uint32_t>& cscale, const vector<uint32_t>& cscale,
const vector<uint32_t>& cprecision, const vector<uint32_t>& cprecision,
uint32_t stringTableThreshold, uint32_t stringTableThreshold,
@ -1013,7 +1015,7 @@ RowGroup::RowGroup(uint32_t colCount,
const vector<bool>& forceInlineData const vector<bool>& forceInlineData
) : ) :
columnCount(colCount), data(NULL), oldOffsets(positions), oids(roids), keys(tkeys), columnCount(colCount), data(NULL), oldOffsets(positions), oids(roids), keys(tkeys),
types(colTypes), scale(cscale), precision(cprecision), rgData(NULL), strings(NULL), types(colTypes), charsetNumbers(csNumbers), scale(cscale), precision(cprecision), rgData(NULL), strings(NULL),
sTableThreshold(stringTableThreshold) sTableThreshold(stringTableThreshold)
{ {
uint32_t i; uint32_t i;
@ -1047,12 +1049,16 @@ RowGroup::RowGroup(uint32_t colCount,
useStringTable = (stringTable && hasLongStringField); useStringTable = (stringTable && hasLongStringField);
offsets = (useStringTable ? &stOffsets[0] : &oldOffsets[0]); offsets = (useStringTable ? &stOffsets[0] : &oldOffsets[0]);
// Set all the charsets to NULL for jit initialization.
charsets.insert(charsets.begin(), charsetNumbers.size(), NULL);
} }
RowGroup::RowGroup(const RowGroup& r) : RowGroup::RowGroup(const RowGroup& r) :
columnCount(r.columnCount), data(r.data), oldOffsets(r.oldOffsets), columnCount(r.columnCount), data(r.data), oldOffsets(r.oldOffsets),
stOffsets(r.stOffsets), colWidths(r.colWidths), stOffsets(r.stOffsets), colWidths(r.colWidths),
oids(r.oids), keys(r.keys), types(r.types), scale(r.scale), precision(r.precision), oids(r.oids), keys(r.keys), types(r.types), charsetNumbers(r.charsetNumbers),
charsets(r.charsets), scale(r.scale), precision(r.precision),
rgData(r.rgData), strings(r.strings), useStringTable(r.useStringTable), rgData(r.rgData), strings(r.strings), useStringTable(r.useStringTable),
hasLongStringField(r.hasLongStringField), sTableThreshold(r.sTableThreshold), hasLongStringField(r.hasLongStringField), sTableThreshold(r.sTableThreshold),
forceInline(r.forceInline) forceInline(r.forceInline)
@ -1076,6 +1082,8 @@ RowGroup& RowGroup::operator=(const RowGroup& r)
oids = r.oids; oids = r.oids;
keys = r.keys; keys = r.keys;
types = r.types; types = r.types;
charsetNumbers = r.charsetNumbers;
charsets = r.charsets;
data = r.data; data = r.data;
scale = r.scale; scale = r.scale;
precision = r.precision; precision = r.precision;
@ -1120,6 +1128,7 @@ void RowGroup::serialize(ByteStream& bs) const
serializeInlineVector<uint32_t>(bs, oids); serializeInlineVector<uint32_t>(bs, oids);
serializeInlineVector<uint32_t>(bs, keys); serializeInlineVector<uint32_t>(bs, keys);
serializeInlineVector<CalpontSystemCatalog::ColDataType>(bs, types); serializeInlineVector<CalpontSystemCatalog::ColDataType>(bs, types);
serializeInlineVector<uint32_t>(bs, charsetNumbers);
serializeInlineVector<uint32_t>(bs, scale); serializeInlineVector<uint32_t>(bs, scale);
serializeInlineVector<uint32_t>(bs, precision); serializeInlineVector<uint32_t>(bs, precision);
bs << (uint8_t) useStringTable; bs << (uint8_t) useStringTable;
@ -1139,6 +1148,7 @@ void RowGroup::deserialize(ByteStream& bs)
deserializeInlineVector<uint32_t>(bs, oids); deserializeInlineVector<uint32_t>(bs, oids);
deserializeInlineVector<uint32_t>(bs, keys); deserializeInlineVector<uint32_t>(bs, keys);
deserializeInlineVector<CalpontSystemCatalog::ColDataType>(bs, types); deserializeInlineVector<CalpontSystemCatalog::ColDataType>(bs, types);
deserializeInlineVector<uint32_t>(bs, charsetNumbers);
deserializeInlineVector<uint32_t>(bs, scale); deserializeInlineVector<uint32_t>(bs, scale);
deserializeInlineVector<uint32_t>(bs, precision); deserializeInlineVector<uint32_t>(bs, precision);
bs >> tmp8; bs >> tmp8;
@ -1156,6 +1166,10 @@ void RowGroup::deserialize(ByteStream& bs)
offsets = &stOffsets[0]; offsets = &stOffsets[0];
else if (!useStringTable && !oldOffsets.empty()) else if (!useStringTable && !oldOffsets.empty())
offsets = &oldOffsets[0]; offsets = &oldOffsets[0];
// Set all the charsets to NULL for jit initialization.
charsets.insert(charsets.begin(), charsetNumbers.size(), NULL);
} }
void RowGroup::serializeRGData(ByteStream& bs) const void RowGroup::serializeRGData(ByteStream& bs) const
@ -1467,6 +1481,15 @@ void RowGroup::addToSysDataList(execplan::CalpontSystemCatalog::NJLSysDataList&
} }
} }
CHARSET_INFO* RowGroup::getCharset(uint32_t col)
{
if (charsets[col] == NULL)
{
charsets[col] = get_charset(charsetNumbers[col], MYF(MY_WME));
}
return charsets[col];
}
void RowGroup::setDBRoot(uint32_t dbroot) void RowGroup::setDBRoot(uint32_t dbroot)
{ {
*((uint32_t*) &data[dbRootOffset]) = dbroot; *((uint32_t*) &data[dbRootOffset]) = dbroot;

38
utils/rowgroup/rowgroup.h
View File

@ -58,6 +58,11 @@
#include "../winport/winport.h" #include "../winport/winport.h"
// Because including my_sys.h in a Columnstore header causes too many conflicts
struct charset_info_st;
typedef const struct charset_info_st CHARSET_INFO;
// Workaround for my_global.h #define of isnan(X) causing a std::std namespace // Workaround for my_global.h #define of isnan(X) causing a std::std namespace
namespace rowgroup namespace rowgroup
@ -319,6 +324,7 @@ public:
inline execplan::CalpontSystemCatalog::ColDataType getColType(uint32_t colIndex) const; inline execplan::CalpontSystemCatalog::ColDataType getColType(uint32_t colIndex) const;
inline execplan::CalpontSystemCatalog::ColDataType* getColTypes(); inline execplan::CalpontSystemCatalog::ColDataType* getColTypes();
inline const execplan::CalpontSystemCatalog::ColDataType* getColTypes() const; inline const execplan::CalpontSystemCatalog::ColDataType* getColTypes() const;
inline uint32_t getCharsetNumber(uint32_t colIndex) const;
// this returns true if the type is not CHAR or VARCHAR // this returns true if the type is not CHAR or VARCHAR
inline bool isCharType(uint32_t colIndex) const; inline bool isCharType(uint32_t colIndex) const;
@ -461,6 +467,7 @@ private:
uint32_t* offsets; uint32_t* offsets;
uint32_t* colWidths; uint32_t* colWidths;
execplan::CalpontSystemCatalog::ColDataType* types; execplan::CalpontSystemCatalog::ColDataType* types;
uint32_t* charsetNumbers;
uint8_t* data; uint8_t* data;
uint32_t* scale; uint32_t* scale;
uint32_t* precision; uint32_t* precision;
@ -569,6 +576,11 @@ inline const execplan::CalpontSystemCatalog::ColDataType* Row::getColTypes() con
return types; return types;
} }
inline uint32_t Row::getCharsetNumber(uint32_t col) const
{
return charsetNumbers[col];
}
inline bool Row::isCharType(uint32_t colIndex) const inline bool Row::isCharType(uint32_t colIndex) const
{ {
return execplan::isCharType(types[colIndex]); return execplan::isCharType(types[colIndex]);
@ -1268,6 +1280,7 @@ public:
@param coids An array of oids for each column. @param coids An array of oids for each column.
@param tkeys An array of unique id for each column. @param tkeys An array of unique id for each column.
@param colTypes An array of COLTYPEs for each column. @param colTypes An array of COLTYPEs for each column.
@param charsetNumbers an Array of the lookup numbers for the charset/collation object.
@param scale An array specifying the scale of DECIMAL types (0 for non-decimal) @param scale An array specifying the scale of DECIMAL types (0 for non-decimal)
@param precision An array specifying the precision of DECIMAL types (0 for non-decimal) @param precision An array specifying the precision of DECIMAL types (0 for non-decimal)
*/ */
@ -1277,6 +1290,7 @@ public:
const std::vector<uint32_t>& cOids, const std::vector<uint32_t>& cOids,
const std::vector<uint32_t>& tkeys, const std::vector<uint32_t>& tkeys,
const std::vector<execplan::CalpontSystemCatalog::ColDataType>& colTypes, const std::vector<execplan::CalpontSystemCatalog::ColDataType>& colTypes,
const std::vector<uint32_t>& charsetNumbers,
const std::vector<uint32_t>& scale, const std::vector<uint32_t>& scale,
const std::vector<uint32_t>& precision, const std::vector<uint32_t>& precision,
uint32_t stringTableThreshold, uint32_t stringTableThreshold,
@ -1284,7 +1298,7 @@ public:
const std::vector<bool>& forceInlineData = std::vector<bool>() const std::vector<bool>& forceInlineData = std::vector<bool>()
); );
/** @brief The copiers. It copies metadata, not the row data */ /** @brief The copiers. It copies metadata, not thetypes row data */
RowGroup(const RowGroup&); RowGroup(const RowGroup&);
/** @brief Assignment operator. It copies metadata, not the row data */ /** @brief Assignment operator. It copies metadata, not the row data */
@ -1338,6 +1352,8 @@ public:
inline execplan::CalpontSystemCatalog::ColDataType getColType(uint32_t colIndex) const; inline execplan::CalpontSystemCatalog::ColDataType getColType(uint32_t colIndex) const;
inline const std::vector<execplan::CalpontSystemCatalog::ColDataType>& getColTypes() const; inline const std::vector<execplan::CalpontSystemCatalog::ColDataType>& getColTypes() const;
inline std::vector<execplan::CalpontSystemCatalog::ColDataType>& getColTypes(); inline std::vector<execplan::CalpontSystemCatalog::ColDataType>& getColTypes();
inline const std::vector<uint32_t>& getCharsetNumbers() const;
inline uint32_t getCharsetNumber(uint32_t colIndex) const;
inline boost::shared_array<bool>& getForceInline(); inline boost::shared_array<bool>& getForceInline();
static inline uint32_t getHeaderSize() static inline uint32_t getHeaderSize()
{ {
@ -1397,6 +1413,8 @@ public:
uint16_t* blockNum); uint16_t* blockNum);
inline void setStringStore(boost::shared_ptr<StringStore>); inline void setStringStore(boost::shared_ptr<StringStore>);
CHARSET_INFO* getCharset(uint32_t col);
private: private:
uint32_t columnCount; uint32_t columnCount;
@ -1413,8 +1431,11 @@ private:
// Used to map the projected column and rowgroup index // Used to map the projected column and rowgroup index
std::vector<uint32_t> keys; std::vector<uint32_t> keys;
std::vector<execplan::CalpontSystemCatalog::ColDataType> types; std::vector<execplan::CalpontSystemCatalog::ColDataType> types;
// For string collation
// DECIMAL support. For non-decimal fields, the values are 0. std::vector<uint32_t> charsetNumbers;
std::vector<CHARSET_INFO*> charsets;
// DECIMAL support. For non-decimal fields, the valutypeses are 0.
std::vector<uint32_t> scale; std::vector<uint32_t> scale;
std::vector<uint32_t> precision; std::vector<uint32_t> precision;
@ -1547,6 +1568,7 @@ void RowGroup::initRow(Row* r, bool forceInlineData) const
{ {
r->colWidths = (uint32_t*) &colWidths[0]; r->colWidths = (uint32_t*) &colWidths[0];
r->types = (execplan::CalpontSystemCatalog::ColDataType*) & (types[0]); r->types = (execplan::CalpontSystemCatalog::ColDataType*) & (types[0]);
r->charsetNumbers = (uint32_t*) & (charsetNumbers[0]);
r->scale = (uint32_t*) & (scale[0]); r->scale = (uint32_t*) & (scale[0]);
r->precision = (uint32_t*) & (precision[0]); r->precision = (uint32_t*) & (precision[0]);
} }
@ -1649,6 +1671,16 @@ inline std::vector<execplan::CalpontSystemCatalog::ColDataType>& RowGroup::getCo
return types; return types;
} }
inline const std::vector<uint32_t>& RowGroup::getCharsetNumbers() const
{
return charsetNumbers;
}
inline uint32_t RowGroup::getCharsetNumber(uint32_t colIndex) const
{
return charsetNumbers[colIndex];
}
inline const std::vector<uint32_t>& RowGroup::getScale() const inline const std::vector<uint32_t>& RowGroup::getScale() const
{ {
return scale; return scale;

25
utils/udfsdk/mcsv1_udaf.h
View File

@ -369,6 +369,11 @@ public:
EXPORT mcsv1Context& operator=(const mcsv1Context& rhs); EXPORT mcsv1Context& operator=(const mcsv1Context& rhs);
EXPORT mcsv1Context& copy(const mcsv1Context& rhs); EXPORT mcsv1Context& copy(const mcsv1Context& rhs);
// Character collation support
EXPORT void setCharsetNumber(uint32_t csNum);
EXPORT uint32_t getCharsetNumber(); // Returns the unique ID for the language/collation
EXPORT CHARSET_INFO* getCharset();
private: private:
@ -392,6 +397,7 @@ private:
int32_t fParamCount; int32_t fParamCount;
std::vector<uint32_t> paramKeys; std::vector<uint32_t> paramKeys;
enum_mariadb_return_type mariadbReturnType; enum_mariadb_return_type mariadbReturnType;
uint32_t fCharsetNumber;
public: public:
// For use by the framework // For use by the framework
@ -416,6 +422,7 @@ public:
EXPORT void setParamCount(int32_t paramCount); EXPORT void setParamCount(int32_t paramCount);
std::vector<uint32_t>* getParamKeys(); std::vector<uint32_t>* getParamKeys();
EXPORT void setMariaDBReturnType(enum_mariadb_return_type rt); EXPORT void setMariaDBReturnType(enum_mariadb_return_type rt);
}; };
// Since aggregate functions can operate on any data type, we use the following structure // Since aggregate functions can operate on any data type, we use the following structure
@ -438,7 +445,9 @@ struct ColumnDatum
uint32_t scale; // If dataType is a DECIMAL type uint32_t scale; // If dataType is a DECIMAL type
uint32_t precision; // If dataType is a DECIMAL type uint32_t precision; // If dataType is a DECIMAL type
std::string alias; // Only filled in for init() std::string alias; // Only filled in for init()
ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED), scale(0), precision(-1) {}; uint32_t charsetNumber; // For string collations
ColumnDatum() : dataType(execplan::CalpontSystemCatalog::UNDEFINED),
scale(0), precision(-1), charsetNumber(8) {};
}; };
// Override mcsv1_UDAF to build your User Defined Aggregate (UDAF) and/or // Override mcsv1_UDAF to build your User Defined Aggregate (UDAF) and/or
@ -658,7 +667,8 @@ inline mcsv1Context::mcsv1Context() :
fStartConstant(0), fStartConstant(0),
fEndConstant(0), fEndConstant(0),
func(NULL), func(NULL),
fParamCount(0) fParamCount(0),
fCharsetNumber(8) // Latin1
{ {
} }
@ -683,6 +693,7 @@ inline mcsv1Context& mcsv1Context::copy(const mcsv1Context& rhs)
bInterrupted = rhs.bInterrupted; // Multiple threads will use the same reference bInterrupted = rhs.bInterrupted; // Multiple threads will use the same reference
func = rhs.func; func = rhs.func;
fParamCount = rhs.fParamCount; fParamCount = rhs.fParamCount;
fCharsetNumber = rhs.fCharsetNumber;
return *this; return *this;
} }
@ -979,6 +990,16 @@ inline void mcsv1Context::setMariaDBReturnType(enum_mariadb_return_type rt)
mariadbReturnType = rt; mariadbReturnType = rt;
} }
inline void mcsv1Context::setCharsetNumber(uint32_t csNum)
{
fCharsetNumber=csNum;
}
inline uint32_t mcsv1Context::getCharsetNumber()
{
return fCharsetNumber;
}
inline mcsv1_UDAF::ReturnCode mcsv1_UDAF::dropValue(mcsv1Context* context, ColumnDatum* valsDropped) inline mcsv1_UDAF::ReturnCode mcsv1_UDAF::dropValue(mcsv1Context* context, ColumnDatum* valsDropped)
{ {
return NOT_IMPLEMENTED; return NOT_IMPLEMENTED;

4
versioning/BRM/masternode.cpp
View File

@ -103,7 +103,9 @@ void reload(int num)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
BRM::logInit ( BRM::SubSystemLogId_controllerNode ); BRM::logInit ( BRM::SubSystemLogId_controllerNode );

3
versioning/BRM/slavenode.cpp
View File

@ -79,7 +79,8 @@ void reset(int sig)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
BRM::logInit ( BRM::SubSystemLogId_workerNode ); BRM::logInit ( BRM::SubSystemLogId_workerNode );

12
writeengine/bulk/cpimport.cpp
View File

@ -1092,7 +1092,17 @@ int main(int argc, char** argv)
setupSignalHandlers(); setupSignalHandlers();
// Set locale language // Set locale language
utf8::idb_setlocale(); const char* pLoc = setlocale(LC_ALL, "");
if (pLoc)
{
// Log one line
cout << "Locale = " << pLoc;
}
else
{
cout << "Failed to set locale ";
}
setlocale(LC_NUMERIC, "C");
// Initialize singleton instance of syslogging // Initialize singleton instance of syslogging
if (argc > 0) if (argc > 0)

11
writeengine/server/we_server.cpp
View File

@ -19,6 +19,9 @@
* $Id: we_server.cpp 4700 2013-07-08 16:43:49Z bpaul $ * $Id: we_server.cpp 4700 2013-07-08 16:43:49Z bpaul $
* *
*******************************************************************************/ *******************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include <unistd.h> #include <unistd.h>
#include <iostream> #include <iostream>
@ -102,7 +105,10 @@ int setupResources()
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// Set locale language // Set locale language
utf8::idb_setlocale(); setlocale(LC_ALL, "");
setlocale(LC_NUMERIC, "C");
// Initialize the charset library
my_init();
// This is unset due to the way we start it // This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("WriteEngineServ"); program_invocation_short_name = const_cast<char*>("WriteEngineServ");
@ -135,8 +141,7 @@ int main(int argc, char** argv)
{ {
} }
} }
//BUG 2991
setlocale(LC_NUMERIC, "C");
#ifndef _MSC_VER #ifndef _MSC_VER
struct sigaction sa; struct sigaction sa;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));