database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +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

47
tools/configMgt/autoConfigure.cpp
View File

@ -1634,7 +1634,7 @@ int main(int argc, char* argv[])
{
int id = *pt;
string DBrootID = "DBRoot" + oam.itoa(id);;
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(id);
string pathID = "/var/lib/columnstore/data" + oam.itoa(id);
try
{
@ -1731,7 +1731,7 @@ int main(int argc, char* argv[])
{
int id = *pt;
string DBrootID = "DBRoot" + oam.itoa(id);;
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(id);
string pathID = "/var/lib/columnstore/data" + oam.itoa(id);
try
{
@ -1810,7 +1810,7 @@ int main(int argc, char* argv[])
}
string DBrootID = "DBRoot" + oam.itoa(i);
string pathID = "/usr/local/mariadb/columnstore/data" + oam.itoa(i);
string pathID = "/var/lib/columnstore/data" + oam.itoa(i);
try
{
@ -1952,47 +1952,6 @@ int main(int argc, char* argv[])
exit(-1);
}
string DataFileEnvFile;
try
{
DataFileEnvFile = sysConfigOld->getConfig(SystemSection, "DataFileEnvFile");
if ( !DataFileEnvFile.empty() )
{
try
{
sysConfigNew->setConfig(SystemSection, "DataFileEnvFile", DataFileEnvFile);
}
catch (...)
{
cout << "ERROR: Problem setting DataFileEnvFile in the Calpont System Configuration file" << endl;
exit(-1);
}
}
else
{
string::size_type pos = DataFilePlugin.find("hdfs-20.so", 0);
if (pos != string::npos)
DataFileEnvFile = "setenv-hdfs-20";
else
DataFileEnvFile = "setenv-hdfs-12";
try
{
sysConfigNew->setConfig(SystemSection, "DataFileEnvFile", DataFileEnvFile);
}
catch (...)
{
cout << "ERROR: Problem setting DataFileEnvFile in the Calpont System Configuration file" << endl;
exit(-1);
}
}
}
catch (...)
{}
string ExtentsPerSegmentFile;
try