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

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

Browse Source 
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
parent e905e60a01 432c9b21ae
commit df14b3b50c
7 changed files with 6 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
oam/install_scripts/columnstore-post-install.in
View File

@@ -116,7 +116,6 @@ chmod 777 @ENGINE_LOGDIR@/install
installLogDir=@ENGINE_LOGDIR@/install installLogDir=@ENGINE_LOGDIR@/install
# make sure trace dir is world-writable and sticky # make sure trace dir is world-writable and sticky
test -d @ENGINE_DATADIR@/data || mkdir -p @ENGINE_DATADIR@/data
test -d @ENGINE_DATADIR@/data1/systemFiles/dbrm || mkdir -p @ENGINE_DATADIR@/data1/systemFiles/dbrm test -d @ENGINE_DATADIR@/data1/systemFiles/dbrm || mkdir -p @ENGINE_DATADIR@/data1/systemFiles/dbrm
test -d @ENGINE_DATADIR@/local || mkdir -p @ENGINE_DATADIR@/local test -d @ENGINE_DATADIR@/local || mkdir -p @ENGINE_DATADIR@/local
test -d @ENGINE_DATADIR@/data1/systemFiles/dataTransaction || rmdir @ENGINE_DATADIR@/data1/systemFiles/dataTransaction >/dev/null 2>&1 test -d @ENGINE_DATADIR@/data1/systemFiles/dataTransaction || rmdir @ENGINE_DATADIR@/data1/systemFiles/dataTransaction >/dev/null 2>&1
@@ -126,17 +125,10 @@ chmod -R 1755 @ENGINE_DATADIR@/data1/systemFiles >/dev/null 2>&1
chmod 1755 @ENGINE_SYSCONFDIR@/columnstore > /dev/null 2>&1 chmod 1755 @ENGINE_SYSCONFDIR@/columnstore > /dev/null 2>&1
#create the bulk-load dirs #create the bulk-load dirs
mkdir -p @ENGINE_DATADIR@/data/bulk/data/import >/dev/null 2>&1
mkdir -p @ENGINE_DATADIR@/data/bulk/log >/dev/null 2>&1
mkdir -p @ENGINE_DATADIR@/data/bulk/job >/dev/null 2>&1
mkdir -p @ENGINE_DATADIR@/data/bulk/rollback >/dev/null 2>&1
mkdir -p @ENGINE_DATADIR@/data/bulk/tmpjob >/dev/null 2>&1
mkdir -p @ENGINE_LOGDIR@/data/bulk/data/import >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/data/import >/dev/null 2>&1
mkdir -p @ENGINE_LOGDIR@/data/bulk/log >/dev/null 2>&1
mkdir -p @ENGINE_LOGDIR@/data/bulk/job >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/job >/dev/null 2>&1
mkdir -p @ENGINE_LOGDIR@/data/bulk/rollback >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/rollback >/dev/null 2>&1
mkdir -p @ENGINE_LOGDIR@/data/bulk/tmpjob >/dev/null 2>&1 mkdir -p @ENGINE_LOGDIR@/data/bulk/tmpjob >/dev/null 2>&1
rm -f @ENGINE_DATADIR@/data/bulk/tmpjob/* >/dev/null 2>&1
rm -f @ENGINE_LOGDIR@/data/bulk/tmpjob/* >/dev/null 2>&1 rm -f @ENGINE_LOGDIR@/data/bulk/tmpjob/* >/dev/null 2>&1
chmod -R 777 @ENGINE_LOGDIR@/data chmod -R 777 @ENGINE_LOGDIR@/data

1
oam/install_scripts/columnstore-pre-uninstall.in
View File

@@ -60,7 +60,6 @@ fi
rm -f @ENGINE_DATADIR@/local/*.columnstore rm -f @ENGINE_DATADIR@/local/*.columnstore
rm -rf @ENGINE_DATADIR@/local/etc/ rm -rf @ENGINE_DATADIR@/local/etc/
rm -f @ENGINE_DATADIR@/data/bulk/tmp/job/* >/dev/null 2>&1
rm -f @ENGINE_DATADIR@/local/moveDbrootTransactionLog rm -f @ENGINE_DATADIR@/local/moveDbrootTransactionLog
rm -rf @ENGINE_LOGDIR@ rm -rf @ENGINE_LOGDIR@
rm -rf /tmp/columnstore_tmp_files rm -rf /tmp/columnstore_tmp_files

6
oam/install_scripts/columnstoreLogRotate.in
View File

@@ -18,7 +18,7 @@
copy copy
olddir @ENGINE_SYSCONFDIR@/columnstore olddir @ENGINE_SYSCONFDIR@/columnstore
} }
@ENGINE_DATADIR@/data/bulk/job/*.xml { @ENGINE_LOGDIR@/data/bulk/job/*.xml {
missingok missingok
daily daily
rotate 1 rotate 1
@@ -26,7 +26,7 @@
maxage 30 maxage 30
nocreate nocreate
} }
@ENGINE_DATADIR@/data/bulk/log/*.err { @ENGINE_LOGDIR@/data/bulk/log/*.err {
missingok missingok
daily daily
rotate 1 rotate 1
@@ -34,7 +34,7 @@
maxage 30 maxage 30
nocreate nocreate
} }
@ENGINE_DATADIR@/data/bulk/log/*.log { @ENGINE_LOGDIR@/data/bulk/log/*.log {
missingok missingok
daily daily
rotate 1 rotate 1

4
tools/dbbuilder/dbbuilder.cpp
View File

@@ -176,9 +176,7 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
//get tmp log directory logFile = string(MCSLOGDIR) + "/install/dbbuilder.status";
tmpDir = startup::StartUp::tmpDir();
logFile = tmpDir + "/dbbuilder.status";
buildOption = atoi(argv[optind++]); buildOption = atoi(argv[optind++]);

17
tools/dbloadxml/colxml.cpp
View File

@@ -78,23 +78,6 @@ int main(int argc, char** argv)
return -1; return -1;
} }
} }
std::ostringstream aSS2;
aSS2 << aBulkRoot;
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 directory, please check permissions\n" << endl;
return -1;
}
}
} }
else else
{ {

2
writeengine/shared/we_config.cpp
View File

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

19
writeengine/splitter/we_cmdargs.cpp
View File

@@ -1494,7 +1494,7 @@ void WECmdArgs::checkJobIdCase()
snprintf(aBuff, sizeof(aBuff), "%s/Job_%s.xml", fJobPath.c_str(), snprintf(aBuff, sizeof(aBuff), "%s/Job_%s.xml", fJobPath.c_str(),
fJobId.c_str()); fJobId.c_str());
else // for time being 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()); fJobId.c_str());
std::string aJobFileName(aBuff); 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"); 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 else
{ {