V3.0 4826 4817

include/Base_Session.h

@@ -115,7 +115,7 @@ class Base_Session {
 	void writeout();
 	void return_proxysql_internal(PtrSize_t* pkt);
 	virtual void generate_proxysql_internal_session_json(nlohmann::json &) = 0;
-	virtual void RequestEnd(DS *) = 0;
+	virtual void RequestEnd(DS *, const unsigned int, const char *) = 0;
 	virtual void SQLite3_to_MySQL(SQLite3_result*, char*, int, MySQL_Protocol*, bool in_transaction = false, bool deprecate_eof_active = false) = 0;
 	bool has_any_backend();
 	void reset_all_backends();

include/Base_Thread.h

@@ -1,6 +1,6 @@
 #ifndef CLASS_BASE_THREAD_H
 #define CLASS_BASE_THREAD_H
-
+#include <type_traits>
 #include "proxysql.h"
 
 typedef struct _thr_id_username_t {
@@ -36,47 +36,75 @@ class Session_Regex {
 class MySQL_Thread;
 class PgSQL_Thread;
 
+template<typename T>
 class Base_Thread {
+	static_assert(std::is_same_v<T,MySQL_Thread> || std::is_same_v<T,PgSQL_Thread>,
+		"Invalid Thread type");
 	private:
+	using TypeSession = typename std::conditional<std::is_same_v<T,MySQL_Thread>,MySQL_Session,PgSQL_Session>::type;
+	using TypeDataStream = typename std::conditional<std::is_same_v<T,MySQL_Thread>,MySQL_Data_Stream,PgSQL_Data_Stream>::type;
 	bool maintenance_loop;
+	protected:
+	std::vector<TypeSession *> mysql_sessions;
 	public:
+	std::mutex mysql_sessions_mutex;  // Protect access to mysql_sessions , if needed
 	unsigned long long curtime;
 	unsigned long long last_move_to_idle_thread_time;
 	bool epoll_thread;
 	int shutdown;
-	PtrArray *mysql_sessions;
 	Session_Regex **match_regexes;
 	Base_Thread();
 	~Base_Thread();
-	template<typename T, typename S>
-	S create_new_session_and_client_data_stream(int _fd);
-	template<typename T, typename S>
-	void register_session(T, S, bool up_start = true);
-	template<typename T>
+	TypeSession * create_new_session_and_client_data_stream(int _fd);
+	void register_session(TypeSession *, bool up_start = true);
+	/**
+	 * @brief Unregisters a session from the thread's session array.
+	 *
+	 * @param idx The index of the session to unregister.
+	 * @param lock Whatever the lock should be taken or not
+	 *
+	 * @details This function removes a session from the `mysql_sessions` array at the specified index.
+	 * It does not delete the session object itself; it is assumed that the caller will handle
+	 * the deletion.
+	 *
+	 * @note This function is called by various parts of the code when a session is no longer
+	 * active and needs to be removed from the thread's session list.
+	 *
+	 */
+	void unregister_session(int, bool);
+
+	/**
+	 * @brief Unregisters a session from the thread's session array.
+	 *
+	 * @param sess The address of the Session
+	 * @param lock Whatever the lock should be taken or not
+	 *
+	 * @details This function removes a session from the `mysql_sessions` array.
+	 * It does not delete the session object itself; it is assumed that the caller will handle
+	 * the deletion.
+	 *
+	 * @note This function is called by various parts of the code when a session is no longer
+	 * active and needs to be removed from the thread's session list.
+	 *
+	 */
+	void unregister_session(TypeSession *, bool);
+
 	void check_timing_out_session(unsigned int n);
-	template<typename T>
 	void check_for_invalid_fd(unsigned int n);
-	template<typename S>
 	void ProcessAllSessions_SortingSessions();
-	template<typename T>
 	void ProcessAllMyDS_AfterPoll();
-	template<typename T>
 	void read_one_byte_from_pipe(unsigned int n);
-	template<typename T, typename DS>
-	void tune_timeout_for_myds_needs_pause(DS * myds);
-	template<typename T, typename DS>
-	void tune_timeout_for_session_needs_pause(DS * myds);
-	template<typename T, typename DS>
-	void configure_pollout(DS * myds, unsigned int n);
-	template<typename T, typename DS>
-	bool set_backend_to_be_skipped_if_frontend_is_slow(DS * myds, unsigned int n);
+	void tune_timeout_for_myds_needs_pause(TypeDataStream * myds);
+	void tune_timeout_for_session_needs_pause(TypeDataStream * myds);
+	void configure_pollout(TypeDataStream * myds, unsigned int n);
+	bool set_backend_to_be_skipped_if_frontend_is_slow(TypeDataStream * myds, unsigned int n);
 #ifdef IDLE_THREADS
-	template<typename T, typename DS> bool move_session_to_idle_mysql_sessions(DS * myds, unsigned int n);
+	bool move_session_to_idle_mysql_sessions(TypeDataStream * myds, unsigned int n);
 #endif // IDLE_THREADS
-	template<typename T, typename S> unsigned int find_session_idx_in_mysql_sessions(S * sess);
-	template<typename T> void ProcessAllMyDS_BeforePoll();
-	template<typename T, typename S> void run_SetAllSession_ToProcess0();
-
+	unsigned int find_session_idx_in_mysql_sessions(TypeSession * sess);
+	void ProcessAllMyDS_BeforePoll();
+	void run_SetAllSession_ToProcess0();
+	const std::vector<TypeSession *>& get_mysql_sessions_ref() const { return mysql_sessions; };
 
 #if ENABLE_TIMER
 	// for now this is not accessible via Admin/Prometheus , thus useful only with gdb