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

Fixed the broken build, flipped the switch to put BRM files in SM.

This commit is contained in:
Patrick LeBlanc
2019-06-13 09:26:10 -05:00
parent a79b3131b5
commit eead61f238
2 changed files with 5 additions and 2 deletions

View File

@ -2269,6 +2269,8 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
Oam oam; Oam oam;
SystemProcessStatus systemprocessstatus; SystemProcessStatus systemprocessstatus;
ProcessStatus processstatus; ProcessStatus processstatus;
Config *cs_config = Config::makeConfig();
string DBRootStorageType = cs_config->getConfig("Installation", "DBRootStorageType");
log.writeLog(__LINE__, "STARTING Process: " + processName, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "STARTING Process: " + processName, LOG_TYPE_DEBUG);
log.writeLog(__LINE__, "Process location: " + processLocation, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "Process location: " + processLocation, LOG_TYPE_DEBUG);

View File

@ -123,11 +123,12 @@ bool IDBPolicy::isLocalFile( const std::string& path )
//string fileExt = filepath.extension().c_str(); //string fileExt = filepath.extension().c_str();
#endif #endif
bool isXml = filepath.extension() == ".xml"; bool isXml = filepath.extension() == ".xml";
bool isDbrm = path.find("dbrm") != string::npos; // StorageManager: debatable whether dbrm files should go in the cloud //bool isDbrm = path.find("dbrm") != string::npos; // StorageManager: debatable whether dbrm files should go in the cloud
bool isVb = path.find("versionbuffer") != string::npos; bool isVb = path.find("versionbuffer") != string::npos;
bool isScratch = path.find(s_hdfsRdwrScratch) == 0; bool isScratch = path.find(s_hdfsRdwrScratch) == 0;
return isXml || isDbrm || isVb || isScratch; return isXml || isVb || isScratch;
//return isXml || isDbrm || isVb || isScratch;
} }
IDBDataFile::Types IDBPolicy::getType( const std::string& path, Contexts ctxt ) IDBDataFile::Types IDBPolicy::getType( const std::string& path, Contexts ctxt )