1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

MCOL-4839: Fix clang build (#2102)

* Fix clang build

* Extern C returned to plugin_instance

Co-authored-by: Leonid Fedorov <l.fedorov@mail.corp.ru>
This commit is contained in:
Leonid Fedorov
2021-08-23 23:58:56 +03:00
committed by GitHub
parent ea622eec93
commit ef09342d47
59 changed files with 422 additions and 600 deletions

View File

@ -105,7 +105,7 @@ public:
// The param noBRMFcns suppresses init of the ExtentMap, VSS, VBBM, and CopyLocks.
// It can speed up init if the caller only needs the other structures.
EXPORT DBRM(bool noBRMFcns = false);
EXPORT ~DBRM();
EXPORT ~DBRM() throw();
EXPORT static void refreshShm()
{
@ -113,7 +113,7 @@ public:
ExtentMapImpl::refreshShm();
FreeListImpl::refreshShm();
}
// @bug 1055+ - Added functions below for multiple files per OID enhancement.
/** @brief Get the OID, offset, db root, partition, and segment of a logical block ID.
@ -1026,7 +1026,7 @@ public:
EXPORT void invalidateUncommittedExtentLBIDs(execplan::CalpontSystemCatalog::SCN txnid,
bool allExtents,
std::vector<LBID_t>* plbidList = NULL);
private:
DBRM(const DBRM& brm);
DBRM& operator=(const DBRM& brm);

View File

@ -81,7 +81,7 @@ void LBIDResourceGraph::connectResources(LBID_t start, LBID_t end,
{
vector<ResourceNode*> intersection, reserveList;
RNodes_t::iterator sit;
vector<ResourceNode*>::iterator it, next;
vector<ResourceNode*>::iterator it;
LBID_t i;
#if 0