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

Fix merge conflict issue

Browse Source
This commit is contained in:
Andrew Hutchings
2019-09-24 15:20:27 +01:00
parent 70b3aa3159
commit 4e92e75274
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
procmon/processmonitor.cpp
View File

@@ -2616,11 +2616,6 @@ pid_t ProcessMonitor::startProcess(string processModuleType, string processName,
tmp = tmp.filename(); tmp = tmp.filename();
DBRMroot = (bf::path(DBRMDir) / tmp).string(); DBRMroot = (bf::path(DBRMDir) / tmp).string();
// DBRMDir might have changed, so need to change DBRMroot
bf::path tmp(DBRMroot);
tmp = tmp.filename();
DBRMroot = (bf::path(DBRMDir) / tmp).string();
sendAlarm("DBRM", DBRM_LOAD_DATA_ERROR, CLEAR); sendAlarm("DBRM", DBRM_LOAD_DATA_ERROR, CLEAR);
// change DBRMroot to temp DBRMDir path // change DBRMroot to temp DBRMDir path
// DBRMroot = tempDBRMDir + "/BRM_saves"; // DBRMroot = tempDBRMDir + "/BRM_saves";
@@ -4425,13 +4420,6 @@ int ProcessMonitor::getDBRMdata(string *path)
bf::create_directories(pTmp); bf::create_directories(pTmp);
*path = pTmp.string(); *path = pTmp.string();
log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG); log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG);
boost::uuids::uuid u = boost::uuids::random_generator()();
bf::path pTmp = bf::path(*path) / boost::uuids::to_string(u);
bf::create_directories(pTmp);
*path = pTmp.string();
log.writeLog(__LINE__, "Downloading DBRM files to " + *path, LOG_TYPE_DEBUG);
for ( int i = 0 ; i < numFiles ; i ++ ) for ( int i = 0 ; i < numFiles ; i ++ )
{ {
string fileName; string fileName;
@@ -4476,10 +4464,6 @@ int ProcessMonitor::getDBRMdata(string *path)
pFilename = pTmp / pFilename.filename(); pFilename = pTmp / pFilename.filename();
const char *cFilename = pFilename.string().c_str(); const char *cFilename = pFilename.string().c_str();
bf::path pFilename(fileName);
pFilename = pTmp / pFilename.filename();
const char *cFilename = pFilename.string().c_str();
boost::scoped_ptr<IDBDataFile> out(IDBDataFile::open( boost::scoped_ptr<IDBDataFile> out(IDBDataFile::open(
IDBPolicy::getType(cFilename, IDBPolicy::getType(cFilename,
IDBPolicy::WRITEENG), IDBPolicy::WRITEENG),