database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-4620 Add charset to various RowGroup initializers

Browse Source 
Specifically to operator+=
This commit is contained in:
David Hall
2021-03-19 16:57:54 -05:00
parent 5943261bfc
commit 13b7a794e4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/rowgroup/rowgroup.cpp
View File

@ -1253,6 +1253,8 @@ RowGroup::RowGroup() : columnCount(0), data(NULL), rgData(NULL), strings(NULL),
oids.reserve(10); oids.reserve(10);
keys.reserve(10); keys.reserve(10);
types.reserve(10); types.reserve(10);
charsetNumbers.reserve(10);
charsets.reserve(10);
scale.reserve(10); scale.reserve(10);
precision.reserve(10); precision.reserve(10);
} }
@ -1644,6 +1646,8 @@ RowGroup& RowGroup::operator+=(const RowGroup& rhs)
oids.insert(oids.end(), rhs.oids.begin(), rhs.oids.end()); oids.insert(oids.end(), rhs.oids.begin(), rhs.oids.end());
keys.insert(keys.end(), rhs.keys.begin(), rhs.keys.end()); keys.insert(keys.end(), rhs.keys.begin(), rhs.keys.end());
types.insert(types.end(), rhs.types.begin(), rhs.types.end()); types.insert(types.end(), rhs.types.begin(), rhs.types.end());
charsetNumbers.insert(charsetNumbers.end(), rhs.charsetNumbers.begin(), rhs.charsetNumbers.end());
charsets.insert(charsets.end(), rhs.charsets.begin(), rhs.charsets.end());
scale.insert(scale.end(), rhs.scale.begin(), rhs.scale.end()); scale.insert(scale.end(), rhs.scale.begin(), rhs.scale.end());
precision.insert(precision.end(), rhs.precision.begin(), rhs.precision.end()); precision.insert(precision.end(), rhs.precision.begin(), rhs.precision.end());
colWidths.insert(colWidths.end(), rhs.colWidths.begin(), rhs.colWidths.end()); colWidths.insert(colWidths.end(), rhs.colWidths.begin(), rhs.colWidths.end());
@ -1894,6 +1898,8 @@ RowGroup RowGroup::truncate(uint32_t cols)
ret.oids.resize(cols); ret.oids.resize(cols);
ret.keys.resize(cols); ret.keys.resize(cols);
ret.types.resize(cols); ret.types.resize(cols);
ret.charsetNumbers.resize(cols);
ret.charsets.resize(cols);
ret.scale.resize(cols); ret.scale.resize(cols);
ret.precision.resize(cols); ret.precision.resize(cols);
ret.forceInline.reset(new bool[cols]); ret.forceInline.reset(new bool[cols]);