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

MCOL-1624 mcssystemready() does more testing

Now checks if system catalog exists and if we can query the system
catalogue in FE mode (and therefore tests ExeMgr and PrimProc).
This commit is contained in:
Andrew Hutchings
2018-11-22 21:58:03 +00:00
parent 105f0ed4ad
commit 00ce77b742

View File

@ -2015,6 +2015,7 @@ extern "C"
Oam oam; Oam oam;
DBRM dbrm(true); DBRM dbrm(true);
SystemStatus systemstatus; SystemStatus systemstatus;
WriteEngine::FileOp fileOp;
try try
{ {
@ -2022,8 +2023,15 @@ extern "C"
if (systemstatus.SystemOpState == ACTIVE if (systemstatus.SystemOpState == ACTIVE
&& dbrm.getSystemReady() && dbrm.getSystemReady()
&& dbrm.getSystemQueryReady()) && dbrm.getSystemQueryReady()
&& fileOp.existsOIDDir(1001))
{ {
// Test getting system catalogue data from ExeMgr
boost::shared_ptr<execplan::CalpontSystemCatalog> systemCatalogPtr =
execplan::CalpontSystemCatalog::makeCalpontSystemCatalog(0);
systemCatalogPtr->identity(execplan::CalpontSystemCatalog::FE);
systemCatalogPtr->getTableCount();
return 1; return 1;
} }
} }