VladPolskiy/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-25 15:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop-1.1' into develop-1.2-merge-up-20190517

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-17 20:43:49 +01:00
parent 8afc3f85d3 4628346746
commit ea2ff9cd11
4 changed files with 105 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dmlproc/dmlprocessor.h
View File

@ -151,15 +151,16 @@ private:
DMLServer(const DMLServer& rhs);
DMLServer& operator=(const DMLServer& rhs);
/** @brief the thread pool for processing dml packages
*/
threadpool::ThreadPool fDmlPackagepool;
int fPackageMaxThreads; /** @brief max number of threads to process dml packages */
int fPackageWorkQueueSize; /** @brief max number of packages waiting in the work queue */
boost::scoped_ptr<messageqcpp::MessageQueueServer> fMqServer;
BRM::DBRM* fDbrm;
public:
/** @brief the thread pool for processing dml packages
*/
static threadpool::ThreadPool fDmlPackagepool;
};
/** @brief Thread to process a single dml package.
@ -207,12 +208,12 @@ private:
// Used to serialize operations because the VSS can't handle inserts
// or updates on the same block.
// When an Insert, Update or Delete command arrives, we look here
// for the table oid. If found, wait until it is no onger here.
// for the table oid. If found, wait until it is no longer here.
// If this transactionID (SCN) is < the transactionID in the table, don't delay
// and hope for the best, as we're already out of order.
// When the VSS is engineered to handle transactions out of order, all MCOL-140
// code is to be removed.
int synchTableAccess();
int synchTableAccess(dmlpackage::CalpontDMLPackage* dmlPackage);
int releaseTableAccess();
int forceReleaseTableAccess();
typedef iterable_queue<execplan::CalpontSystemCatalog::SCN> tableAccessQueue_t;
@ -221,6 +222,35 @@ private:
static boost::mutex tableOidMutex;
public:
static int clearTableAccess();
// MCOL-3296 Add a class to call synchTableAccess on creation and
// releaseTableAccess on destuction for exception safeness.
class SynchTable
{
public:
SynchTable() : fphp(NULL) {};
SynchTable(PackageHandler* php, dmlpackage::CalpontDMLPackage* dmlPackage)
{
setPackage(php, dmlPackage);
}
~SynchTable()
{
if (fphp)
fphp->releaseTableAccess();
}
bool setPackage(PackageHandler* php, dmlpackage::CalpontDMLPackage* dmlPackage)
{
if (fphp)
fphp->releaseTableAccess();
fphp = php;
if (fphp)
fphp->synchTableAccess(dmlPackage);
return true;
}
private:
PackageHandler* fphp;
};
};
/** @brief processes dml packages as they arrive