From b1be9b5a71f6ee1623119b933db3a8d7745ec4f5 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 24 Apr 2023 15:27:29 +0000 Subject: [PATCH 1/3] old gcc fixes --- include/MySQL_HostGroups_Manager.h | 2 +- lib/MySQL_HostGroups_Manager.cpp | 4 +++- lib/MySQL_Monitor.cpp | 18 ++++++++++++------ lib/ProxySQL_Admin.cpp | 8 +++++--- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h index 20cc69d5a..d939ed8dd 100644 --- a/include/MySQL_HostGroups_Manager.h +++ b/include/MySQL_HostGroups_Manager.h @@ -430,7 +430,7 @@ class MySQL_HostGroups_Manager { __HGM_TABLES_SIZE }; - std::array table_resultset_checksum { 0 }; + std::array table_resultset_checksum { {0} }; class HostGroup_Server_Mapping { public: diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index b6d1ffefa..68f6c1079 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -1990,7 +1990,9 @@ bool MySQL_HostGroups_Manager::commit( if (itr == hostgroup_server_mapping.end()) { std::unique_ptr 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> { + server_id, std::move(server_mapping) + } ); } else { fetched_server_mapping = itr->second.get(); diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp index e6d9e0943..5f429432f 100644 --- a/lib/MySQL_Monitor.cpp +++ b/lib/MySQL_Monitor.cpp @@ -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 { 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 { 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 {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 { 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 { 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 { mmsd->hostgroup_id, mmsd->hostname, mmsd->port, repl_lag }); } //executing replication lag action diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp index 8f5ca1079..b8aaad895 100644 --- a/lib/ProxySQL_Admin.cpp +++ b/lib/ProxySQL_Admin.cpp @@ -13749,9 +13749,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 { 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(); From 98d56a585e4e811c3732ceb24ba50ad199c52272 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 24 Apr 2023 15:27:51 +0000 Subject: [PATCH 2/3] clang fix --- lib/ProxySQL_GloVars.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ProxySQL_GloVars.cpp b/lib/ProxySQL_GloVars.cpp index e07cdf6fc..1eb924047 100644 --- a/lib/ProxySQL_GloVars.cpp +++ b/lib/ProxySQL_GloVars.cpp @@ -85,7 +85,7 @@ ProxySQL_GlobalVariables::~ProxySQL_GlobalVariables() { * anonymous union. */ ProxySQL_GlobalVariables::ProxySQL_GlobalVariables() : - prometheus_registry(std::make_shared()), checksums_values() + prometheus_registry(std::make_shared()), checksums_values( {} ) { confFile=NULL; __cmd_proxysql_config_file=NULL; From 177a86728f63fb4658a83c03920467df7d48b70e Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Tue, 25 Apr 2023 10:48:56 +0200 Subject: [PATCH 3/3] Update package-build.yml --- .github/workflows/package-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package-build.yml b/.github/workflows/package-build.yml index bd702b658..91362d0fa 100644 --- a/.github/workflows/package-build.yml +++ b/.github/workflows/package-build.yml @@ -86,7 +86,7 @@ jobs: uses: actions/checkout@v3 with: repository: 'sysown/proxysql' - ref: 'v2.x' +# ref: 'v2.x' fetch-depth: 0 - name: Set GIT_VERSION