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-520

Browse Source
This commit is contained in:
David Hill
2018-09-25 17:20:46 -05:00
parent 2c38d5ba4f
commit f25082bc9a
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
oam/install_scripts/run.sh
View File

@ -31,7 +31,7 @@ done
shift $((OPTIND - 1)) shift $((OPTIND - 1))
exename="$1" exename="$2"
if [ -z "$exename" ]; then if [ -z "$exename" ]; then
echo $usage 1>&2 echo $usage 1>&2
@ -49,7 +49,8 @@ if [ $vflg -gt 0 ]; then
fi fi
while [ $keep_going -ne 0 ]; do while [ $keep_going -ne 0 ]; do
$exename $args # $exename $args
$exename
if [ -e ${lopt}/StopColumnstore ]; then if [ -e ${lopt}/StopColumnstore ]; then
exit 0 exit 0
fi fi

4
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -4926,10 +4926,10 @@ int processCommand(string* arguments)
case 39: // getSystemDirectories case 39: // getSystemDirectories
{ {
cout << "System Installation and Temporary Logging Directories" << endl << endl; cout << endl << "System Installation and Temporary Logging Directories" << endl << endl;
cout << "System Installation Directory = " << startup::StartUp::installDir() << endl; cout << "System Installation Directory = " << startup::StartUp::installDir() << endl;
cout << "System Temporary Logging Directory = " << tmpDir << endl; cout << "System Temporary Logging Directory = " << tmpDir << endl << endl;
} }
break; break;

12
tools/hdfsCheck/hdfsCheck.cpp
View File

@ -28,6 +28,10 @@
using namespace idbdatafile; using namespace idbdatafile;
using namespace std; using namespace std;
#include "installdir.h"
string tmpDir;
size_t BLK_SIZE = 2048; size_t BLK_SIZE = 2048;
const size_t MAX_BLK_SIZE = 1048576; const size_t MAX_BLK_SIZE = 1048576;
size_t MAX_BLOCK = 1024; size_t MAX_BLOCK = 1024;
@ -189,7 +193,7 @@ bool TestRunner::runTest( IDBDataFile::Types filetype, unsigned open_opts )
// build the file name we are going to use // build the file name we are going to use
ostringstream oss; ostringstream oss;
// embed pid so that this is a new directory path // embed pid so that this is a new directory path
oss << "/tmp/idbdf-dir-" << getpid() << "-" << m_id; oss << tmpDir << "/idbdf-dir-" << getpid() << "-" << m_id;
string dir = oss.str(); string dir = oss.str();
m_fname = dir + "/foobar"; m_fname = dir + "/foobar";
@ -541,7 +545,7 @@ bool TestRunner::hdfsRdwrExhaustTest()
// choose a new filename that is specific to our thread // choose a new filename that is specific to our thread
ostringstream oss; ostringstream oss;
// embed pid so that this is a new directory path // embed pid so that this is a new directory path
oss << "/tmp/hdfsrdwr-" << getpid() << "-" << m_id; oss << tmpDir << "/hdfsrdwr-" << getpid() << "-" << m_id;
string newpath = oss.str(); string newpath = oss.str();
// open a file with arbitrarily small buffer // open a file with arbitrarily small buffer
@ -755,13 +759,15 @@ int main(int argc, char** argv)
logFailure("missing hdfs-plugin argument"); logFailure("missing hdfs-plugin argument");
return 1; return 1;
} }
tmpDir = startup::StartUp::tmpDir();
opts.pluginFile = argv[optind]; opts.pluginFile = argv[optind];
try try
{ {
// init the library with logging enabled // init the library with logging enabled
std::string hdfsRdwrScratch = "/tmp/rdwr_scratch"; std::string hdfsRdwrScratch = tmpDir + "/rdwr_scratch";
IDBPolicy::init( true, true, hdfsRdwrScratch, 2147483648 ); IDBPolicy::init( true, true, hdfsRdwrScratch, 2147483648 );
if ( !IDBPolicy::installPlugin(opts.pluginFile) ) if ( !IDBPolicy::installPlugin(opts.pluginFile) )

4
utils/idbdatafile/IDBPolicy.cpp
View File

@ -218,8 +218,8 @@ void IDBPolicy::configIDBPolicy()
// Directory in which to place file buffer temporary files. // Directory in which to place file buffer temporary files.
string tmpDir = startup::StartUp::tmpDir(); string tmpDir = startup::StartUp::tmpDir();
string hdfsRdwrScratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch"); string scratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch");
hdfsRdwrScratch = tmpDir + hdfsRdwrScratch; string hdfsRdwrScratch = tmpDir + scratch;
IDBPolicy::init( idblog, bUseRdwrMemBuffer, hdfsRdwrScratch, hdfsRdwrBufferMaxSize ); IDBPolicy::init( idblog, bUseRdwrMemBuffer, hdfsRdwrScratch, hdfsRdwrBufferMaxSize );

2
writeengine/shared/we_config.cpp
View File

@ -266,7 +266,7 @@ void Config::checkReload( )
string TmpFileDir = startup::StartUp::tmpDir(); string TmpFileDir = startup::StartUp::tmpDir();
string hdfsRdwrScratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch"); string hdfsRdwrScratch = cf->getConfig("SystemConfig", "hdfsRdwrScratch");
hdfsRdwrScratch = TmpFileDir + hdfsRdwrScratch hdfsRdwrScratch = TmpFileDir + hdfsRdwrScratch;
if ( hdfsRdwrScratch.length() == 0 ) if ( hdfsRdwrScratch.length() == 0 )
{ {