database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

MCOL-3536 Collation

Browse Source
This commit is contained in:
David Hall
2020-05-28 14:19:17 -05:00
parent 06e50e0926
commit 2e66b1f1e8
11 changed files with 258 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dbcon/joblist/expressionstep.cpp
View File

@@ -397,9 +397,11 @@ void ExpressionStep::populateColumnInfo(SimpleColumn* sc, JobInfo& jobInfo)
//XXX use this before connector sets colType in sc correctly.
// type of pseudo column is set by connector
// if (dynamic_cast<PseudoColumn*>(sc) == NULL)
// ct = jobInfo.csc->colType(sc->oid());
if (dynamic_cast<PseudoColumn*>(sc) == NULL)
{
ct = jobInfo.csc->colType(sc->oid());
ct.charsetNumber =sc->colType().charsetNumber;
}
//X
if (ct.scale == 0) // keep passed original ct for decimal type
sc->resultType(ct); // update from mysql type to calpont type
@@ -526,7 +528,10 @@ void ExpressionStep::updateInputIndex(map<uint32_t, uint32_t>& indexMap, const J
//XXX use this before connector sets colType in sc correctly.
// type of pseudo column is set by connector
if (dynamic_cast<PseudoColumn*>(sc) == NULL)
{
ct = jobInfo.csc->colType(oid);
ct.charsetNumber =sc->colType().charsetNumber;
}
//X
dictOid = joblist::isDictCol(ct);