Skip to content

Refactor MYSQL_PROXY #118

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

Merged
yanw-bq merged 25 commits into from
Mar 16, 2023
Merged

Refactor MYSQL_PROXY #118

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6b38980
EFM PROXY
yanw-bq Mar 8, 2023
7a30adf
complete EFM PROXY
yanw-bq Mar 9, 2023
a554256
fix unit tests
yanw-bq Mar 10, 2023
8df12dd
fix include
yanw-bq Mar 10, 2023
b6c8000
generate node keys after setting next proxy for EFM_PROXY
yanw-bq Mar 10, 2023
cc18b06
fix unit tests
yanw-bq Mar 10, 2023
60ecec6
stop monitoring init() and options()
yanw-bq Mar 10, 2023
21ad2e2
replace MYSQL_MONITOR_PROXY with MYSQL_PROXY
yanw-bq Mar 14, 2023
370cfce
fix unit tests
yanw-bq Mar 14, 2023
fd8dcdc
stop monitoring ping()
yanw-bq Mar 15, 2023
030dd85
stop monitoring ssl_set and option4
yanw-bq Mar 15, 2023
505a758
stop monitoring autocommit
yanw-bq Mar 15, 2023
bcc8981
comment out aws code
yanw-bq Mar 15, 2023
314cb0c
stop monitoring client_find_plugin
yanw-bq Mar 15, 2023
acbb28e
newline at eof
yanw-bq Mar 15, 2023
e131b3f
free monitor connection before getting a new one
yanw-bq Mar 15, 2023
388eb20
fix unit tests
yanw-bq Mar 15, 2023
db20013
test
yanw-bq Mar 15, 2023
8395ead
disable failover and monitoring for monitor thread
yanw-bq Mar 15, 2023
2b05234
fix memory leak in unit test
yanw-bq Mar 15, 2023
c1d41d2
needs connection handler for monitor
yanw-bq Mar 15, 2023
678e108
add null check in monitor service start monitoring
yanw-bq Mar 15, 2023
3f8087c
fix env handle still used after deleting
yanw-bq Mar 15, 2023
a771372
comment out mysql_library_init
yanw-bq Mar 16, 2023
706652c
move connection handler to its own header file
yanw-bq Mar 16, 2023
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 driver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
base_metrics_holder.cc catalog.cc catalog_no_i_s.cc cluster_topology_info.cc
cluster_aware_hit_metrics_holder.cc cluster_aware_metrics_container.cc
cluster_aware_metrics.cc cluster_aware_time_metrics_holder.cc
connect.cc cursor.cc desc.cc dll.cc driver.cc
connect.cc cursor.cc desc.cc dll.cc driver.cc efm_proxy.cc
error.cc execute.cc failover_connection_handler.cc failover_handler.cc
failover_reader_handler.cc failover_writer_handler.cc handle.cc host_info.cc info.cc
monitor.cc monitor_connection_context.cc monitor_service.cc monitor_thread_container.cc
Expand All @@ -84,7 +84,7 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
SET(DRIVER_SRCS ${DRIVER_SRCS} driver${CONNECTOR_DRIVER_TYPE_SHORT}.def driver${CONNECTOR_DRIVER_TYPE_SHORT}.rc
base_metrics_holder.h catalog.h cluster_aware_hit_metrics_holder.h cluster_aware_metrics_container.h
cluster_aware_metrics.h cluster_aware_time_metrics_holder.h cluster_topology_info.h
driver.h error.h failover.h host_info.h monitor.h monitor_connection_context.h monitor_service.h
driver.h efm_proxy.h error.h failover.h host_info.h monitor.h monitor_connection_context.h monitor_service.h
monitor_thread_container.h mylog.h mysql_proxy.h myutil.h parse.h query_parsing.h topology_service.h
../MYODBC_MYSQL.h ../MYODBC_CONF.h ../MYODBC_ODBC.h)
ENDIF(WIN32)
Expand Down
11 changes: 7 additions & 4 deletions driver/connect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ SQLRETURN DBC::connect(DataSource *dsrc, bool failover_enabled)
ds_set_strnattr(&dsrc->server8, (SQLCHAR*)host, strlen(host));
dsrc->port = port;

Aws::SDKOptions options;
//Aws::SDKOptions options;
//Aws::InitAPI(options); TODO: causing SSL connection error: SSL_CTX_new failed
//Aws::ShutdownAPI(options);

Expand Down Expand Up @@ -1056,7 +1056,8 @@ SQLRETURN SQL_API MySQLConnect(SQLHDBC hdbc,
if (ds->save_queries && !dbc->log_file)
dbc->log_file = init_log_file();

dbc->mysql_proxy = new MYSQL_PROXY(dbc, ds);
dbc->init_proxy_chain(ds);
dbc->connection_handler = std::make_shared<CONNECTION_HANDLER>(dbc);
dbc->fh = new FAILOVER_HANDLER(dbc, ds);
rc = dbc->fh->init_cluster_info();
if (!dbc->ds)
Expand Down Expand Up @@ -1173,7 +1174,8 @@ SQLRETURN SQL_API MySQLDriverConnect(SQLHDBC hdbc, SQLHWND hwnd,
if (ds->save_queries && !dbc->log_file)
dbc->log_file = init_log_file();

dbc->mysql_proxy = new MYSQL_PROXY(dbc, ds);
dbc->init_proxy_chain(ds);
dbc->connection_handler = std::make_shared<CONNECTION_HANDLER>(dbc);
dbc->fh = new FAILOVER_HANDLER(dbc, ds);
rc = dbc->fh->init_cluster_info();
if (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO)
Expand Down Expand Up @@ -1352,7 +1354,8 @@ SQLRETURN SQL_API MySQLDriverConnect(SQLHDBC hdbc, SQLHWND hwnd,
if (ds->save_queries && !dbc->log_file)
dbc->log_file = init_log_file();

dbc->mysql_proxy = new MYSQL_PROXY(dbc, ds);
dbc->init_proxy_chain(ds);
dbc->connection_handler = std::make_shared<CONNECTION_HANDLER>(dbc);
dbc->fh = new FAILOVER_HANDLER(dbc, ds);
rc = dbc->fh->init_cluster_info();
if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO)
Expand Down
2 changes: 1 addition & 1 deletion driver/dll.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ void myodbc_init(void)

// This library_init call is causing the test my_data to crash on mac.
// TODO: Find alternate solution
// mysql_library_init(0, nullptr, nullptr);
mysql_library_init(0, nullptr, nullptr);

if(!mysys_inited)
{
Expand Down
5 changes: 4 additions & 1 deletion driver/driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@
#include "../MYODBC_MYSQL.h"
#include "../MYODBC_CONF.h"
#include "../MYODBC_ODBC.h"
#include "util/installer.h"
#include "efm_proxy.h"
#include "failover.h"
#include "mysql_proxy.h"
#include "util/installer.h"

/* Disable _attribute__ on non-gcc compilers. */
#if !defined(__attribute__) && !defined(__GNUC__)
Expand Down Expand Up @@ -643,6 +644,7 @@ struct DBC
fido_callback_func fido_callback = nullptr;

FAILOVER_HANDLER *fh = nullptr; /* Failover handler */
std::shared_ptr<CONNECTION_HANDLER> connection_handler = nullptr;

DBC(ENV *p_env);
void free_explicit_descriptors();
Expand All @@ -654,6 +656,7 @@ struct DBC
SQLRETURN connect(DataSource *dsrc, bool failover_enabled);
void execute_prep_stmt(MYSQL_STMT *pstmt, std::string &query,
MYSQL_BIND *param_bind, MYSQL_BIND *result_bind);
void init_proxy_chain(DataSource *dsrc);

inline bool transactions_supported() {
return mysql_proxy->get_server_capabilities() & CLIENT_TRANSACTIONS;
Expand Down
Loading