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

MCOL-2068 - introduced basic parameter checks

Browse Source
This commit is contained in:
sneJ-
2019-01-16 14:00:09 +01:00
parent d844382a09
commit e60ac30017
1 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
oamapps/postConfigure/postConfigure.cpp
View File

@@ -333,9 +333,9 @@ int main(int argc, char* argv[])
cout << " -um-ip-addrs User Module IP Addresses xxx.xxx.xxx.xxx,xxx.xxx.xxx.xxx" << endl; cout << " -um-ip-addrs User Module IP Addresses xxx.xxx.xxx.xxx,xxx.xxx.xxx.xxx" << endl;
cout << " -x Do not resolve IP Addresses from host names" << endl; cout << " -x Do not resolve IP Addresses from host names" << endl;
cout << " -numBlocksPct amount of physical memory to utilize for disk block caching" << endl; cout << " -numBlocksPct amount of physical memory to utilize for disk block caching" << endl;
cout << " (percentages of the total memory can be stated without suffix, explcit values with suffixes M or G)" cout << " (percentages of the total memory need to be stated without suffix, explcit values with suffixes M or G)";
cout << " -totalUmMemory amount of physical memory to utilize for joins, intermediate results and set operations on the UM" << endl; cout << " -totalUmMemory amount of physical memory to utilize for joins, intermediate results and set operations on the UM" << endl;
cout << " (percentages of the total memory can be stated without suffix, explcit values with suffixes M or G)" cout << " (percentages of the total memory need to be stated with suffix %, explcit values with suffixes M or G)";
exit (0); exit (0);
} }
else if (string("-x") == argv[i]) else if (string("-x") == argv[i])
@@ -490,10 +490,16 @@ int main(int argc, char* argv[])
if (i >= argc) if (i >= argc)
{ {
cout << " ERROR: Memory settings for numBlocksPct not provided" << endl; cout << " ERROR: Memory settings for numBlocksPct not provided" << endl;
//TODO check suffix. if % is given remove it
exit(1); exit(1);
} }
numBlocksPctParam = argv[i]; // check that the parameter ends with a number M or G
if (isdigit(argv[i].back()) || argv[i].back() == 'M' || argv[i].bach() == 'G') {
numBlocksPctParam = argv[i];
}
else {
cout << " ERROR: Memory settings for numBlocksPct need to end on a digit, M or G" << endl;
exit(1);
}
} }
else if (string("-totalUmMemory") == argv[i]) else if (string("-totalUmMemory") == argv[i])
{ {
@@ -501,10 +507,16 @@ int main(int argc, char* argv[])
if (i >= argc) if (i >= argc)
{ {
cout << " ERROR: Memory settings for totalUmMemory not provided" << endl; cout << " ERROR: Memory settings for totalUmMemory not provided" << endl;
//TODO check suffix. if no %, G, or M is given add %
exit(1); exit(1);
} }
totalUmMemoryParam = argv[i]; // check that the parameter ends with a %, M, or G
if (argv[i].back() == '%' || argv[i].back() == 'M' || argv[i].bach() == 'G') {
totalUmMemoryParam = argv[i];
}
else {
cout << " ERROR: Memory settings for totalUmMemory need to end on %, M or G" << endl;
exit(1);
}
} }
else else
{ {
@@ -1693,7 +1705,12 @@ int main(int argc, char* argv[])
{ {
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct); sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct);
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl; if (numBlocksPct.back() == 'M' || numBlocksPct.back() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl;
}
} }
catch (...) catch (...)
{ {
@@ -1743,7 +1760,12 @@ int main(int argc, char* argv[])
if (!numBlocksPctParam.empty()) { // if numBlocksPct was set as command line parameter use the command line parameter value if (!numBlocksPctParam.empty()) { // if numBlocksPct was set as command line parameter use the command line parameter value
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPctParam); sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPctParam);
cout << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPctParam << "%" << endl; if (numBlocksPctParam.back() == 'M' || numBlocksPctParam.back() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPctParam << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPctParam << "%" << endl;
}
} }
else { //otherwise use the settings from the previous config file else { //otherwise use the settings from the previous config file
string numBlocksPct = sysConfig->getConfig("DBBC", "NumBlocksPct"); string numBlocksPct = sysConfig->getConfig("DBBC", "NumBlocksPct");
@@ -1805,7 +1827,12 @@ int main(int argc, char* argv[])
try try
{ {
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct); sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPct);
cout << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl; if (numBlocksPct.back() == 'M' || numBlocksPct.back() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPct << "%" << endl;
}
} }
catch (...) catch (...)
{ {
@@ -1851,7 +1878,12 @@ int main(int argc, char* argv[])
{ {
if (!numBlocksPctParam.empty()) { // if numBlocksPct was set as command line parameter use the command line parameter value if (!numBlocksPctParam.empty()) { // if numBlocksPct was set as command line parameter use the command line parameter value
sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPctParam); sysConfig->setConfig("DBBC", "NumBlocksPct", numBlocksPctParam);
cout << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPctParam << "%" << endl; if (numBlocksPctParam.back() == 'M' || numBlocksPctParam.back() == 'G') {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPctParam << endl;
}
else {
cout << endl << "NOTE: Setting 'NumBlocksPct' to " << numBlocksPctParam << "%" << endl;
}
} }
else { //otherwise use the settings from the previous config file else { //otherwise use the settings from the previous config file
string numBlocksPct = sysConfig->getConfig("DBBC", "NumBlocksPct"); string numBlocksPct = sysConfig->getConfig("DBBC", "NumBlocksPct");