Merge pull request #4799 from sysown/v3.0_session_parameter_tracking

Session parameter/variable tracking for PostgreSQL - v3.0

Author: renecannao

include/Base_Session.h

@@ -21,11 +21,11 @@ class MySQL_Session;
 class PgSQL_Session;
 
 enum SESSION_FORWARD_TYPE : uint8_t {
-	SESSION_FORWARD_TYPE_NONE			   = 0x00,
-	SESSION_FORWARD_TYPE_PERMANENT		   = 0x01,
-	SESSION_FORWARD_TYPE_TEMPORARY		   = 0x02,
-	SESSION_FORWARD_TYPE_COPY_STDIN		   = 0x04 | SESSION_FORWARD_TYPE_TEMPORARY,
-	SESSION_FORWARD_TYPE_START_REPLICATION = 0x08 | SESSION_FORWARD_TYPE_TEMPORARY,
+	SESSION_FORWARD_TYPE_NONE					= 0x00,
+	SESSION_FORWARD_TYPE_PERMANENT				= 0x01,
+	SESSION_FORWARD_TYPE_TEMPORARY				= 0x02,
+	SESSION_FORWARD_TYPE_COPY_FROM_STDIN_STDOUT	= 0x04 | SESSION_FORWARD_TYPE_TEMPORARY,
+	SESSION_FORWARD_TYPE_START_REPLICATION		= 0x08 | SESSION_FORWARD_TYPE_TEMPORARY,
 };
 
 template<typename S, typename DS, typename B, typename T>

include/set_parser.h renamed to include/MySQL_Set_Stmt_Parser.h

@@ -1,5 +1,6 @@
-#ifndef __CLASS_SET_PARSER_H
-#define __CLASS_SET_PARSER_H
+#ifndef __CLASS_MYSQL_SET_STMT_PARSER_H
+#define __CLASS_MYSQL_SET_STMT_PARSER_H
+
 #include <string>
 #include <map>
 #include <vector>
@@ -9,7 +10,7 @@
 
 //#define PARSERDEBUG
 
-class SetParser {
+class MySQL_Set_Stmt_Parser {
 	private:
 	// parse1v2 variables used for compile the RE only once
 	bool parse1v2_init;
@@ -20,13 +21,13 @@ class SetParser {
 #ifdef PARSERDEBUG
 	int verbosity;
 	public:
-	SetParser(std::string q, int verb = 0);
+	MySQL_Set_Stmt_Parser(std::string q, int verb = 0);
 #else
 	public:
-	SetParser(std::string q);
+	MySQL_Set_Stmt_Parser(std::string q);
 #endif
-	// set_query() allows to change the query associated to a SetParser.
-	// This allow to parse multiple queries using just a single SetParser.
+	// set_query() allows to change the query associated to a MySQL_Set_Stmt_Parser.
+	// This allow to parse multiple queries using just a single MySQL_Set_Stmt_Parser.
 	// At the moment this makes sense only when using parse1v2() because it
 	// allows to compile the regular expression only once
 	void set_query(const std::string& q);
@@ -48,8 +49,7 @@ class SetParser {
 	// built-in testing
 	void test_parse_USE_query();
 #endif // DEBUG
-	~SetParser();
+	~MySQL_Set_Stmt_Parser();
 };
 
-
-#endif /* __CLASS_SET_PARSER_H */
+#endif /* __CLASS_MYSQL_SET_STMT_PARSER_H */

include/MySQL_Thread.h

@@ -14,7 +14,7 @@
 
 #include "prometheus_helpers.h"
 
-#include "set_parser.h"
+#include "MySQL_Set_Stmt_Parser.h"
 
 /*
 #define MIN_POLL_LEN 8
@@ -192,7 +192,7 @@ class __attribute__((aligned(64))) MySQL_Thread : public Base_Thread
 	pthread_mutex_t thread_mutex;
 
 	// if set_parser_algorithm == 2 , a single thr_SetParser is used
-	SetParser *thr_SetParser;
+	MySQL_Set_Stmt_Parser* thr_SetParser;
 
 	MySQL_Thread();
 	~MySQL_Thread();