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-641 Fix for GROUP BY on wide-DECIMALs.

Browse Source
This commit is contained in:
Roman Nozdrin
2020-05-18 13:00:20 +00:00
parent a7fcf39f2a
commit 51d77d74df
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/rowgroup-tests.cpp
View File

@ -70,13 +70,6 @@ protected:
cscale.push_back(0); cscale.push_back(0);
} }
/*offsets.push_back(INITIAL_ROW_OFFSET);
offsets.push_back(16+INITIAL_ROW_OFFSET);
offsets.push_back(16*2+INITIAL_ROW_OFFSET);
roids.push_back(oid); roids.push_back(oid+1);
tkeys.push_back(1); tkeys.push_back(1);
cscale.push_back(0); cscale.push_back(0);*/
rowgroup::RowGroup inRG(roids.size(), // column count rowgroup::RowGroup inRG(roids.size(), // column count
offsets, // oldOffset offsets, // oldOffset
roids, // column oids roids, // column oids
@ -159,7 +152,7 @@ protected:
// void TearDown() override {} // void TearDown() override {}
rowgroup::Row r, rOut; rowgroup::Row r, rOut, sameRow, nonequiRow;
rowgroup::Row rOutMappingCheck; rowgroup::Row rOutMappingCheck;
rowgroup::RowGroup rg, rgOut; rowgroup::RowGroup rg, rgOut;
rowgroup::RGData rgD, rgDOut; rowgroup::RGData rgD, rgDOut;
@ -208,8 +201,6 @@ TEST_F(RowDecimalTest, GetBinaryFieldCheck)
rg.getRow(0, &r); rg.getRow(0, &r);
uint128_t* u128Value; uint128_t* u128Value;
int128_t* s128Value; int128_t* s128Value;
// std::remove_reference<decltype(*u128Value)>::type uType;
// std::remove_reference<decltype(*s128Value)>::type sType;
for (size_t i = 0; i < sValueVector.size(); i++) for (size_t i = 0; i < sValueVector.size(); i++)
{ {
@ -302,7 +293,24 @@ TEST_F(RowDecimalTest, CopyBinaryFieldCheck)
} }
} }
// WIP
TEST_F(RowDecimalTest, RowEqualsCheck) TEST_F(RowDecimalTest, RowEqualsCheck)
{ {
rg.getRow(0, &r);
rg.getRow(0, &sameRow);
rg.getRow(1, &nonequiRow);
for (size_t i = 0; i < sValueVector.size(); i++)
{
EXPECT_TRUE(r.equals(sameRow));
if (i < sValueVector.size()-1)
{
EXPECT_FALSE(r.equals(nonequiRow));
}
r.nextRow(rowSize);
sameRow.nextRow(rowSize);
if (i < sValueVector.size()-1)
{
nonequiRow.nextRow(rowSize);
}
}
} }

2
utils/rowgroup/rowgroup.h
View File

@ -1359,7 +1359,7 @@ inline bool Row::equals(const Row& r2, uint32_t lastCol) const
} }
else if (UNLIKELY(execplan::isDecimal(columnType))) else if (UNLIKELY(execplan::isDecimal(columnType)))
{ {
if (getBinaryField<int128_t>(i) != r2.getBinaryField<int128_t>(i)) if (*getBinaryField<int128_t>(i) != *r2.getBinaryField<int128_t>(i))
return false; return false;
} }