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-1496 Fix array bug in joiner

Browse Source 
Found using -D_GLIBCXX_ASSERTIONS
This commit is contained in:
Andrew Hutchings
2018-06-25 11:17:50 +01:00
parent 1ca68f63e2
commit 5fe9a91290
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/joiner/tuplejoiner.cpp
View File

@@ -131,7 +131,7 @@ TupleJoiner::TupleJoiner(
cpValues.reset(new vector<int64_t>[smallKeyColumns.size()]); cpValues.reset(new vector<int64_t>[smallKeyColumns.size()]);
for (uint32_t i = 0; i < smallKeyColumns.size(); i++) { for (uint32_t i = 0; i < smallKeyColumns.size(); i++) {
discreteValues[i] = false; discreteValues[i] = false;
if (isUnsigned(smallRG.getColType(i))) if (isUnsigned(smallRG.getColTypes()[smallKeyColumns[i]]))
{ {
cpValues[i].push_back(static_cast<int64_t>(numeric_limits<uint64_t>::max())); cpValues[i].push_back(static_cast<int64_t>(numeric_limits<uint64_t>::max()));
cpValues[i].push_back(0); cpValues[i].push_back(0);
@@ -859,7 +859,7 @@ boost::shared_ptr<TupleJoiner> TupleJoiner::copyForDiskJoin()
ret->cpValues.reset(new vector<int64_t>[smallKeyColumns.size()]); ret->cpValues.reset(new vector<int64_t>[smallKeyColumns.size()]);
for (uint32_t i = 0; i < smallKeyColumns.size(); i++) { for (uint32_t i = 0; i < smallKeyColumns.size(); i++) {
ret->discreteValues[i] = false; ret->discreteValues[i] = false;
if (isUnsigned(smallRG.getColType(i))) if (isUnsigned(smallRG.getColTypes()[smallKeyColumns[i]]))
{ {
ret->cpValues[i].push_back(static_cast<int64_t>(numeric_limits<uint64_t>::max())); ret->cpValues[i].push_back(static_cast<int64_t>(numeric_limits<uint64_t>::max()));
ret->cpValues[i].push_back(0); ret->cpValues[i].push_back(0);