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

merge

Browse Source
This commit is contained in:
Justin Swanhart
2016-06-01 17:30:57 -04:00
parent f16c8a63e3 84eeae5a34
commit be45f0a40f
258 changed files with 1875 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
oam/oamcpp/liboamcpp.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -2320,7 +2320,7 @@ namespace oam
moduleName = boost::get<0>(st);
}
catch (...) {
//system("touch /var/log/Columnstore/test2");
//system("touch /var/log/mariadb/columnstore/test2");
}
for ( int i = 0 ; i < 5 ; i++)
@ -2342,7 +2342,7 @@ namespace oam
}
catch(...)
{
//system("touch /var/log/Columnstore/test3");
//system("touch /var/log/mariadb/columnstore/test3");
}
sleep(1);
@ -2724,7 +2724,7 @@ namespace oam
if (localModule.empty() ) {
// not found
//system("touch /var/log/Columnstore/test8");
//system("touch /var/log/mariadb/columnstore/test8");
exceptionControl("getModuleInfo", API_FAILURE);
}
@ -2785,7 +2785,7 @@ namespace oam
moduleName = boost::get<0>(st);
}
catch (...) {
//system("touch /var/log/Columnstore/test4");
//system("touch /var/log/mariadb/columnstore/test4");
exceptionControl("getMyProcessStatus", API_FAILURE);
}
@ -2826,7 +2826,7 @@ namespace oam
{
// shutdown connection
processor.shutdown();
//system("touch /var/log/Columnstore/test5");
//system("touch /var/log/mariadb/columnstore/test5");
exceptionControl("getMyProcessStatus", API_FAILURE);
}
@ -2838,14 +2838,14 @@ namespace oam
}
catch(...)
{
//system("touch /var/log/Columnstore/test6");
//system("touch /var/log/mariadb/columnstore/test6");
processor.shutdown();
exceptionControl("getMyProcessStatus", API_INVALID_PARAMETER);
}
}
catch(...)
{
//system("touch /var/log/Columnstore/test7");
//system("touch /var/log/mariadb/columnstore/test7");
processor.shutdown();
exceptionControl("getMyProcessStatus", API_INVALID_PARAMETER);
}
@ -2857,7 +2857,7 @@ namespace oam
catch(...)
{}
}
//system("touch /var/log/Columnstore/test9");
//system("touch /var/log/mariadb/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/Columnstore");
string logdir("/var/log/mariadb/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());

14
oam/oamcpp/liboamcpp.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -358,12 +358,12 @@ namespace oam
*/
const std::string LogFile[] =
{
"local1.=crit -/var/log/Columnstore/crit.log",
"local1.=err -/var/log/Columnstore/err.log",
"local1.=warning -/var/log/Columnstore/warning.log",
"local1.=info -/var/log/Columnstore/info.log",
"local1.=debug -/var/log/Columnstore/debug.log",
"local2.=crit -/var/log/Columnstore/data/data_mods.log",
"local1.=crit -/var/log/mariadb/columnstore/crit.log",
"local1.=err -/var/log/mariadb/columnstore/err.log",
"local1.=warning -/var/log/mariadb/columnstore/warning.log",
"local1.=info -/var/log/mariadb/columnstore/info.log",
"local1.=debug -/var/log/mariadb/columnstore/debug.log",
"local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log",
""
};

2
oam/oamcpp/oamcache.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oam/oamcpp/oamcache.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 InfiniDB, Inc.
/* Copyright (C) 2016 MariaDB, Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License