1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

MCOL-4839: Fix clang build (#2100)

* 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 18:45:10 +03:00
committed by GitHub
parent 923bbf4033
commit 5c5f103f98
59 changed files with 422 additions and 600 deletions

View File

@ -255,18 +255,6 @@ struct FdCountEntry
uint16_t segNum;
uint32_t cnt;
FdCacheType_t::iterator fdit;
friend ostream& operator<<(ostream& out, const FdCountEntry& o)
{
out << " o: " << o.oid
<< " d: " << o.dbroot
<< " p: " << o.partNum
<< " s: " << o.segNum
<< " c: " << o.cnt;
return out;
}
}; // FdCountEntry
typedef FdCountEntry FdCountEntry_t;
@ -1380,7 +1368,7 @@ void ioManager::buildOidFileName(const BRM::OID_t oid, uint16_t dbRoot, const ui
// when it's a request for the version buffer, the dbroot comes in as 0 for legacy reasons
if (dbRoot == 0 && oid < 1000)
dbRoot = fdbrm.getDBRootOfVBOID(oid);
fFileOp.getFileNameForPrimProc(oid, file_name, dbRoot, partNum, segNum);
}