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

Merge branch 'develop' into mcol-3743

Browse Source
This commit is contained in:
Patrick LeBlanc
2020-04-13 12:49:28 -05:00
committed by GitHub
parent ab518fae8c 7af55b2d21
commit 00828bf2df
24 changed files with 442 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oamapps/postConfigure/CMakeLists.txt
View File

@ -65,5 +65,5 @@ install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-
########### next target ###############
install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh
install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

2
oamapps/postConfigure/mycnfUpgrade.cpp
View File

@ -136,7 +136,7 @@ int main(int argc, char* argv[])
}
//my.cnf.rpmsave file
string mycnfsaveFile = "/etc/my.cnf/columnstore.cnf.rpmsave";
string mycnfsaveFile = std::string(MCSMYCNFDIR) + "/columnstore.cnf.rpmsave";
ifstream mycnfsavefile (mycnfsaveFile.c_str());
if (!mycnfsavefile)

11
oamapps/postConfigure/postConfigure.cpp
View File

@ -317,7 +317,7 @@ int main(int argc, char* argv[])
cout << " Enter one of the options within [], if available, or" << endl;
cout << " Enter a new value" << endl << endl;
cout << endl;
cout << "Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-qa][-port][-i][-sn]" << endl;
cout << "Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-port][-i][-sn]" << endl;
cout << " [-pm-ip-addrs][-um-ip-addrs][-pm-count][-um-count][-x][-xr]" << endl;
cout << " [-numBlocksPct][-totalUmMemory][-sm-bucket][-sm-region][-sm-id]" << endl;
cout << " [-sm-secret][-sm-endpoint][-sm-cache][-sm-prefix]" << endl;
@ -443,11 +443,6 @@ int main(int argc, char* argv[])
multi_server_quick_install = true;
noPrompting = true;
}
else if( string("-qa") == argv[i] )
{
amazon_quick_install = true;
noPrompting = true;
}
else if ( string("-f") == argv[i] )
nodeps = "--nodeps";
else if ( string("-o") == argv[i] )
@ -587,7 +582,7 @@ int main(int argc, char* argv[])
else
{
cout << " ERROR: Invalid Argument = " << argv[i] << endl;
cout << "Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-qa][-port][-i][-sn]" << endl;
cout << "Usage: postConfigure [-h][-c][-u][-p][-qs][-qm][-port][-i][-sn]" << endl;
cout << " [-pm-ip-addrs][-um-ip-addrs][-pm-count][-um-count][-x][-xr]" << endl;
cout << " [-numBlocksPct][-totalUmMemory][-sm-bucket][-sm-region][-sm-id]" << endl;
cout << " [-sm-secret][-sm-endpoint][-sm-cache][-sm-prefix]" << endl;
@ -1484,6 +1479,7 @@ int main(int argc, char* argv[])
bool amazonInstall = false;
string cloud = oam::UnassignedName;
#if 0
if (!multi_server_quick_install)
{
string amazonLog = tmpDir + "/amazon.log";
@ -1523,6 +1519,7 @@ int main(int argc, char* argv[])
amazonInstall = true;
}
}
#endif
try
{