1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

Merge pull request #1793 from benthompson15/MCOL-4483-dev2

MCOL-4483: remove unused directories and fix some default paths.
This commit is contained in:
David.Hall
2021-03-03 13:26:37 -06:00
committed by GitHub
7 changed files with 6 additions and 51 deletions

View File

@ -120,7 +120,7 @@ void Config::checkReload( )
if ( m_bulkRoot.length() == 0 )
{
m_bulkRoot = "/var/lib/columnstore";
m_bulkRoot = "/var/log/mariadb/columnstore";
#ifndef _MSC_VER
m_bulkRoot += "/data";
#endif

View File

@ -1494,7 +1494,7 @@ void WECmdArgs::checkJobIdCase()
snprintf(aBuff, sizeof(aBuff), "%s/Job_%s.xml", fJobPath.c_str(),
fJobId.c_str());
else // for time being
snprintf(aBuff, sizeof(aBuff), "/var/lib/columnstore/data/bulk/job/Job_%s.xml",
snprintf(aBuff, sizeof(aBuff), "/var/log/mariadb/columnstore/data/bulk/job/Job_%s.xml",
fJobId.c_str());
std::string aJobFileName(aBuff);
@ -1935,23 +1935,6 @@ void WECmdArgs::checkForBulkLogDir(const std::string& BulkRoot)
throw runtime_error("Failed to create job directory, check permissions");
}
}
std::ostringstream aSS2;
aSS2 << BulkRoot;
aSS2 << "/log";
std::string logDir = aSS2.str();
if ( !boost::filesystem::exists(logDir.c_str()) )
{
cout << "Creating directory : " << logDir << endl;
bool aSuccess = boost::filesystem::create_directories(logDir.c_str());
if (!aSuccess)
{
cout << "\nFailed to create bulk log directory, check permissions\n" << endl;
throw runtime_error("Failed to create bulk log directory, check permissions");
}
}
}
else
{