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-4771 develop fix crash from rand()

Browse Source
This commit is contained in:
David Hall
2021-08-06 16:09:28 -05:00
parent f4f6cf8b09
commit 4d4dd22105
2 changed files with 2 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
utils/funcexp/func_rand.cpp
View File

@@ -53,14 +53,6 @@ double Func_rand::getRand()
fSeed1 += 23; fSeed1 += 23;
fSeed2 = (fSeed1 + fSeed2 + 33) % maxValue; fSeed2 = (fSeed1 + fSeed2 + 33) % maxValue;
if (fSeeds.size() > fSeedIndex)
{
fSeeds[fSeedIndex] = std::make_pair(fSeed1, fSeed2);
}
else
{
fSeeds.push_back(std::make_pair(fSeed1, fSeed2));
}
return (((double) fSeed1) / (double)maxValue); return (((double) fSeed1) / (double)maxValue);
} }
@@ -79,37 +71,6 @@ double Func_rand::getDoubleVal(rowgroup::Row& row,
// NOTE: this function needs to use 32bit ints otherwise it will break for negative values // NOTE: this function needs to use 32bit ints otherwise it will break for negative values
uint32_t seedParm = 0; uint32_t seedParm = 0;
// Still on first row, multiple rands exist in statement. Need an additional seed.
if(fFirstRow == row.getData())
{
fSeedSet = false;
fSeedIndex += 1;
}
else if (fFirstRow == nullptr)
{
// Store first row
fFirstRow = row.getData();
fSeedIndex = 0;
}
else
{
// No longer on first row. Disable additional seeding
if (!fMultipleSeedsSet)
{
fMultipleSeedsSet = true;
fSeedIndex = 0;
}
else
{
fSeedIndex += 1;
if (fSeedIndex == fSeeds.size())
{
fSeedIndex = 0;
}
}
}
// rand with parameter. if the parm is constanct, then a column is attached for fetching // rand with parameter. if the parm is constanct, then a column is attached for fetching
if (parm.size() == 1 || parm.size() == 2) if (parm.size() == 1 || parm.size() == 2)
{ {
@@ -122,28 +83,17 @@ double Func_rand::getDoubleVal(rowgroup::Row& row,
fSeed1 = (uint32_t)(seedParm * 0x10001L + 55555555L); fSeed1 = (uint32_t)(seedParm * 0x10001L + 55555555L);
fSeed2 = (uint32_t)(seedParm * 0x10000001L); fSeed2 = (uint32_t)(seedParm * 0x10000001L);
fSeedSet = true; fSeedSet = true;
fSeeds.push_back(std::make_pair(fSeed1, fSeed2));
}
else
{
const std::pair<uint64_t, uint64_t> &seedPair = fSeeds[fSeedIndex];
fSeed1 = seedPair.first;
fSeed2 = seedPair.second;
} }
} }
// rand without parameter. thd->rand are passed in. The 3rd is a simple column for fetching // rand without parameter. thd->rand are passed in. The 3rd is a simple column for fetching
else else
{ {
idbassert(parm.size() == 3); idbassert(parm.size() == 3);
if (fSeedSet)
if (fSeed1 == 0)
{ {
fSeed1 = parm[0]->data()->getIntVal(row, isNull); fSeed1 = parm[0]->data()->getIntVal(row, isNull);
fSeed2 = parm[1]->data()->getIntVal(row, isNull); fSeed2 = parm[1]->data()->getIntVal(row, isNull);
fSeedSet = true; fSeedSet = true;
// Special case: statement such as select rand(), rand(1) so need to keep rand(1) seeded correctly
fSeeds.push_back(std::make_pair(fSeed1, fSeed2));
} }
} }

13
utils/funcexp/functor_export.h
View File

@@ -38,17 +38,10 @@ namespace funcexp
class Func_rand : public Func class Func_rand : public Func
{ {
public: public:
Func_rand() : Func("rand"), fSeed1(0), fSeed2(0), fSeedSet(false), fMultipleSeedsSet(false), fFirstRow(NULL), fSeeds(){} Func_rand() : Func("rand"), fSeed1(0), fSeed2(0), fSeedSet(false) {}
virtual ~Func_rand() {} virtual ~Func_rand() {}
double getRand(); double getRand();
void seedSet(bool seedSet)
{
fSeedSet = seedSet;
fMultipleSeedsSet = seedSet;
fFirstRow = NULL;
fSeeds.clear();
}
execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType); execplan::CalpontSystemCatalog::ColType operationType(FunctionParm& fp, execplan::CalpontSystemCatalog::ColType& resultType);
int64_t getIntVal(rowgroup::Row& row, int64_t getIntVal(rowgroup::Row& row,
@@ -84,10 +77,6 @@ private:
uint64_t fSeed1; uint64_t fSeed1;
uint64_t fSeed2; uint64_t fSeed2;
bool fSeedSet; bool fSeedSet;
bool fMultipleSeedsSet;
uint8_t* fFirstRow;
uint16_t fSeedIndex;
std::vector<std::pair<uint64_t, uint64_t> > fSeeds;
}; };