database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Review fixes

Browse Source
This commit is contained in:
Denis Khalikov
2024-05-10 10:15:36 +00:00
committed by Leonid Fedorov
parent c17f24b90f
commit 254ced25cf
2 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
dmlproc/dmlprocessor.cpp
View File

@ -541,6 +541,25 @@ int PackageHandler::clearTableAccess()
return 1; return 1;
} }
CalpontSystemCatalog::ROPair PackageHandler::getTableRID(
boost::shared_ptr<execplan::CalpontSystemCatalog> fcsc,
execplan::CalpontSystemCatalog::TableName& tableName)
{
execplan::CalpontSystemCatalog::ROPair roPair;
try
{
roPair = fcsc->tableRID(tableName);
}
catch (...)
{
if (setupDec())
throw;
roPair = fcsc->tableRID(tableName);
}
return roPair;
}
void PackageHandler::run() void PackageHandler::run()
{ {
ResourceManager* frm = ResourceManager::instance(); ResourceManager* frm = ResourceManager::instance();
@ -577,18 +596,7 @@ void PackageHandler::run()
CalpontSystemCatalog::TableName tableName; CalpontSystemCatalog::TableName tableName;
tableName.schema = insertPkg.get_Table()->get_SchemaName(); tableName.schema = insertPkg.get_Table()->get_SchemaName();
tableName.table = insertPkg.get_Table()->get_TableName(); tableName.table = insertPkg.get_Table()->get_TableName();
CalpontSystemCatalog::ROPair roPair; CalpontSystemCatalog::ROPair roPair = getTableRID(fcsc, tableName);
try
{
roPair = fcsc->tableRID(tableName);
}
catch (...)
{
if (setupDec())
throw;
roPair = fcsc->tableRID(tableName);
}
fTableOid = roPair.objnum; fTableOid = roPair.objnum;
} }
synchTable.setPackage(this, &insertPkg); // Blocks if another DML thread is using this fTableOid synchTable.setPackage(this, &insertPkg); // Blocks if another DML thread is using this fTableOid
@ -987,17 +995,7 @@ void PackageHandler::run()
CalpontSystemCatalog::TableName tableName; CalpontSystemCatalog::TableName tableName;
tableName.schema = updatePkg->get_Table()->get_SchemaName(); tableName.schema = updatePkg->get_Table()->get_SchemaName();
tableName.table = updatePkg->get_Table()->get_TableName(); tableName.table = updatePkg->get_Table()->get_TableName();
CalpontSystemCatalog::ROPair roPair; CalpontSystemCatalog::ROPair roPair = getTableRID(fcsc, tableName);
try
{
roPair = fcsc->tableRID(tableName);
}
catch (...)
{
if (setupDec())
throw;
roPair = fcsc->tableRID(tableName);
}
fTableOid = roPair.objnum; fTableOid = roPair.objnum;
} }
synchTable.setPackage(this, synchTable.setPackage(this,
@ -1057,17 +1055,7 @@ void PackageHandler::run()
CalpontSystemCatalog::TableName tableName; CalpontSystemCatalog::TableName tableName;
tableName.schema = deletePkg->get_Table()->get_SchemaName(); tableName.schema = deletePkg->get_Table()->get_SchemaName();
tableName.table = deletePkg->get_Table()->get_TableName(); tableName.table = deletePkg->get_Table()->get_TableName();
CalpontSystemCatalog::ROPair roPair; CalpontSystemCatalog::ROPair roPair = getTableRID(fcsc, tableName);
try
{
roPair = fcsc->tableRID(tableName);
}
catch (...)
{
if (setupDec())
throw;
roPair = fcsc->tableRID(tableName);
}
fTableOid = roPair.objnum; fTableOid = roPair.objnum;
} }
synchTable.setPackage(this, synchTable.setPackage(this,

2
dmlproc/dmlprocessor.h
View File

@ -205,6 +205,8 @@ class PackageHandler
joblist::DistributedEngineComm* fEc = joblist::DistributedEngineComm::instance(rm); joblist::DistributedEngineComm* fEc = joblist::DistributedEngineComm::instance(rm);
return fEc->Setup(); return fEc->Setup();
} }
execplan::CalpontSystemCatalog::ROPair getTableRID(boost::shared_ptr<execplan::CalpontSystemCatalog> fcsc,
execplan::CalpontSystemCatalog::TableName& tableName);
messageqcpp::IOSocket fIos; messageqcpp::IOSocket fIos;
boost::shared_ptr<messageqcpp::ByteStream> fByteStream; boost::shared_ptr<messageqcpp::ByteStream> fByteStream;