database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

MCOL-371 fix mutex free crash

Browse Source 
It is possible for an exception to be thrown when a memory limit is hit
whilst a mutex is lock. That mutex is never unlocked and in Ubuntu 16.04
release build it can cause a crash when freed.

This patch catches the exception, releases the lock and then re-throws.
This commit is contained in:
Andrew Hutchings
2016-10-23 16:12:38 +01:00
parent 4a28e908e6
commit 877dc201bd
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dbcon/joblist/tupleaggregatestep.cpp
View File

@@ -348,10 +348,18 @@ void TupleAggregateStep::doThreadedSecondPhaseAggregate(uint32_t threadID)
{ {
if (!bucketDone[c] && fAgg_mutex[c]->try_lock()) if (!bucketDone[c] && fAgg_mutex[c]->try_lock())
{ {
if (multiDist) try
dynamic_cast<RowAggregationMultiDistinct*>(fAggregators[c].get())->doDistinctAggregation_rowVec(rowBucketVecs[c]); {
else if (multiDist)
dynamic_cast<RowAggregationDistinct*>(fAggregators[c].get())->doDistinctAggregation_rowVec(rowBucketVecs[c][0]); dynamic_cast<RowAggregationMultiDistinct*>(fAggregators[c].get())->doDistinctAggregation_rowVec(rowBucketVecs[c]);
else
dynamic_cast<RowAggregationDistinct*>(fAggregators[c].get())->doDistinctAggregation_rowVec(rowBucketVecs[c][0]);
}
catch(...)
{
fAgg_mutex[c]->unlock();
throw;
}
fAgg_mutex[c]->unlock(); fAgg_mutex[c]->unlock();
bucketDone[c] = true; bucketDone[c] = true;
rowBucketVecs[c][0].clear(); rowBucketVecs[c][0].clear();
@@ -4301,11 +4309,19 @@ void TupleAggregateStep::threadedAggregateRowGroups(uint32_t threadID)
{ {
if (!fEndOfResult && !bucketDone[c] && fAgg_mutex[c]->try_lock()) if (!fEndOfResult && !bucketDone[c] && fAgg_mutex[c]->try_lock())
{ {
didWork = true; try
if (multiDist) {
dynamic_cast<RowAggregationMultiDistinct*>(fAggregators[c].get())->addRowGroup(&fRowGroupIns[threadID], rowBucketVecs[c]); didWork = true;
else if (multiDist)
fAggregators[c]->addRowGroup(&fRowGroupIns[threadID], rowBucketVecs[c][0]); dynamic_cast<RowAggregationMultiDistinct*>(fAggregators[c].get())->addRowGroup(&fRowGroupIns[threadID], rowBucketVecs[c]);
else
fAggregators[c]->addRowGroup(&fRowGroupIns[threadID], rowBucketVecs[c][0]);
}
catch(...)
{
fAgg_mutex[c]->unlock();
throw;
}
fAgg_mutex[c]->unlock(); fAgg_mutex[c]->unlock();
rowBucketVecs[c][0].clear(); rowBucketVecs[c][0].clear();
bucketDone[c] = true; bucketDone[c] = true;