Extract 'Session_Regex' from classes into isolated files

This commit performs some header cleanup and isolates 'Session_Regex'
('match_regexes') into isolated files. This separation of utilities
allows unit testing for all those function/classes which are not
necessary bounded to deeply interconnected classes logic (like
'MySQL_Session', 'MySQL_Variables', etc...).

Attempting to use these classes in unit tests will inevitable result in
linking issues due to their interconnection and current relationships
with globals. Meanwhile, the utility files can be isolated and linked
with any test file.

Following these principles, 'match_regexes' are now global objects
(singletons), which are isolated and complete by construction. Same goes
for 'ignore_vars' and 'variables_regexp' used for 'SET' statements
matching.

Some additional unnecessary headers cleanup is also performed in the
commit.

Author: JavierJF

include/Base_Session_Utils.h

@@ -0,0 +1,23 @@
+#ifndef BASE_SESSION_UTILS_H
+#define BASE_SESSION_UTILS_H
+
+/**
+ * @class Session_Regex
+ * @brief Encapsulates regex operations for session handling.
+ *
+ * This class is used for matching patterns in SQL queries, specifically for
+ * settings like sql_log_bin, sql_mode, and time_zone.
+ * See issues #509 , #815 and #816
+ */
+class Session_Regex {
+private:
+	void* opt;
+	void* re;
+	char* s;
+public:
+	Session_Regex(const char* p);
+	~Session_Regex();
+	bool match(const char* m);
+};
+
+#endif // BASE_SESSION_UTILS_H

include/Base_Thread.h

@@ -1,7 +1,11 @@
 #ifndef CLASS_BASE_THREAD_H
 #define CLASS_BASE_THREAD_H
 
-#include "proxysql.h"
+#ifdef DEBUG
+#include <atomic>
+#endif
+
+#include "proxysql_structs.h"
 
 typedef struct _thr_id_username_t {
 	uint32_t id;
@@ -14,25 +18,6 @@ typedef struct _kill_queue_t {
 	std::vector<thr_id_usr *> query_ids;
 } kill_queue_t;
 
-/**
- * @class Session_Regex
- * @brief Encapsulates regex operations for session handling.
- *
- * This class is used for matching patterns in SQL queries, specifically for
- * settings like sql_log_bin, sql_mode, and time_zone.
- * See issues #509 , #815 and #816
- */
-class Session_Regex {
-private:
-	void* opt;
-	void* re;
-	char* s;
-public:
-	Session_Regex(const char* p);
-	~Session_Regex();
-	bool match(const char* m);
-};
-
 class MySQL_Thread;
 class PgSQL_Thread;
 
@@ -53,7 +38,6 @@ class Base_Thread {
 	bool epoll_thread;
 	int shutdown;
 	PtrArray *mysql_sessions;
-	Session_Regex **match_regexes;
 	Base_Thread();
 	~Base_Thread();
 	template<typename T, typename S>

include/MySQL_Session.h

@@ -379,8 +379,6 @@ class MySQL_Session: public Base_Session<MySQL_Session, MySQL_Data_Stream, MySQL
 	MySQL_STMTs_meta *sess_STMTs_meta;
 	StmtLongDataHandler *SLDH;
 
-	Session_Regex **match_regexes;
-
 	ProxySQL_Node_Address * proxysql_node_address; // this is used ONLY for Admin, and only if the other party is another proxysql instance part of a cluster
 	bool use_ldap_auth;
 

include/MySQL_Session_Utils.h

@@ -0,0 +1,10 @@
+#ifndef MYSQL_SESSION_UTILS_H
+#define MYSQL_SESSION_UTILS_H
+
+#include "Base_Session_Utils.h"
+
+#include <array>
+
+extern std::array<Session_Regex,4> mysql_match_regexes;
+
+#endif // MYSQL_SESSION_UTILS_H

include/MySQL_Thread.h

@@ -111,8 +111,6 @@ class __attribute__((aligned(64))) MySQL_Thread : public Base_Thread
 	std::map<unsigned int, unsigned int> sessmap;
 #endif // IDLE_THREADS
 
-	//Session_Regex **match_regexes;
-
 #ifdef IDLE_THREADS
 	void worker_thread_assigns_sessions_to_idle_thread(MySQL_Thread *thr);
 	void worker_thread_gets_sessions_from_idle_thread();

include/MySQL_Variables.h

@@ -1,17 +1,14 @@
 #ifndef MYSQL_VARIABLES_H
 #define MYSQL_VARIABLES_H
 
-#include "proxysql.h"
-#include "cpp.h"
+#include "proxysql_structs.h"
 
 #include <cstdint>
+#include <string>
 #include <vector>
-#include <memory>
 
 class MySQL_Session;
 
-extern void print_backtrace(void);
-
 typedef bool (*verify_var)(MySQL_Session* session, int idx, uint32_t client_hash, uint32_t server_hash);
 typedef bool (*update_var)(MySQL_Session* session, int idx, int &_rc);
 
@@ -26,10 +23,6 @@ class MySQL_Variables {
 	static verify_var verifiers[SQL_NAME_LAST_HIGH_WM];
 	static update_var updaters[SQL_NAME_LAST_HIGH_WM];
 
-public:
-	std::string variables_regexp;
-	// ignore_vars is a list of all variables that proxysql will parse but ignore its value
-	std::vector<std::string> ignore_vars;
 public:
 	MySQL_Variables();
 

include/MySQL_Variables_Utils.h

@@ -0,0 +1,16 @@
+#ifndef MYSQL_VARIABLES_UTILS_H
+#define MYSQL_VARIABLES_UTILS_H
+
+#include <string>
+#include <vector>
+
+/**
+ * @brief Gets all the variables for ProxySQL to recognize but ignore.
+ */
+const std::vector<std::string>& get_mysql_ignore_vars();
+/**
+ * @brief Gets a regex with all the variables ProxySQL should recognize for SET statements.
+ */
+const std::string& get_mysql_variables_regexp();
+
+#endif

include/PgSQL_Session.h

@@ -502,7 +502,6 @@ class PgSQL_Session : public Base_Session<PgSQL_Session, PgSQL_Data_Stream, PgSQ
 //	MySQL_STMTs_meta* sess_STMTs_meta;
 //	StmtLongDataHandler* SLDH;
 
-	Session_Regex** match_regexes;
 	CopyCmdMatcher* copy_cmd_matcher;
 
 	ProxySQL_Node_Address* proxysql_node_address; // this is used ONLY for Admin, and only if the other party is another proxysql instance part of a cluster

include/PgSQL_Session_Utils.h

@@ -0,0 +1,10 @@
+#ifndef PGSQL_SESSION_UTILS_H
+#define PGSQL_SESSION_UTILS_H
+
+#include "Base_Session_Utils.h"
+
+#include <array>
+
+extern std::array<Session_Regex,4> pgsql_match_regexes;
+
+#endif // PGSQL_SESSION_UTILS_H

include/PgSQL_Thread.h

@@ -157,8 +157,6 @@ class __attribute__((aligned(64))) PgSQL_Thread : public Base_Thread
 	std::map<unsigned int, unsigned int> sessmap;
 #endif // IDLE_THREADS
 
-	//Session_Regex** match_regexes;
-
 #ifdef IDLE_THREADS
 	void worker_thread_assigns_sessions_to_idle_thread(PgSQL_Thread * thr);
 	void worker_thread_gets_sessions_from_idle_thread();