WL#14432 Session memory limits in performance schema

Approved by: Chris Powers <chris.powers@oracle.com>
Approved by: Miroslav Rajcic <miroslav.rajcic@oracle.com>

Change-Id: I22e0a67f5ffdfd27274d1cc7ff419d8379465340

Author: marcalff

include/mysql/components/services/bits/psi_statement_bits.h

@@ -49,30 +49,37 @@ typedef unsigned int PSI_statement_key;
 /**
   @def PSI_STATEMENT_VERSION_1
   Performance Schema Statement Interface number for version 1.
-  This version is deprecated.
+  This version is obsolete.
 */
 #define PSI_STATEMENT_VERSION_1 1
 
 /**
   @def PSI_STATEMENT_VERSION_2
   Performance Schema Statement Interface number for version 2.
-  This version is deprecated.
+  This version is obsolete.
 */
 #define PSI_STATEMENT_VERSION_2 2
 
 /**
   @def PSI_STATEMENT_VERSION_3
   Performance Schema Statement Interface number for version 3.
-  This version is supported.
+  This version is obsolete.
 */
 #define PSI_STATEMENT_VERSION_3 3
 
+/**
+  @def PSI_STATEMENT_VERSION_4
+  Performance Schema Statement Interface number for version 4.
+  This version is supported.
+*/
+#define PSI_STATEMENT_VERSION_4 4
+
 /**
   @def PSI_CURRENT_STATEMENT_VERSION
   Performance Schema Statement Interface number for the most recent version.
-  The most current version is @c PSI_STATEMENT_VERSION_3
+  The most current version is @c PSI_STATEMENT_VERSION_4
 */
-#define PSI_CURRENT_STATEMENT_VERSION 3
+#define PSI_CURRENT_STATEMENT_VERSION 4
 
 /**
   Interface for an instrumented statement.
@@ -133,16 +140,15 @@ typedef struct PSI_statement_info_v1 PSI_statement_info_v1;
 #define PSI_SCHEMA_NAME_LEN (64 * 3)
 
 /**
-  State data storage for @c get_thread_statement_locker_v1_t,
-  @c get_thread_statement_locker_v1_t.
+  State data storage for @c get_thread_statement_locker_v4_t.
   This structure provide temporary storage to a statement locker.
   The content of this structure is considered opaque,
   the fields are only hints of what an implementation
   of the psi interface can use.
   This memory is provided by the instrumented code for performance reasons.
-  @sa get_thread_statement_locker_v1_t
+  @sa get_thread_statement_locker_v4_t
 */
-struct PSI_statement_locker_state_v1 {
+struct PSI_statement_locker_state_v4 {
   /** Discarded flag. */
   bool m_discarded;
   /** In prepare flag. */
@@ -161,6 +167,14 @@ struct PSI_statement_locker_state_v1 {
   unsigned long long m_timer_start;
   /** THREAD CPU time start. */
   unsigned long long m_cpu_time_start;
+  /** State temporary data for CONTROLLED_MEMORY. */
+  size_t m_controlled_local_size_start;
+  /** State temporary data for MAX_CONTROLLED_MEMORY. */
+  size_t m_controlled_stmt_size_start;
+  /** State temporary data for TOTAL_MEMORY. */
+  size_t m_total_local_size_start;
+  /** State temporary data for MAX_TOTAL_MEMORY. */
+  size_t m_total_stmt_size_start;
   /** Internal data. */
   void *m_statement;
   /** Locked time. */
@@ -209,7 +223,7 @@ struct PSI_statement_locker_state_v1 {
   PSI_sp_share *m_parent_sp_share;
   PSI_prepared_stmt *m_parent_prepared_stmt;
 };
-typedef struct PSI_statement_locker_state_v1 PSI_statement_locker_state_v1;
+typedef struct PSI_statement_locker_state_v4 PSI_statement_locker_state_v4;
 
 struct PSI_sp_locker_state_v1 {
   /** Internal state. */
@@ -243,8 +257,8 @@ typedef void (*register_statement_v1_t)(const char *category,
   @param sp_share Parent stored procedure share, if any.
   @return a statement locker, or NULL
 */
-typedef struct PSI_statement_locker *(*get_thread_statement_locker_v1_t)(
-    struct PSI_statement_locker_state_v1 *state, PSI_statement_key key,
+typedef struct PSI_statement_locker *(*get_thread_statement_locker_v4_t)(
+    struct PSI_statement_locker_state_v4 *state, PSI_statement_key key,
     const void *charset, PSI_sp_share *sp_share);
 
 /**
@@ -533,7 +547,7 @@ typedef void (*drop_sp_v1_t)(unsigned int object_type, const char *schema_name,
                              unsigned int object_name_length);
 
 typedef struct PSI_statement_info_v1 PSI_statement_info;
-typedef struct PSI_statement_locker_state_v1 PSI_statement_locker_state;
+typedef struct PSI_statement_locker_state_v4 PSI_statement_locker_state;
 typedef struct PSI_sp_locker_state_v1 PSI_sp_locker_state;
 
 /** @} (end of group psi_abi_statement) */

include/mysql/components/services/psi_statement.h

@@ -26,12 +26,12 @@
 #include <mysql/components/component_implementation.h>
 #include <mysql/components/services/psi_statement_service.h>
 
-#define REQUIRES_PSI_STATEMENT_SERVICE REQUIRES_SERVICE(psi_statement_v3)
+#define REQUIRES_PSI_STATEMENT_SERVICE REQUIRES_SERVICE(psi_statement_v4)
 #define REQUIRES_PSI_STATEMENT_SERVICE_PLACEHOLDER \
-  REQUIRES_SERVICE_PLACEHOLDER(psi_statement_v3)
+  REQUIRES_SERVICE_PLACEHOLDER(psi_statement_v4)
 
 extern REQUIRES_PSI_STATEMENT_SERVICE_PLACEHOLDER;
 
-#define PSI_STATEMENT_CALL(M) mysql_service_psi_statement_v3->M
+#define PSI_STATEMENT_CALL(M) mysql_service_psi_statement_v4->M
 
 #endif /* COMPONENTS_SERVICES_PSI_STATEMENT_H */

include/mysql/components/services/psi_statement_service.h

@@ -30,182 +30,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
   Version 1.
   Introduced in MySQL 8.0.3
   Deprecated in MySQL 8.0.14
-  Status: Deprecated, use version 2 instead.
-  Maintained for binary compatibility of components
-  built against headers from MySQL 8.0.3 -- 8.0.13
+  Obsoleted in MySQL 8.0.31
+  Status: Obsolete, use version 4 instead.
 */
 
-BEGIN_SERVICE_DEFINITION(psi_statement_v1)
-/** @sa register_statement_v1_t. */
-register_statement_v1_t register_statement;
-/** @sa get_thread_statement_locker_v1_t. */
-get_thread_statement_locker_v1_t get_thread_statement_locker;
-/** @sa refine_statement_v1_t. */
-refine_statement_v1_t refine_statement;
-/** @sa start_statement_v1_t. */
-start_statement_v1_t start_statement;
-/** @sa set_statement_text_v1_t. */
-set_statement_text_v1_t set_statement_text;
-/** @sa set_statement_lock_time_t. */
-set_statement_lock_time_t set_statement_lock_time;
-/** @sa set_statement_rows_sent_t. */
-set_statement_rows_sent_t set_statement_rows_sent;
-/** @sa set_statement_rows_examined_t. */
-set_statement_rows_examined_t set_statement_rows_examined;
-/** @sa inc_statement_created_tmp_disk_tables. */
-inc_statement_created_tmp_disk_tables_t inc_statement_created_tmp_disk_tables;
-/** @sa inc_statement_created_tmp_tables. */
-inc_statement_created_tmp_tables_t inc_statement_created_tmp_tables;
-/** @sa inc_statement_select_full_join. */
-inc_statement_select_full_join_t inc_statement_select_full_join;
-/** @sa inc_statement_select_full_range_join. */
-inc_statement_select_full_range_join_t inc_statement_select_full_range_join;
-/** @sa inc_statement_select_range. */
-inc_statement_select_range_t inc_statement_select_range;
-/** @sa inc_statement_select_range_check. */
-inc_statement_select_range_check_t inc_statement_select_range_check;
-/** @sa inc_statement_select_scan. */
-inc_statement_select_scan_t inc_statement_select_scan;
-/** @sa inc_statement_sort_merge_passes. */
-inc_statement_sort_merge_passes_t inc_statement_sort_merge_passes;
-/** @sa inc_statement_sort_range. */
-inc_statement_sort_range_t inc_statement_sort_range;
-/** @sa inc_statement_sort_rows. */
-inc_statement_sort_rows_t inc_statement_sort_rows;
-/** @sa inc_statement_sort_scan. */
-inc_statement_sort_scan_t inc_statement_sort_scan;
-/** @sa set_statement_no_index_used. */
-set_statement_no_index_used_t set_statement_no_index_used;
-/** @sa set_statement_no_good_index_used. */
-set_statement_no_good_index_used_t set_statement_no_good_index_used;
-/** @sa end_statement_v1_t. */
-end_statement_v1_t end_statement;
-
-/** @sa create_prepared_stmt_v1_t. */
-create_prepared_stmt_v1_t create_prepared_stmt;
-/** @sa destroy_prepared_stmt_v1_t. */
-destroy_prepared_stmt_v1_t destroy_prepared_stmt;
-/** @sa reprepare_prepared_stmt_v1_t. */
-reprepare_prepared_stmt_v1_t reprepare_prepared_stmt;
-/** @sa execute_prepared_stmt_v1_t. */
-execute_prepared_stmt_v1_t execute_prepared_stmt;
-/** @sa set_prepared_stmt_text_v1_t. */
-set_prepared_stmt_text_v1_t set_prepared_stmt_text;
-
-/** @sa digest_start_v1_t. */
-digest_start_v1_t digest_start;
-/** @sa digest_end_v1_t. */
-digest_end_v1_t digest_end;
-
-/** @sa get_sp_share_v1_t. */
-get_sp_share_v1_t get_sp_share;
-/** @sa release_sp_share_v1_t. */
-release_sp_share_v1_t release_sp_share;
-/** @sa start_sp_v1_t. */
-start_sp_v1_t start_sp;
-/** @sa start_sp_v1_t. */
-end_sp_v1_t end_sp;
-/** @sa drop_sp_v1_t. */
-drop_sp_v1_t drop_sp;
-END_SERVICE_DEFINITION(psi_statement_v1)
-
 /*
   Version 2.
   Introduced in MySQL 8.0.14
   Deprecated in MySQL 8.0.28
-  Status: Deprecated, use version 3 instead.
-  Maintained for binary compatibility of components
-  built against headers from MySQL 8.0.14 -- 8.0.27
+  Obsoleted in MySQL 8.0.31
+  Status: Obsolete, use version 4 instead.
 */
-BEGIN_SERVICE_DEFINITION(psi_statement_v2)
-/** @sa register_statement_v1_t. */
-register_statement_v1_t register_statement;
-/** @sa get_thread_statement_locker_v1_t. */
-get_thread_statement_locker_v1_t get_thread_statement_locker;
-/** @sa refine_statement_v1_t. */
-refine_statement_v1_t refine_statement;
-/** @sa start_statement_v1_t. */
-start_statement_v1_t start_statement;
-/** @sa set_statement_text_v1_t. */
-set_statement_text_v1_t set_statement_text;
-/** @sa set_statement_query_id_t. */
-set_statement_query_id_t set_statement_query_id;
-/** @sa set_statement_lock_time_t. */
-set_statement_lock_time_t set_statement_lock_time;
-/** @sa set_statement_rows_sent_t. */
-set_statement_rows_sent_t set_statement_rows_sent;
-/** @sa set_statement_rows_examined_t. */
-set_statement_rows_examined_t set_statement_rows_examined;
-/** @sa inc_statement_created_tmp_disk_tables. */
-inc_statement_created_tmp_disk_tables_t inc_statement_created_tmp_disk_tables;
-/** @sa inc_statement_created_tmp_tables. */
-inc_statement_created_tmp_tables_t inc_statement_created_tmp_tables;
-/** @sa inc_statement_select_full_join. */
-inc_statement_select_full_join_t inc_statement_select_full_join;
-/** @sa inc_statement_select_full_range_join. */
-inc_statement_select_full_range_join_t inc_statement_select_full_range_join;
-/** @sa inc_statement_select_range. */
-inc_statement_select_range_t inc_statement_select_range;
-/** @sa inc_statement_select_range_check. */
-inc_statement_select_range_check_t inc_statement_select_range_check;
-/** @sa inc_statement_select_scan. */
-inc_statement_select_scan_t inc_statement_select_scan;
-/** @sa inc_statement_sort_merge_passes. */
-inc_statement_sort_merge_passes_t inc_statement_sort_merge_passes;
-/** @sa inc_statement_sort_range. */
-inc_statement_sort_range_t inc_statement_sort_range;
-/** @sa inc_statement_sort_rows. */
-inc_statement_sort_rows_t inc_statement_sort_rows;
-/** @sa inc_statement_sort_scan. */
-inc_statement_sort_scan_t inc_statement_sort_scan;
-/** @sa set_statement_no_index_used. */
-set_statement_no_index_used_t set_statement_no_index_used;
-/** @sa set_statement_no_good_index_used. */
-set_statement_no_good_index_used_t set_statement_no_good_index_used;
-/** @sa end_statement_v1_t. */
-end_statement_v1_t end_statement;
-
-/** @sa create_prepared_stmt_v1_t. */
-create_prepared_stmt_v1_t create_prepared_stmt;
-/** @sa destroy_prepared_stmt_v1_t. */
-destroy_prepared_stmt_v1_t destroy_prepared_stmt;
-/** @sa reprepare_prepared_stmt_v1_t. */
-reprepare_prepared_stmt_v1_t reprepare_prepared_stmt;
-/** @sa execute_prepared_stmt_v1_t. */
-execute_prepared_stmt_v1_t execute_prepared_stmt;
-/** @sa set_prepared_stmt_text_v1_t. */
-set_prepared_stmt_text_v1_t set_prepared_stmt_text;
-
-/** @sa digest_start_v1_t. */
-digest_start_v1_t digest_start;
-/** @sa digest_end_v1_t. */
-digest_end_v1_t digest_end;
-
-/** @sa get_sp_share_v1_t. */
-get_sp_share_v1_t get_sp_share;
-/** @sa release_sp_share_v1_t. */
-release_sp_share_v1_t release_sp_share;
-/** @sa start_sp_v1_t. */
-start_sp_v1_t start_sp;
-/** @sa start_sp_v1_t. */
-end_sp_v1_t end_sp;
-/** @sa drop_sp_v1_t. */
-drop_sp_v1_t drop_sp;
-END_SERVICE_DEFINITION(psi_statement_v2)
 
 /*
   Version 3.
   Introduced in MySQL 8.0.28
+  Obsoleted in MySQL 8.0.31
+  Status: Obsolete, use version 4 instead.
+*/
+
+/*
+  Version 4.
+  Introduced in MySQL 8.0.31
   Status: active
-  Changes compared to version 2:
-  - added set_statement_secondary_engine
-  - added set_prepared_stmt_secondary_engine
+  Changes compared to version 3:
+  - get_thread_statement_locker_v4_t,
+    the state structure is bigger.
 */
-BEGIN_SERVICE_DEFINITION(psi_statement_v3)
+BEGIN_SERVICE_DEFINITION(psi_statement_v4)
 /** @sa register_statement_v1_t. */
 register_statement_v1_t register_statement;
 /** @sa get_thread_statement_locker_v1_t. */
-get_thread_statement_locker_v1_t get_thread_statement_locker;
+get_thread_statement_locker_v4_t get_thread_statement_locker;
 /** @sa refine_statement_v1_t. */
 refine_statement_v1_t refine_statement;
 /** @sa start_statement_v1_t. */
@@ -279,6 +135,6 @@ start_sp_v1_t start_sp;
 end_sp_v1_t end_sp;
 /** @sa drop_sp_v1_t. */
 drop_sp_v1_t drop_sp;
-END_SERVICE_DEFINITION(psi_statement_v3)
+END_SERVICE_DEFINITION(psi_statement_v4)
 
 #endif /* COMPONENTS_SERVICES_PSI_STATEMENT_SERVICE_H */

include/mysql/psi/psi_abi_statement_v1.h.pp

@@ -46,7 +46,7 @@
   const char *m_documentation;
 };
 typedef struct PSI_statement_info_v1 PSI_statement_info_v1;
-struct PSI_statement_locker_state_v1 {
+struct PSI_statement_locker_state_v4 {
   bool m_discarded;
   bool m_in_prepare;
   unsigned char m_no_index_used;
@@ -56,6 +56,10 @@
   struct PSI_thread *m_thread;
   unsigned long long m_timer_start;
   unsigned long long m_cpu_time_start;
+  size_t m_controlled_local_size_start;
+  size_t m_controlled_stmt_size_start;
+  size_t m_total_local_size_start;
+  size_t m_total_stmt_size_start;
   void *m_statement;
   unsigned long long m_lock_time;
   unsigned long long m_rows_sent;
@@ -81,7 +85,7 @@
   PSI_sp_share *m_parent_sp_share;
   PSI_prepared_stmt *m_parent_prepared_stmt;
 };
-typedef struct PSI_statement_locker_state_v1 PSI_statement_locker_state_v1;
+typedef struct PSI_statement_locker_state_v4 PSI_statement_locker_state_v4;
 struct PSI_sp_locker_state_v1 {
   unsigned int m_flags;
   struct PSI_thread *m_thread;
@@ -93,8 +97,8 @@
 typedef void (*register_statement_v1_t)(const char *category,
                                         struct PSI_statement_info_v1 *info,
                                         int count);
-typedef struct PSI_statement_locker *(*get_thread_statement_locker_v1_t)(
-    struct PSI_statement_locker_state_v1 *state, PSI_statement_key key,
+typedef struct PSI_statement_locker *(*get_thread_statement_locker_v4_t)(
+    struct PSI_statement_locker_state_v4 *state, PSI_statement_key key,
     const void *charset, PSI_sp_share *sp_share);
 typedef struct PSI_statement_locker *(*refine_statement_v1_t)(
     struct PSI_statement_locker *locker, PSI_statement_key key);
@@ -173,7 +177,7 @@
                              const char *object_name,
                              unsigned int object_name_length);
 typedef struct PSI_statement_info_v1 PSI_statement_info;
-typedef struct PSI_statement_locker_state_v1 PSI_statement_locker_state;
+typedef struct PSI_statement_locker_state_v4 PSI_statement_locker_state;
 typedef struct PSI_sp_locker_state_v1 PSI_sp_locker_state;
 struct PSI_statement_bootstrap {
   void *(*get_interface)(int version);
@@ -186,8 +190,11 @@
   void *this_interface_is_obsolete;
 };
 struct PSI_statement_service_v3 {
+  void *this_interface_is_obsolete;
+};
+struct PSI_statement_service_v4 {
   register_statement_v1_t register_statement;
-  get_thread_statement_locker_v1_t get_thread_statement_locker;
+  get_thread_statement_locker_v4_t get_thread_statement_locker;
   refine_statement_v1_t refine_statement;
   start_statement_v1_t start_statement;
   set_statement_text_v1_t set_statement_text;
@@ -224,5 +231,5 @@
   end_sp_v1_t end_sp;
   drop_sp_v1_t drop_sp;
 };
-typedef struct PSI_statement_service_v3 PSI_statement_service_t;
+typedef struct PSI_statement_service_v4 PSI_statement_service_t;
 extern PSI_statement_service_t *psi_statement_service;