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

more changes for names

This commit is contained in:
david hill
2016-05-12 14:14:24 -05:00
parent b78043dc8a
commit 0dbd823c00
185 changed files with 15440 additions and 16894 deletions

View File

@ -2320,7 +2320,7 @@ namespace oam
moduleName = boost::get<0>(st);
}
catch (...) {
//system("touch /var/log/Calpont/test2");
//system("touch /var/log/Columnstore/test2");
}
for ( int i = 0 ; i < 5 ; i++)
@ -2342,7 +2342,7 @@ namespace oam
}
catch(...)
{
//system("touch /var/log/Calpont/test3");
//system("touch /var/log/Columnstore/test3");
}
sleep(1);
@ -2724,7 +2724,7 @@ namespace oam
if (localModule.empty() ) {
// not found
//system("touch /var/log/Calpont/test8");
//system("touch /var/log/Columnstore/test8");
exceptionControl("getModuleInfo", API_FAILURE);
}
@ -2785,7 +2785,7 @@ namespace oam
moduleName = boost::get<0>(st);
}
catch (...) {
//system("touch /var/log/Calpont/test4");
//system("touch /var/log/Columnstore/test4");
exceptionControl("getMyProcessStatus", API_FAILURE);
}
@ -2826,7 +2826,7 @@ namespace oam
{
// shutdown connection
processor.shutdown();
//system("touch /var/log/Calpont/test5");
//system("touch /var/log/Columnstore/test5");
exceptionControl("getMyProcessStatus", API_FAILURE);
}
@ -2838,14 +2838,14 @@ namespace oam
}
catch(...)
{
//system("touch /var/log/Calpont/test6");
//system("touch /var/log/Columnstore/test6");
processor.shutdown();
exceptionControl("getMyProcessStatus", API_INVALID_PARAMETER);
}
}
catch(...)
{
//system("touch /var/log/Calpont/test7");
//system("touch /var/log/Columnstore/test7");
processor.shutdown();
exceptionControl("getMyProcessStatus", API_INVALID_PARAMETER);
}
@ -2857,7 +2857,7 @@ namespace oam
catch(...)
{}
}
//system("touch /var/log/Calpont/test9");
//system("touch /var/log/Columnstore/test9");
exceptionControl("getMyProcessStatus", API_FAILURE);
return boost::make_tuple(-1, "", -1);
@ -3390,7 +3390,7 @@ namespace oam
//make 1 log file made up of archive and current *.log
(void)system("touch /tmp/logs");
string logdir("/var/log/Calpont");
string logdir("/var/log/Columnstore");
if (access(logdir.c_str(), W_OK) != 0) logdir = "/tmp";
string cmd = "ls " + path + logdir + "/archive | grep '" + logFileName + "' > /tmp/logfiles";
(void)system(cmd.c_str());
@ -7124,7 +7124,7 @@ namespace oam
*
* Function: actionMysqlCalpont
*
* Purpose: mysql-Calpont service command
* Purpose: mysql-Columnstore service command
*
****************************************************************************/
@ -7160,7 +7160,7 @@ namespace oam
return;
// check if mysql-Capont is installed
string mysqlscript = InstallDir + "/mysql/mysql-Calpont";
string mysqlscript = InstallDir + "/mysql/mysql-Columnstore";
if (access(mysqlscript.c_str(), X_OK) != 0)
return;