database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge branch 'develop' into S3-project

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-08-14 15:37:14 -05:00
parent 73c455c949 4a4d35180a
commit fbdf1a5308
245 changed files with 3356 additions and 3224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oamapps/alarmmanager/alarmglobal.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2016 MariaDB Corporaton
/* Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

8
oamapps/mcsadmin/mcsadmin.cpp
View File

@ -906,9 +906,9 @@ int processCommand(string* arguments)
SendToWES(oam, bs);
}
#if _MSC_VER
if (_strnicmp(arguments[1].c_str(), "stop", 4) == 0))
else if (_strnicmp(arguments[1].c_str(), "stop", 4) == 0))
#else
if (strncasecmp(arguments[1].c_str(), "stop", 4) == 0)
else if (strncasecmp(arguments[1].c_str(), "stop", 4) == 0)
#endif
{
ByteStream bs;
@ -920,9 +920,9 @@ int processCommand(string* arguments)
SendToWES(oam, bs);
}
#if _MSC_VER
if (_strnicmp(arguments[1].c_str(), "status", 6) == 0))
else if (_strnicmp(arguments[1].c_str(), "status", 6) == 0))
#else
if (strncasecmp(arguments[1].c_str(), "status", 6) == 0)
else if (strncasecmp(arguments[1].c_str(), "status", 6) == 0)
#endif
{
ByteStream bs;

2
oamapps/mcsadmin/mcsadmin.h
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/postConfigure/amazonInstaller.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/postConfigure/helpers.h
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/postConfigure/installer.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/postConfigure/mycnfUpgrade.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/postConfigure/patchInstaller.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

4
oamapps/postConfigure/postConfigure.cpp
View File

@ -215,13 +215,11 @@ typedef struct _thread_data_t
int main(int argc, char* argv[])
{
// print a warning if this is a developer build
#ifdef SKIP_OAM_INIT
cout << "SKIP_OAM_INIT is set" << endl;
sleep(2);
#endif
Oam oam;
string parentOAMModuleHostName;
ChildModuleList childmodulelist;
@ -5397,7 +5395,7 @@ bool storageSetup(bool amazonInstall)
if ( (glusterInstalled == "y" && singleServerInstall != "1") && hadoopInstalled == "y" )
{
cout << "There are 4 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl;
cout << "There are 5 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl;
prompt = "Select the type of Data Storage [1=internal, 2=external, 3=DataRedundancy, 4=hdfs] (" + storageType + ") > ";
}

2
oamapps/resourceMonitor/resourceMonitor.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/serverMonitor/cpuMonitor.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/serverMonitor/dbhealthMonitor.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

6
oamapps/serverMonitor/diskMonitor.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -267,7 +267,7 @@ void diskMonitor()
blksize = buf.f_bsize;
blocks = buf.f_blocks;
freeblks = buf.f_bfree;
freeblks = buf.f_bavail;
totalBlocks = blocks * blksize;
free = freeblks * blksize;
@ -396,7 +396,7 @@ void diskMonitor()
blksize = buf.f_bsize;
blocks = buf.f_blocks;
freeblks = buf.f_bfree;
freeblks = buf.f_bavail;
totalBlocks = blocks * blksize;
free = freeblks * blksize;

2
oamapps/serverMonitor/memoryMonitor.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
oamapps/serverMonitor/msgProcessor.cpp
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License