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

Merge branch 'develop-1.2' into develop-merge-up-20190514

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-14 13:58:33 +01:00
parent 6c4afdf18b 0dd33c6f75
commit 020b211bb7
83 changed files with 469 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tools/dbbuilder/dbbuilder.cpp
View File

@ -59,11 +59,11 @@ int setUp()
{
#ifndef _MSC_VER
string cmd = "/bin/rm -f " + logFile + " >/dev/null 2>&1";
(void)system(cmd.c_str());
int rc = system(cmd.c_str());
cmd = "/bin/touch -f " + logFile + " >/dev/null 2>&1";
(void)system(cmd.c_str());
rc = system(cmd.c_str());
#endif
return 0;
return rc;
}
int checkNotThere(WriteEngine::FID fid)
@ -73,12 +73,6 @@ int checkNotThere(WriteEngine::FID fid)
return (fileOp.existsOIDDir(fid) ? -1 : 0);
}
void tearDown()
{
string file = tmpDir + "/oidbitmap";
unlink(file.c_str());
}
void usage()
{
cerr << "Usage: dbbuilder [-h|f] function" << endl
@ -131,6 +125,7 @@ int main(int argc, char* argv[])
std::string schema("tpch");
Oam oam;
bool fFlg = false;
int rc = 0;
opterr = 0;
@ -194,7 +189,10 @@ int main(int argc, char* argv[])
if ( buildOption == SYSCATALOG_ONLY )
{
setUp();
if ( setUp() )
{
cerr << "setUp() call error " << endl;
}
bool canWrite = true;
@ -210,9 +208,13 @@ int main(int argc, char* argv[])
"' > " + logFile;
if (canWrite)
(void)system(cmd.c_str());
{
rc = system(cmd.c_str());
}
else
{
cerr << cmd << endl;
}
errorHandler(sysCatalogErr,
"Build system catalog",
@ -244,7 +246,7 @@ int main(int argc, char* argv[])
string cmd(string("echo 'FAILED: ") + ex.what() + "' > " + logFile);
if (canWrite)
(void)system(cmd.c_str());
rc = system(cmd.c_str());
else
cerr << cmd << endl;
@ -256,7 +258,7 @@ int main(int argc, char* argv[])
string cmd = "echo 'FAILED: HDFS checking.' > " + logFile;
if (canWrite)
(void)system(cmd.c_str());
rc = system(cmd.c_str());
else
cerr << cmd << endl;
@ -275,7 +277,7 @@ int main(int argc, char* argv[])
std::string cmd = "echo 'OK: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
if (canWrite)
(void)system(cmd.c_str());
rc = system(cmd.c_str());
else
#ifdef _MSC_VER
(void)0;
@ -288,11 +290,9 @@ int main(int argc, char* argv[])
if (canWrite)
{
int err;
rc = system(cmd.c_str());
err = system(cmd.c_str());
if (err != 0)
if (rc != 0)
{
ostringstream os;
os << "Warning: running " << cmd << " failed. This is usually non-fatal.";
@ -310,7 +310,7 @@ int main(int argc, char* argv[])
string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
if (canWrite)
(void)system(cmd.c_str());
rc = system(cmd.c_str());
else
cerr << cmd << endl;
@ -321,7 +321,7 @@ int main(int argc, char* argv[])
string cmd = "echo 'FAILED: buildOption=" + oam.itoa(buildOption) + "' > " + logFile;
if (canWrite)
(void)system(cmd.c_str());
rc = system(cmd.c_str());
else
cerr << cmd << endl;