You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
MCOL-3606 Make ColumnStore use generic paths
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:
@ -41,42 +41,6 @@ using namespace std;
|
||||
|
||||
namespace startup
|
||||
{
|
||||
/* static */
|
||||
mutex StartUp::fInstallDirLock;
|
||||
/* static */
|
||||
string* StartUp::fInstallDirp = 0;
|
||||
|
||||
/* static */
|
||||
const string StartUp::installDir()
|
||||
{
|
||||
mutex::scoped_lock lk(fInstallDirLock);
|
||||
|
||||
if (fInstallDirp)
|
||||
return *fInstallDirp;
|
||||
|
||||
#ifdef _MSC_VER
|
||||
fInstallDirp = new string("C:\\Calpont");
|
||||
string cfStr = IDBreadRegistry("");
|
||||
|
||||
if (!cfStr.empty())
|
||||
*fInstallDirp = cfStr;
|
||||
|
||||
#else
|
||||
fInstallDirp = new string("/usr/local/mariadb/columnstore");
|
||||
//See if we can figure out the install dir in Linux...
|
||||
//1. env var COLUMNSTORE_INSTALL_DIR
|
||||
const char* p = 0;
|
||||
p = getenv("COLUMNSTORE_INSTALL_DIR");
|
||||
|
||||
if (p && *p)
|
||||
*fInstallDirp = p;
|
||||
|
||||
//2. up one level from current binary location?
|
||||
//3. fall back to /usr/local/mariadb/columnstore
|
||||
#endif
|
||||
|
||||
return *fInstallDirp;
|
||||
}
|
||||
|
||||
/* static */
|
||||
mutex StartUp::fTmpDirLock;
|
||||
|
Reference in New Issue
Block a user