WL#8505: Transformed the query rewrite plugins to audit plugins

Author: gkodinov

cmake/abi_check.cmake

@@ -44,7 +44,6 @@ IF(CMAKE_COMPILER_IS_GNUCC AND RUN_ABI_CHECK)
     ${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v2.h
     ${CMAKE_SOURCE_DIR}/include/mysql/client_plugin.h
     ${CMAKE_SOURCE_DIR}/include/mysql/plugin_auth.h
-    ${CMAKE_SOURCE_DIR}/include/mysql/plugin_query_rewrite.h
     ${CMAKE_SOURCE_DIR}/include/mysql/services.h
   )
 

include/mysql/plugin.h

@@ -94,10 +94,8 @@ typedef struct st_mysql_xid MYSQL_XID;
 #define MYSQL_REPLICATION_PLUGIN     6	/* The replication plugin type */
 #define MYSQL_AUTHENTICATION_PLUGIN  7  /* The authentication plugin type */
 #define MYSQL_VALIDATE_PASSWORD_PLUGIN  8   /* validate password plugin type */
-#define MYSQL_REWRITE_PRE_PARSE_PLUGIN  9   /* Pre-parse query rewrite. */
-#define MYSQL_REWRITE_POST_PARSE_PLUGIN 10  /* Post-parse query rewrite. */
-#define MYSQL_GROUP_REPLICATION_PLUGIN  11  /* The Group Replication plugin */
-#define MYSQL_MAX_PLUGIN_TYPE_NUM    12  /* The number of plugin types   */
+#define MYSQL_GROUP_REPLICATION_PLUGIN  9  /* The Group Replication plugin */
+#define MYSQL_MAX_PLUGIN_TYPE_NUM    10  /* The number of plugin types   */
 
 /* We use the following strings to define licenses for plugins */
 #define PLUGIN_LICENSE_PROPRIETARY 0

include/mysql/plugin_audit.h

@@ -26,7 +26,7 @@
 
 #define MYSQL_AUDIT_CLASS_MASK_SIZE 1
 
-#define MYSQL_AUDIT_INTERFACE_VERSION 0x0301
+#define MYSQL_AUDIT_INTERFACE_VERSION 0x0302
 
 
 /*************************************************************************
@@ -103,6 +103,34 @@ struct mysql_event_connection
   int connection_type;
 };
 
+#define MYSQL_AUDIT_PARSE_CLASS 2
+#define MYSQL_AUDIT_PARSE_CLASSMASK (1UL << MYSQL_AUDIT_PARSE_CLASS)
+#define MYSQL_AUDIT_PREPARSE 0
+#define MYSQL_AUDIT_POSTPARSE 1
+
+/// mysql_event_parse::flags Must be set by a plugin if the query is rewritten.
+#define FLAG_REWRITE_PLUGIN_QUERY_REWRITTEN 1
+/// mysql_event_parse::flags Is set by the server if the query is prepared statement.
+#define FLAG_REWRITE_PLUGIN_IS_PREPARED_STATEMENT 2
+
+
+/** Data for the MYSQL_AUDIT_[PRE|POST]_PARSE events */
+struct mysql_event_parse
+{
+  /** MYSQL_AUDIT_[PRE|POST]_PARSE event id */
+  unsigned int event_subclass;
+  /** one of FLAG_REWRITE_PLUGIN_* */
+  int *flags;
+  /** input: the original query text */
+  const char *query;
+  /** input: the original query length */
+  size_t query_length;
+  /** output: returns the null-terminated rewriten query allocated by my_malloc() */
+  char **rewritten_query;
+  /** output: if not null returns the rewriten query length */
+  size_t *rewritten_query_length;
+};
+
 
 /*************************************************************************
   Here we define the descriptor structure, that is referred from

include/mysql/plugin_audit.h.pp

@@ -158,6 +158,15 @@
   unsigned int database_length;
   int connection_type;
 };
+struct mysql_event_parse
+{
+  unsigned int event_subclass;
+  int *flags;
+  const char *query;
+  size_t query_length;
+  char **rewritten_query;
+  size_t *rewritten_query_length;
+};
 struct st_mysql_audit
 {
   int interface_version;

include/mysql/plugin_query_rewrite.h

@@ -4,4 +4,4 @@ DROP FUNCTION IF EXISTS load_rewrite_rules;
 error 0, ER_SP_DOES_NOT_EXIST;
 UNINSTALL PLUGIN rewriter;
 enable_query_log;
-echo # Query rewrite plugin was uninstalled.;
+echo # Query rewrite plugin was queued for uninstalling.;