aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4184 from sysown/v2.x-old_compiler_fixes

Browse Source 
fix list/tuple initialization for old gcc
pull/4193/head
René Cannaò 3 years ago committed by GitHub
parent f50c26b460 5427675b9d
commit 85e6907bab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
include/MySQL_HostGroups_Manager.h
Unescape View File

@ -430,7 +430,7 @@ class MySQL_HostGroups_Manager {
__HGM_TABLES_SIZE
};
std::array<uint64_t, __HGM_TABLES_SIZE> table_resultset_checksum { 0 };
std::array<uint64_t, __HGM_TABLES_SIZE> table_resultset_checksum { {0} };
class HostGroup_Server_Mapping {
public:

4
lib/MySQL_HostGroups_Manager.cpp
Unescape View File

@ -1990,7 +1990,9 @@ bool MySQL_HostGroups_Manager::commit(
if (itr == hostgroup_server_mapping.end()) {
std::unique_ptr<HostGroup_Server_Mapping> server_mapping(new HostGroup_Server_Mapping(this));
fetched_server_mapping = server_mapping.get();
hostgroup_server_mapping.insert({ server_id, std::move(server_mapping) });
hostgroup_server_mapping.insert( std::pair<std::string,std::unique_ptr<MySQL_HostGroups_Manager::HostGroup_Server_Mapping>> {
server_id, std::move(server_mapping)
} );
}
else {
fetched_server_mapping = itr->second.get();

18
lib/MySQL_Monitor.cpp
Unescape View File

@ -1734,7 +1734,9 @@ VALGRIND_ENABLE_ERROR_REPORTING;
}
if (timeout_reached == false && mmsd->interr == 0) {
MyHGM->read_only_action_v2({ { mmsd->hostname, mmsd->port, read_only } }); // default behavior
MyHGM->read_only_action_v2( std::list<read_only_server_t> {
read_only_server_t { mmsd->hostname, mmsd->port, read_only }
} ); // default behavior
} else {
char *error=NULL;
int cols=0;
@ -1753,7 +1755,9 @@ VALGRIND_ENABLE_ERROR_REPORTING;
// disable host
proxy_error("Server %s:%d missed %d read_only checks. Assuming read_only=1\n", mmsd->hostname, mmsd->port, max_failures);
MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, mmsd->hostgroup_id, mmsd->hostname, mmsd->port, ER_PROXYSQL_READ_ONLY_CHECKS_MISSED);
MyHGM->read_only_action_v2({ { mmsd->hostname, mmsd->port, read_only } }); // N timeouts reached
MyHGM->read_only_action_v2( std::list<read_only_server_t> {
read_only_server_t { mmsd->hostname, mmsd->port, read_only }
} ); // N timeouts reached
}
delete resultset;
resultset=NULL;
@ -2778,7 +2782,9 @@ __exit_monitor_replication_lag_thread:
SAFE_SQLITE3_STEP2(statement);
rc=(*proxy_sqlite3_clear_bindings)(statement); ASSERT_SQLITE_OK(rc, mmsd->mondb);
rc=(*proxy_sqlite3_reset)(statement); ASSERT_SQLITE_OK(rc, mmsd->mondb);
MyHGM->replication_lag_action({ {mmsd->hostgroup_id, mmsd->hostname, mmsd->port, repl_lag} });
MyHGM->replication_lag_action( std::list<replication_lag_server_t> {
replication_lag_server_t {mmsd->hostgroup_id, mmsd->hostname, mmsd->port, repl_lag}
} );
(*proxy_sqlite3_finalize)(statement);
if (mmsd->mysql_error_msg == NULL) {
replication_lag_success = true;
@ -7224,7 +7230,7 @@ VALGRIND_ENABLE_ERROR_REPORTING;
if (task_result == MySQL_Monitor_State_Data_Task_Result::TASK_RESULT_SUCCESS) {
//MyHGM->read_only_action_v2(mmsd->hostname, mmsd->port, read_only); // default behavior
mysql_servers.push_back({ mmsd->hostname, mmsd->port, read_only });
mysql_servers.push_back( std::tuple<std::string,int,int> { mmsd->hostname, mmsd->port, read_only });
} else {
char* error = NULL;
int cols = 0;
@ -7244,7 +7250,7 @@ VALGRIND_ENABLE_ERROR_REPORTING;
proxy_error("Server %s:%d missed %d read_only checks. Assuming read_only=1\n", mmsd->hostname, mmsd->port, max_failures);
MyHGM->p_update_mysql_error_counter(p_mysql_error_type::proxysql, mmsd->hostgroup_id, mmsd->hostname, mmsd->port, ER_PROXYSQL_READ_ONLY_CHECKS_MISSED);
//MyHGM->read_only_action_v2(mmsd->hostname, mmsd->port, read_only); // N timeouts reached
mysql_servers.push_back({ mmsd->hostname, mmsd->port, read_only });
mysql_servers.push_back( std::tuple<std::string,int,int> { mmsd->hostname, mmsd->port, read_only });
}
delete resultset;
resultset = NULL;
@ -7665,7 +7671,7 @@ bool MySQL_Monitor::monitor_replication_lag_process_ready_tasks(const std::vecto
rc = (*proxy_sqlite3_reset)(statement); ASSERT_SQLITE_OK(rc, mmsd->mondb);
//MyHGM->replication_lag_action(mmsd->hostgroup_id, mmsd->hostname, mmsd->port, repl_lag);
(*proxy_sqlite3_finalize)(statement);
mysql_servers.push_back({ mmsd->hostgroup_id, mmsd->hostname, mmsd->port, repl_lag });
mysql_servers.push_back( std::tuple<int,std::string,int,int> { mmsd->hostgroup_id, mmsd->hostname, mmsd->port, repl_lag });
}
//executing replication lag action

8
lib/ProxySQL_Admin.cpp
Unescape View File

@ -13921,9 +13921,11 @@ unsigned long long ProxySQL_Admin::ProxySQL_Test___MySQL_HostGroups_Manager_read
sprintf(hostnamebuf1,"hostname%d", i*10+1);
sprintf(hostnamebuf2,"hostname%d", i*10+2);
sprintf(hostnamebuf3,"hostname%d", i*10+3);
MyHGM->read_only_action_v2({ { std::string(hostnamebuf1), 3306, 0 },
{ std::string(hostnamebuf2), 3306, 1 },
{ std::string(hostnamebuf3), 3306, 1 } });
MyHGM->read_only_action_v2( std::list<read_only_server_t> {
read_only_server_t { std::string(hostnamebuf1), 3306, 0 },
read_only_server_t { std::string(hostnamebuf2), 3306, 1 },
read_only_server_t { std::string(hostnamebuf3), 3306, 1 }
} );
}
}
unsigned long long t2 = monotonic_time();

Write Preview
Loading…
Cancel
Save