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

MCOL-3606 Make ColumnStore use generic paths

Browse Source 
ColumnStore now uses standard bin/lib paths for pretty much everything.
Data path is now hard-coded to /var/lib/columnstore.

This patch also:

* Removes v1 decompression
* Removes a bunch of unneeded files
* Removes COLUMNSTORE_INSTALL_DIR / $INSTALLDIR
* Makes my.cnf.d work for all platforms (MCOL-3558)
* Changes configcpp to use recursive mutex (fixes possible config write deadlock)
* Fixes MCOL-3599 Fix regr functions, The library was installed in the wrong location
* Fixes a bunch of Ubuntu packaging issues
* Changes the binary names of several of the executables so as not to
clash with potential executables from other packages
This commit is contained in:
Andrew Hutchings
2019-11-04 11:06:33 +00:00
parent dea1dec507
commit 8ab9ebb0f4
178 changed files with 1310 additions and 18366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
oam/oamcpp/oamcache.cpp
View File

@@ -284,7 +284,7 @@ int OamCache::getLocalPMId()
{
mutex::scoped_lock lk(cacheLock);
// This comes from the file $INSTALL/local/module, not from the xml.
// This comes from the file /etc/columnstore/module, not from the xml.
// Thus, it's not refreshed during checkReload().
if (mLocalPMId > 0)
{
@@ -293,7 +293,7 @@ int OamCache::getLocalPMId()
string localModule;
string moduleType;
string fileName = startup::StartUp::installDir() + "/local/module";
string fileName = "/etc/columnstore/module";
ifstream moduleFile (fileName.c_str());
char line[400];
@@ -337,7 +337,7 @@ string OamCache::getModuleName()
if (!moduleName.empty())
return moduleName;
string fileName = startup::StartUp::installDir() + "/local/module";
string fileName = "/etc/columnstore/module";
ifstream moduleFile(fileName.c_str());
getline(moduleFile, moduleName);
moduleFile.close();