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

Move config files

Browse Source 
This patch:

* Moves config files from /usr/local/mariadb/columnstore/etc to
ENGINE_SYSCONFDIR/columnstore (ENGINE_SYSCONFDIR is /etc by default)
* Sets a define called MCSSYSCONFDIR whic contains the
ENGINE_SYSCONFDIR compile time setting
* Modifies scripts and code to use the new paths
* Removes a whole bunch of files we don't use
This commit is contained in:
Andrew Hutchings
2019-09-05 18:13:23 +01:00
parent 016523ef47
commit 97bda78c3b
67 changed files with 535 additions and 5808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
oam/oamcpp/liboamcpp.cpp
View File

@ -105,34 +105,13 @@ void handleControlC(int i)
Oam::Oam()
{
// Assigned pointers to Config files
string calpontfiledir;
const char* cf = 0;
InstallDir = startup::StartUp::installDir();
calpontfiledir = InstallDir + "/etc";
//FIXME: we should not use this anymore. Everything should be based off the install dir
//If CALPONT_HOME is set, use it for etc directory
#ifdef _MSC_VER
cf = 0;
string cfStr = IDBreadRegistry("CalpontHome");
CalpontConfigFile = std::string(MCSSYSCONFDIR) + "/columnstore/Columnstore.xml";
if (!cfStr.empty())
cf = cfStr.c_str();
AlarmConfigFile = std::string(MCSSYSCONFDIR) + "/columnstore/AlarmConfig.xml";
#else
cf = getenv("CALPONT_HOME");
#endif
if (cf != 0 && *cf != 0)
calpontfiledir = cf;
CalpontConfigFile = calpontfiledir + "/Columnstore.xml";
AlarmConfigFile = calpontfiledir + "/AlarmConfig.xml";
ProcessConfigFile = calpontfiledir + "/ProcessConfig.xml";
ProcessConfigFile = std::string(MCSSYSCONFDIR) + "/columnstore/ProcessConfig.xml";
if (UseHdfs == 0)
{