Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.6.x fix use local includes #4557

Merged
merged 7 commits into from
May 24, 2024
Merged

V2.6.x fix use local includes #4557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7695c42
use local include - openssl
mirostauder May 23, 2024
8394fd4
use local includes - prometheus
mirostauder May 23, 2024
6807d3a
use local includes - libconfig
mirostauder May 23, 2024
3a38500
use local includes - libdaemon
mirostauder May 23, 2024
08221a4
use local includes - mysql
mirostauder May 23, 2024
9a6c9df
use local includes - json
mirostauder May 23, 2024
f24e25f
use local includes - proxysql
mirostauder May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/MySQL_HostGroups_Manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <mutex>

// Headers for declaring Prometheus counters
#include <prometheus/counter.h>
#include <prometheus/gauge.h>
#include "prometheus/counter.h"
#include "prometheus/gauge.h"

#include "thread.h"
#include "wqueue.h"
Expand Down
4 changes: 2 additions & 2 deletions include/MySQL_Monitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef __CLASS_MYSQL_MONITOR_H
#define __CLASS_MYSQL_MONITOR_H
#include <future>
#include <prometheus/counter.h>
#include <prometheus/gauge.h>
#include "prometheus/counter.h"
#include "prometheus/gauge.h"

#include "MySQL_HostGroups_Manager.h"
#include "proxysql.h"
Expand Down
4 changes: 2 additions & 2 deletions include/MySQL_Thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef __CLASS_MYSQL_THREAD_H
#define __CLASS_MYSQL_THREAD_H
#define ____CLASS_STANDARD_MYSQL_THREAD_H
#include <prometheus/counter.h>
#include <prometheus/gauge.h>
#include "prometheus/counter.h"
#include "prometheus/gauge.h"

#include "proxysql.h"
#include "cpp.h"
Expand Down
4 changes: 2 additions & 2 deletions include/ProxySQL_Cluster.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "wqueue.h"
#include <vector>

#include <prometheus/counter.h>
#include <prometheus/gauge.h>
#include "prometheus/counter.h"
#include "prometheus/gauge.h"

#define PROXYSQL_NODE_METRICS_LEN 5

Expand Down
6 changes: 3 additions & 3 deletions include/prometheus_helpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef __PROXYSQL_PROMETHEUS_HELPERS_H
#define __PROXYSQL_PROMETHEUS_HELPERS_H

#include <prometheus/counter.h>
#include <prometheus/gauge.h>
#include <prometheus/family.h>
#include "prometheus/counter.h"
#include "prometheus/gauge.h"
#include "prometheus/family.h"
#include <string>

#include "proxysql.h"
Expand Down
10 changes: 5 additions & 5 deletions include/proxysql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
#include <signal.h>
#include <errno.h>
#include <ctype.h>
#include <openssl/bio.h>
#include <openssl/sha.h>
#include <openssl/md5.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "openssl/bio.h"
#include "openssl/sha.h"
#include "openssl/md5.h"
#include "openssl/ssl.h"
#include "openssl/err.h"
#include <poll.h>
#include <execinfo.h>

Expand Down
4 changes: 2 additions & 2 deletions include/query_cache.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#define DEFAULT_purge_threshold_pct_min 3
#define DEFAULT_purge_threshold_pct_max 90

#include <prometheus/counter.h>
#include <prometheus/gauge.h>
#include "prometheus/counter.h"
#include "prometheus/gauge.h"

class KV_BtreeArray;

Expand Down
8 changes: 4 additions & 4 deletions lib/MySQL_HostGroups_Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
#include <pthread.h>
#include <string>

#include <prometheus/counter.h>
#include <prometheus/detail/builder.h>
#include <prometheus/family.h>
#include <prometheus/gauge.h>
#include "prometheus/counter.h"
#include "prometheus/detail/builder.h"
#include "prometheus/family.h"
#include "prometheus/gauge.h"

#include "prometheus_helpers.h"
#include "proxysql_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_Monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <thread>
#include <future>
#include <sstream>
#include <prometheus/counter.h>
#include "prometheus/counter.h"
#include "MySQL_Protocol.h"
#include "MySQL_HostGroups_Manager.h"
#include "MySQL_Monitor.hpp"
Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_Protocol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <openssl/rand.h>
#include "openssl/rand.h"
#include "proxysql.h"
#include "cpp.h"
#include "re2/re2.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_ResultSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <openssl/rand.h>
#include "openssl/rand.h"
#include "proxysql.h"
#include "cpp.h"
#include "re2/re2.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/MySQL_encode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <openssl/rand.h>
#include "openssl/rand.h"
#include "proxysql.h"
#include "cpp.h"

Expand Down
8 changes: 4 additions & 4 deletions lib/ProxySQL_Admin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include <memory>
#include <vector> // std::vector
#include <unordered_set>
#include <prometheus/exposer.h>
#include <prometheus/counter.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include "prometheus/exposer.h"
#include "prometheus/counter.h"
#include "openssl/ssl.h"
#include "openssl/err.h"
#include "MySQL_HostGroups_Manager.h"
#include "mysql.h"
#include "proxysql_admin.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/ProxySQL_GloVars.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "cpp.h"
#include <string>
#include <sys/utsname.h>
#include <prometheus/registry.h>
#include "prometheus/registry.h"
#ifndef SPOOKYV2
#include "SpookyV2.h"
#define SPOOKYV2
Expand Down
2 changes: 1 addition & 1 deletion lib/Query_Cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <prometheus/counter.h>
#include "prometheus/counter.h"
#include "btree_map.h"
#include "proxysql.h"
#include "cpp.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/configfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <unistd.h>


#include <libconfig.h++>
#include "libconfig.h++"

using namespace std;
using namespace libconfig;
Expand Down
2 changes: 1 addition & 1 deletion lib/mysql_data_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "MySQL_PreparedStatement.h"
#include "MySQL_Data_Stream.h"

#include <openssl/x509v3.h>
#include "openssl/x509v3.h"


/**
Expand Down
14 changes: 7 additions & 7 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
#include "Web_Interface.hpp"
#include "proxysql_utils.h"

#include <libdaemon/dfork.h>
#include <libdaemon/dsignal.h>
#include <libdaemon/dlog.h>
#include <libdaemon/dpid.h>
#include <libdaemon/dexec.h>
#include "libdaemon/dfork.h"
#include "libdaemon/dsignal.h"
#include "libdaemon/dlog.h"
#include "libdaemon/dpid.h"
#include "libdaemon/dexec.h"
#include "ev.h"

#include "curl/curl.h"

#include <openssl/x509v3.h>
#include "openssl/x509v3.h"

#include <sys/mman.h>

Expand Down Expand Up @@ -71,7 +71,7 @@ char *binary_sha1 = NULL;
#endif

static pthread_mutex_t *lockarray;
#include <openssl/crypto.h>
#include "openssl/crypto.h"


// this fuction will be called as a deatached thread
Expand Down
2 changes: 1 addition & 1 deletion src/proxy_tls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "proxysql.h"
#include "cpp.h"
#include <openssl/x509v3.h>
#include "openssl/x509v3.h"

static long
get_file_size (const char *filename) {
Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests/mysql_reconnect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <thread>

#ifdef LIBMYSQL_HELPER8
#include <mysql/mysql.h>
#include "mysql/mysql.h"
#else
#include "mysql.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests/test_binlog_reader-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "mysql.h"
#include "mysqld_error.h"
#include <json.hpp>
#include "json.hpp"

#include "tap.h"
#include "command_line.h"
Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests/test_client_limit_error-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <iostream>
#include <fstream>

#include <libconfig.h>
#include "libconfig.h"
#include "proxysql_utils.h"
#include "mysql.h"

Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests/test_cluster_sync-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#include <regex>
#include <utility>

#include <libconfig.h>
#include "libconfig.h"

#include "proxysql_utils.h"

Expand Down
6 changes: 3 additions & 3 deletions test/tap/tests/test_cluster_sync_mysql_servers-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
#include <regex>
#include <utility>

#include <libconfig.h>
#include "libconfig.h"

#include <proxysql_utils.h>
#include "proxysql_utils.h"

#include <mysql.h>
#include "mysql.h"
#ifndef SPOOKYV2
#include "SpookyV2.h"
#define SPOOKYV2
Expand Down
4 changes: 2 additions & 2 deletions test/tap/tests/test_warnings-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <thread>

#include "json.hpp"
#include <mysql.h>
#include <mysql/mysqld_error.h>
#include "mysql.h"
#include "mysql/mysqld_error.h"
#include "tap.h"
#include "command_line.h"
#include "utils.h"
Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <stdio.h>
#include <iostream>

#include <mysql.h>
#include "mysql.h"
#include "mysqld_error.h"

#include "tap.h"
Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <stdio.h>
#include <iostream>

#include <mysql.h>
#include "mysql.h"
#include "mysqld_error.h"

#include "json.hpp"
Expand Down
2 changes: 1 addition & 1 deletion test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <unistd.h>
#include <iostream>

#include <mysql.h>
#include "mysql.h"
#include "mysqld_error.h"

#include "tap.h"
Expand Down
Loading