database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-06-13 16:01:32 +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

25
utils/configcpp/xmlparser.cpp
View File

@ -63,7 +63,7 @@ const string XMLParser::getConfig(const xmlDocPtr doc, const string& section, co
if (cur3)
res = (const char*)cur3->content;
return expand(res);
return res;
}
cur2 = cur2->next;
@ -74,7 +74,7 @@ const string XMLParser::getConfig(const xmlDocPtr doc, const string& section, co
}
// maybe nullstr if not found
return expand(res);
return res;
}
void XMLParser::getConfig(const xmlDocPtr doc, const string& section, const string& name, vector<string>& values) const
@ -108,7 +108,7 @@ void XMLParser::getConfig(const xmlDocPtr doc, const string& section, const stri
if (cur3)
res = (const char*)cur3->content;
values.push_back(expand(res));
values.push_back(res);
}
cur2 = cur2->next;
@ -224,23 +224,6 @@ void XMLParser::delConfig(xmlDocPtr doc, const string& section, const string& na
return;
}
const string XMLParser::expand(const std::string& in) const
{
string out(in);
string::size_type pos;
const string::size_type len = 11;
pos = out.find("$INSTALLDIR");
while (pos != string::npos)
{
out.replace(pos, len, fInstallDir);
pos = out.find("$INSTALLDIR");
}
return out;
}
const vector<string> XMLParser::enumConfig(const xmlDocPtr doc) const
{
vector<string> resv;
@ -289,7 +272,7 @@ const vector<string> XMLParser::enumSection(const xmlDocPtr doc, const string& s
res = reinterpret_cast<const char*>(cur2->name);
if (res != "text" && res != "comment")
resv.push_back(expand(res));
resv.push_back(res);
cur2 = cur2->next;
}