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

Merge pull request #638 from mariadb-corporation/MCOL-1624

MCOL-1624 mcssystemready() does more testing
This commit is contained in:
David Thompson
2018-11-24 18:45:55 +01:00
committed by GitHub

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;
} }
} }