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

2
oamapps/alarmmanager/CMakeLists.txt
View File

@ -8,6 +8,8 @@ set(alarmmanager_LIB_SRCS alarmmanager.cpp alarm.cpp)
add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS})
target_compile_options(alarmmanager PRIVATE -Wno-unused-result)
set_target_properties(alarmmanager PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)

5
oamapps/alarmmanager/alarmmanager.cpp
View File

@ -484,8 +484,7 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
else
processName = repProcessName;
int returnStatus = API_SUCCESS; //default
ByteStream msg1;
ByteStream msg1;
// setup message
msg1 << (ByteStream::byte) alarmID;
@ -621,7 +620,7 @@ void ALARMManager::getActiveAlarm(AlarmList& alarmList) const
*****************************************************************************************/
void ALARMManager::getAlarm(std::string date, AlarmList& alarmList) const
{
string alarmFile = startup::StartUp::tmpDir() + "/alarms";
//make 1 alarm log file made up of archive and current alarm.log

2
oamapps/columnstoreSupport/CMakeLists.txt
View File

@ -8,6 +8,8 @@ set(columnstoreSupport_SRCS columnstoreSupport.cpp)
add_executable(columnstoreSupport ${columnstoreSupport_SRCS})
target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result)
target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

2
oamapps/mcsadmin/CMakeLists.txt
View File

@ -8,6 +8,8 @@ set(mcsadmin_SRCS mcsadmin.cpp)
add_executable(mcsadmin ${mcsadmin_SRCS})
target_compile_options(mcsadmin PRIVATE -Wno-unused-result)
target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

16
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -3348,15 +3348,14 @@ int processCommand(string* arguments)
for (i = alarmList.begin(); i != alarmList.end(); ++i)
{
switch (i->second.getState())
// SET = 1, CLEAR = 0
if (i->second.getState() == true)
{
case SET:
cout << "SET" << endl;
break;
case CLEAR:
cout << "CLEAR" << endl;
break;
cout << "SET" << endl;
}
else
{
cout << "CLEAR" << endl;
}
cout << "AlarmID = " << i->second.getAlarmID() << endl;
@ -5904,7 +5903,6 @@ int processCommand(string* arguments)
int moduleID = 1;
inputNames::const_iterator listPT1 = inputnames.begin();
umStorageNames::const_iterator listPT2 = umstoragenames.begin();
for ( int i = 0 ; i < moduleCount ; i++ )
{

6
oamapps/postConfigure/CMakeLists.txt
View File

@ -8,6 +8,8 @@ set(postConfigure_SRCS postConfigure.cpp helpers.cpp)
add_executable(postConfigure ${postConfigure_SRCS})
target_compile_options(postConfigure PRIVATE -Wno-unused-result)
target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
@ -19,6 +21,8 @@ set(installer_SRCS installer.cpp helpers.cpp)
add_executable(installer ${installer_SRCS})
target_compile_options(installer PRIVATE -Wno-unused-result)
target_link_libraries(installer ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
@ -52,6 +56,8 @@ set(mycnfUpgrade_SRCS mycnfUpgrade.cpp)
add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS})
target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result)
target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

20
oamapps/postConfigure/postConfigure.cpp
View File

@ -273,9 +273,7 @@ int main(int argc, char* argv[])
//check if root-user
int user;
int usergroup;
user = getuid();
usergroup = getgid();
string SUDO = "";
if (user != 0)
@ -1413,7 +1411,7 @@ int main(int argc, char* argv[])
{
string amazonLog = tmpDir + "/amazon.log";
string cmd = "aws --version > " + amazonLog + " 2>&1";
int rtnCode = system(cmd.c_str());
system(cmd.c_str());
ifstream in(amazonLog.c_str());
@ -1974,7 +1972,7 @@ int main(int argc, char* argv[])
}
}
unsigned int maxPMNicCount = 1;
int maxPMNicCount = 1;
//configure module type
bool parentOAMmoduleConfig = false;
@ -2111,7 +2109,7 @@ int main(int argc, char* argv[])
//clear any Equipped Module IP addresses that aren't in current ID range
for ( int j = 0 ; j < listSize ; j++ )
{
for ( unsigned int k = 1 ; k < MaxNicID+1 ; k++)
for ( int k = 1 ; k < MaxNicID+1 ; k++)
{
string ModuleIPAddr = "ModuleIPAddr" + oam.itoa(j + 1) + "-" + oam.itoa(k) + "-" + oam.itoa(i + 1);
@ -2185,8 +2183,7 @@ int main(int argc, char* argv[])
}
}
}
unsigned int nicID=1;
int nicID=1;
for( ; nicID < MaxNicID +1 ; nicID++ )
{
if ( !found )
@ -3547,7 +3544,7 @@ int main(int argc, char* argv[])
for ( int pmsID = 1; pmsID < pmPorts + 1 ; )
{
for (unsigned int j = 1 ; j < maxPMNicCount + 1 ; j++)
for (int j = 1 ; j < maxPMNicCount + 1 ; j++)
{
PerformanceModuleList::iterator list1 = performancemodulelist.begin();
@ -4008,9 +4005,11 @@ int main(int argc, char* argv[])
break;
}
if ( pass1 == "exit")
if ( strncmp(pass1, "exit", 4) )
{
exit(0);
}
string p1 = pass1;
pass2 = getpass("Confirm password > ");
string p2 = pass2;
@ -6418,7 +6417,6 @@ bool glusterSetup(string password, bool doNotResolveHostNames)
Oam oam;
int dataRedundancyCopies = 0;
int dataRedundancyNetwork = 0;
int dataRedundancyStorage = 0;
int numberDBRootsPerPM = DBRootCount / pmNumber;
int numberBricksPM = 0;
std::vector<int> dbrootPms[DBRootCount];

2
oamapps/serverMonitor/CMakeLists.txt
View File

@ -18,6 +18,8 @@ set(ServerMonitor_SRCS
add_executable(ServerMonitor ${ServerMonitor_SRCS})
target_compile_options(ServerMonitor PRIVATE -Wno-unused-result)
target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT platform)

3
oamapps/serverMonitor/cpuMonitor.cpp
View File

@ -569,7 +569,8 @@ void ServerMonitor::getCPUdata()
while (oldFile.getline(line, 400))
{
string buf = line;
string::size_type pos = buf.find ('id,', 0);
// Questionable replacement
string::size_type pos = buf.find("id,", 0);
if (pos == string::npos)
{
systemIdle = systemIdle + atol(buf.substr(0, pos - 1).c_str());

4
oamapps/serverMonitor/msgProcessor.cpp
View File

@ -100,8 +100,8 @@ void msgProcessor()
Config* sysConfig = Config::makeConfig();
string port = sysConfig->getConfig(msgPort, "Port");
string cmd = "fuser -k " + port + "/tcp >/dev/null 2>&1";
int user;
user = getuid();
//int user;
//user = getuid();
system(cmd.c_str());
}