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

MCOL-3536 collation

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

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>& keys = rg.getKeys();
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>& precisions = rg.getPrecision();
@ -869,6 +870,7 @@ void WindowFunctionStep::initialize(const RowGroup& rg, JobInfo& jobInfo)
vector<uint32_t> scales1;
vector<uint32_t> precisions1;
vector<CalpontSystemCatalog::ColDataType> types1;
vector<uint32_t> csNums1;
pos1.push_back(2);
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]);
precisions1.push_back(precisions[j]);
types1.push_back(types[j]);
csNums1.push_back(csNums[j]);
}
fRowGroupDelivered = RowGroup(
retColCount, pos1, oids1, keys1, types1, scales1, precisions1, jobInfo.stringTableThreshold);
retColCount, pos1, oids1, keys1, types1, csNums1, scales1, precisions1, jobInfo.stringTableThreshold);
if (jobInfo.trace)
cout << "delivered RG: " << fRowGroupDelivered.toString() << endl << endl;