This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 0ccee42ff83 update table column for `sys` database. (#30780)
0ccee42ff83 is described below

commit 0ccee42ff8353468cbd22c1b13aa2e39db41b9ba
Author: Zonglei Dong <[email protected]>
AuthorDate: Sat Apr 6 19:19:36 2024 +0800

    update table column for `sys` database. (#30780)
    
    * update table column for `sys` database.
    
    * fix unit test
    
    * fix unit test
---
 .../database/schema/SystemSchemaManagerTest.java   |  2 +-
 .../resources/schema/mysql/sys/host_summary.yaml   | 27 +++++--
 .../schema/mysql/sys/host_summary_by_file_io.yaml  |  8 +-
 .../mysql/sys/host_summary_by_file_io_type.yaml    | 14 +++-
 .../schema/mysql/sys/host_summary_by_stages.yaml   | 14 +++-
 .../sys/host_summary_by_statement_latency.yaml     | 27 ++++++-
 .../mysql/sys/host_summary_by_statement_type.yaml  | 38 +++++++---
 .../mysql/sys/innodb_buffer_stats_by_schema.yaml   | 18 +++--
 .../mysql/sys/innodb_buffer_stats_by_table.yaml    | 19 +++--
 .../schema/mysql/sys/innodb_lock_waits.yaml        | 87 +++++++++++++++++++---
 .../schema/mysql/sys/io_by_thread_by_latency.yaml  | 21 ++++--
 .../mysql/sys/io_global_by_file_by_bytes.yaml      | 24 ++++--
 .../mysql/sys/io_global_by_file_by_latency.yaml    | 26 +++++--
 .../mysql/sys/io_global_by_wait_by_bytes.yaml      | 38 +++++++---
 .../mysql/sys/io_global_by_wait_by_latency.yaml    | 41 ++++++----
 .../resources/schema/mysql/sys/latest_file_io.yaml | 10 ++-
 .../mysql/sys/memory_by_host_by_current_bytes.yaml | 17 +++--
 .../sys/memory_by_thread_by_current_bytes.yaml     | 18 +++--
 .../mysql/sys/memory_by_user_by_current_bytes.yaml | 15 +++-
 .../mysql/sys/memory_global_by_current_bytes.yaml  | 20 +++--
 .../schema/mysql/sys/memory_global_total.yaml      |  4 +-
 .../main/resources/schema/mysql/sys/metrics.yaml   |  5 ++
 .../resources/schema/mysql/sys/processlist.yaml    | 79 ++++++++++++++++----
 .../mysql/sys/ps_check_lost_instrumentation.yaml   |  3 +
 .../mysql/sys/schema_auto_increment_columns.yaml   | 25 +++++--
 .../schema/mysql/sys/schema_index_statistics.yaml  | 28 +++++--
 .../schema/mysql/sys/schema_object_overview.yaml   | 10 ++-
 .../schema/mysql/sys/schema_redundant_indexes.yaml | 15 +++-
 .../schema/mysql/sys/schema_table_lock_waits.yaml  | 33 ++++++--
 .../schema/mysql/sys/schema_table_statistics.yaml  | 48 ++++++++----
 .../sys/schema_table_statistics_with_buffer.yaml   | 64 +++++++++++-----
 .../sys/schema_tables_with_full_table_scans.yaml   |  9 ++-
 .../schema/mysql/sys/schema_unused_indexes.yaml    |  4 +
 .../main/resources/schema/mysql/sys/session.yaml   | 79 ++++++++++++++++----
 .../schema/mysql/sys/session_ssl_status.yaml       |  7 +-
 .../schema/mysql/sys/statement_analysis.yaml       | 79 ++++++++++++++++----
 .../sys/statements_with_errors_or_warnings.yaml    | 17 ++++-
 .../sys/statements_with_full_table_scans.yaml      | 31 ++++++--
 ...tatements_with_runtimes_in_95th_percentile.yaml | 33 ++++++--
 .../schema/mysql/sys/statements_with_sorting.yaml  | 26 +++++--
 .../mysql/sys/statements_with_temp_tables.yaml     | 20 ++++-
 .../resources/schema/mysql/sys/sys-config.yaml     | 50 -------------
 .../resources/schema/mysql/sys/sys_config.yaml     | 12 +++
 .../resources/schema/mysql/sys/user_summary.yaml   | 25 +++++--
 .../schema/mysql/sys/user_summary_by_file_io.yaml  |  6 +-
 .../mysql/sys/user_summary_by_file_io_type.yaml    | 12 ++-
 .../schema/mysql/sys/user_summary_by_stages.yaml   | 12 ++-
 .../sys/user_summary_by_statement_latency.yaml     | 25 ++++++-
 .../mysql/sys/user_summary_by_statement_type.yaml  | 36 +++++++--
 .../main/resources/schema/mysql/sys/version.yaml   |  3 +
 .../sys/wait_classes_global_by_avg_latency.yaml    | 15 +++-
 .../mysql/sys/wait_classes_global_by_latency.yaml  | 15 +++-
 .../schema/mysql/sys/waits_by_host_by_latency.yaml | 17 +++--
 .../schema/mysql/sys/waits_by_user_by_latency.yaml | 15 +++-
 .../schema/mysql/sys/waits_global_by_latency.yaml  | 14 +++-
 ...mysql_sys_host_summary_by_statement_latency.xml |  1 +
 ...ct_mysql_sys_host_summary_by_statement_type.xml |  1 +
 .../mysql/select_mysql_sys_innodb_lock_waits.xml   |  4 +
 .../mysql/select_mysql_sys_processlist.xml         |  2 +
 .../mysql/select_mysql_sys_session.xml             |  2 +
 .../mysql/select_mysql_sys_statement_analysis.xml  |  3 +
 ...mysql_sys_user_summary_by_statement_latency.xml |  1 +
 ...ct_mysql_sys_user_summary_by_statement_type.xml |  1 +
 63 files changed, 1020 insertions(+), 355 deletions(-)

diff --git 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
index dd306685e37..0862c03e51e 100644
--- 
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
+++ 
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/SystemSchemaManagerTest.java
@@ -38,7 +38,7 @@ class SystemSchemaManagerTest {
         Collection<String> actualPerformanceSchema = 
SystemSchemaManager.getTables("MySQL", "performance_schema");
         assertThat(actualPerformanceSchema.size(), is(87));
         Collection<String> actualSysSchema = 
SystemSchemaManager.getTables("MySQL", "sys");
-        assertThat(actualSysSchema.size(), is(54));
+        assertThat(actualSysSchema.size(), is(53));
         Collection<String> actualShardingSphereSchema = 
SystemSchemaManager.getTables("MySQL", "shardingsphere");
         assertThat(actualShardingSphereSchema.size(), is(2));
         Collection<String> actualPgInformationSchema = 
SystemSchemaManager.getTables("PostgreSQL", "information_schema");
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary.yaml
index 485280407c5..3a57ecd8614 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary.yaml
@@ -16,12 +16,14 @@
 #
 
 name: host_summary
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,22 +32,25 @@ columns:
     dataType: 3
     generated: false
     name: statements
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   statement_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: statement_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   statement_avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: statement_avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -54,6 +59,7 @@ columns:
     dataType: 3
     generated: false
     name: table_scans
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,14 +68,16 @@ columns:
     dataType: 3
     generated: false
     name: file_ios
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   file_io_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: file_io_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +86,7 @@ columns:
     dataType: 3
     generated: false
     name: current_connections
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,30 +95,34 @@ columns:
     dataType: 3
     generated: false
     name: total_connections
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   unique_users:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: unique_users
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   current_memory:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_memory
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_memory_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_memory_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
index eeacdbc09c3..ee65a98fec6 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io.yaml
@@ -16,12 +16,14 @@
 #
 
 name: host_summary_by_file_io
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,14 +32,16 @@ columns:
     dataType: 3
     generated: false
     name: ios
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
index 6b0bbea2404..651abea3918 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_file_io_type.yaml
@@ -16,12 +16,14 @@
 #
 
 name: host_summary_by_file_io_type
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,34 @@ columns:
     dataType: 12
     generated: false
     name: event_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
index db9a67ab943..7bed73027ae 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_stages.yaml
@@ -16,12 +16,14 @@
 #
 
 name: host_summary_by_stages
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,34 @@ columns:
     dataType: 12
     generated: false
     name: event_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
index 5cf582c2295..2d578528cda 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: host_summary_by_statement_latency
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,43 @@ columns:
     dataType: 3
     generated: false
     name: total
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,6 +77,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_sent
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -70,6 +86,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_examined
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +95,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_affected
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,6 +104,7 @@ columns:
     dataType: 3
     generated: false
     name: full_scans
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
index 47a17c865e8..2a65936c8cf 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/host_summary_by_statement_type.yaml
@@ -16,12 +16,14 @@
 #
 
 name: host_summary_by_statement_type
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,70 +32,88 @@ columns:
     dataType: 12
     generated: false
     name: statement
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_affected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_affected
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   full_scans:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: full_scans
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
index 8171f5f12ee..de5e088aeab 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_schema.yaml
@@ -16,52 +16,59 @@
 #
 
 name: innodb_buffer_stats_by_schema
+type: TABLE
 columns:
   object_schema:
     caseSensitive: false
     dataType: -1
     generated: false
     name: object_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   data:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: data
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   pages:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: pages
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   pages_hashed:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: pages_hashed
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   pages_old:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: pages_old
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -70,6 +77,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_cached
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
index 37162145444..cd91540c535 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_buffer_stats_by_table.yaml
@@ -16,12 +16,14 @@
 #
 
 name: innodb_buffer_stats_by_table
+type: TABLE
 columns:
   object_schema:
     caseSensitive: false
     dataType: -1
     generated: false
     name: object_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,46 +32,52 @@ columns:
     dataType: -1
     generated: false
     name: object_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   data:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: data
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   pages:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: pages
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   pages_hashed:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: pages_hashed
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   pages_old:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: pages_old
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +86,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_cached
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
index 7b599db10d2..11d56923e83 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/innodb_lock_waits.yaml
@@ -16,12 +16,14 @@
 #
 
 name: innodb_lock_waits
+type: TABLE
 columns:
   wait_started:
     caseSensitive: false
     dataType: 93
     generated: false
     name: wait_started
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,22 +32,61 @@ columns:
     dataType: 92
     generated: false
     name: wait_age
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   wait_age_secs:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: wait_age_secs
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   locked_table:
     caseSensitive: false
-    dataType: 12
+    dataType: -1
     generated: false
     name: locked_table
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  locked_table_schema:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: locked_table_schema
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  locked_table_name:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: locked_table_name
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  locked_table_partition:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: locked_table_partition
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  locked_table_subpartition:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: locked_table_subpartition
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -54,6 +95,7 @@ columns:
     dataType: 12
     generated: false
     name: locked_index
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,22 +104,25 @@ columns:
     dataType: 12
     generated: false
     name: locked_type
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   waiting_trx_id:
     caseSensitive: false
-    dataType: 12
+    dataType: -5
     generated: false
     name: waiting_trx_id
+    nullable: false
     primaryKey: false
-    unsigned: false
+    unsigned: true
     visible: true
   waiting_trx_started:
     caseSensitive: false
     dataType: 93
     generated: false
     name: waiting_trx_started
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,30 +131,34 @@ columns:
     dataType: 92
     generated: false
     name: waiting_trx_age
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   waiting_trx_rows_locked:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_trx_rows_locked
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   waiting_trx_rows_modified:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_trx_rows_modified
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   waiting_pid:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_pid
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -118,6 +167,7 @@ columns:
     dataType: -1
     generated: false
     name: waiting_query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -126,6 +176,7 @@ columns:
     dataType: 12
     generated: false
     name: waiting_lock_id
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -134,22 +185,25 @@ columns:
     dataType: 12
     generated: false
     name: waiting_lock_mode
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   blocking_trx_id:
     caseSensitive: false
-    dataType: 12
+    dataType: -5
     generated: false
     name: blocking_trx_id
+    nullable: false
     primaryKey: false
-    unsigned: false
+    unsigned: true
     visible: true
   blocking_pid:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: blocking_pid
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -158,6 +212,7 @@ columns:
     dataType: -1
     generated: false
     name: blocking_query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -166,6 +221,7 @@ columns:
     dataType: 12
     generated: false
     name: blocking_lock_id
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -174,6 +230,7 @@ columns:
     dataType: 12
     generated: false
     name: blocking_lock_mode
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -182,6 +239,7 @@ columns:
     dataType: 93
     generated: false
     name: blocking_trx_started
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -190,22 +248,25 @@ columns:
     dataType: 92
     generated: false
     name: blocking_trx_age
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   blocking_trx_rows_locked:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: blocking_trx_rows_locked
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   blocking_trx_rows_modified:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: blocking_trx_rows_modified
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -214,6 +275,7 @@ columns:
     dataType: 12
     generated: false
     name: sql_kill_blocking_query
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -222,6 +284,7 @@ columns:
     dataType: 12
     generated: false
     name: sql_kill_blocking_connection
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
index d36219d26cd..b095ae28dcd 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_by_thread_by_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: io_by_thread_by_latency
+type: TABLE
 columns:
   user:
     caseSensitive: false
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,54 +32,61 @@ columns:
     dataType: 3
     generated: false
     name: total
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   min_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: min_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   thread_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: thread_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   processlist_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: processlist_id
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
index bac2bda9e01..173339d1afc 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_bytes.yaml
@@ -16,68 +16,77 @@
 #
 
 name: io_global_by_file_by_bytes
+type: TABLE
 columns:
   file:
     caseSensitive: false
     dataType: 12
     generated: false
     name: file
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_read:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_read
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_write:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_write
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_written:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_written
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_write:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_write
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,6 +95,7 @@ columns:
     dataType: 3
     generated: false
     name: write_pct
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
index 57cc99891f1..a3f8cbd66c9 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_file_by_latency.yaml
@@ -16,76 +16,86 @@
 #
 
 name: io_global_by_file_by_latency
+type: TABLE
 columns:
   file:
     caseSensitive: false
     dataType: 12
     generated: false
     name: file
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_read:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_read
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   read_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: read_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_write:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_write
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   write_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: write_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_misc:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_misc
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   misc_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: misc_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
index 20c35f51289..29fa96486a7 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_bytes.yaml
@@ -16,108 +16,122 @@
 #
 
 name: io_global_by_wait_by_bytes
+type: TABLE
 columns:
   event_name:
     caseSensitive: false
     dataType: 12
     generated: false
     name: event_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   min_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: min_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_read:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_read
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_write:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_write
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_written:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_written
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_written:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_written
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_requested:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_requested
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
index 3118849559f..5cb1edebcd6 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/io_global_by_wait_by_latency.yaml
@@ -16,116 +16,131 @@
 #
 
 name: io_global_by_wait_by_latency
+type: TABLE
 columns:
   event_name:
     caseSensitive: false
     dataType: 12
     generated: false
     name: event_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   read_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: read_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   write_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: write_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   misc_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: misc_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_read:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_read
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count_write:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count_write
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_written:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_written
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_written:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_written
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/latest_file_io.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/latest_file_io.yaml
index fd7d487677a..9aafc9941bb 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/latest_file_io.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/latest_file_io.yaml
@@ -16,12 +16,14 @@
 #
 
 name: latest_file_io
+type: TABLE
 columns:
   thread:
     caseSensitive: false
     dataType: 12
     generated: false
     name: thread
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,14 +32,16 @@ columns:
     dataType: 12
     generated: false
     name: file
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -46,14 +50,16 @@ columns:
     dataType: 12
     generated: false
     name: operation
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   requested:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: requested
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
index 30d6301076d..f0bafe3ea6a 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_host_by_current_bytes.yaml
@@ -16,12 +16,14 @@
 #
 
 name: memory_by_host_by_current_bytes
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 3
     generated: false
     name: current_count_used
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_avg_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_avg_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_max_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_max_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
index 2ed87e63ffb..2912d859683 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_thread_by_current_bytes.yaml
@@ -16,12 +16,14 @@
 #
 
 name: memory_by_thread_by_current_bytes
+type: TABLE
 columns:
   thread_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: thread_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,38 +41,43 @@ columns:
     dataType: 3
     generated: false
     name: current_count_used
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_avg_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_avg_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_max_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_max_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
index 2fcf13235fe..3e0c107f55c 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_by_user_by_current_bytes.yaml
@@ -16,12 +16,14 @@
 #
 
 name: memory_by_user_by_current_bytes
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 3
     generated: false
     name: current_count_used
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_avg_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_avg_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_max_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_max_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
index 7dafc4f586c..cbb75ac2755 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_by_current_bytes.yaml
@@ -16,60 +16,68 @@
 #
 
 name: memory_global_by_current_bytes
+type: TABLE
 columns:
   event_name:
     caseSensitive: false
     dataType: 12
     generated: false
     name: event_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   current_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: current_count
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   current_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_avg_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_avg_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   high_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: high_count
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   high_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: high_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   high_avg_alloc:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: high_avg_alloc
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_total.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_total.yaml
index 6911751430d..262bc7e244e 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_total.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/memory_global_total.yaml
@@ -16,12 +16,14 @@
 #
 
 name: memory_global_total
+type: TABLE
 columns:
   total_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/metrics.yaml 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/metrics.yaml
index 10d4639062c..ca2b3a0a161 100644
--- a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/metrics.yaml
+++ b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/metrics.yaml
@@ -16,12 +16,14 @@
 #
 
 name: metrics
+type: TABLE
 columns:
   variable_name:
     caseSensitive: false
     dataType: 12
     generated: false
     name: Variable_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: -1
     generated: false
     name: Variable_value
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,6 +41,7 @@ columns:
     dataType: 12
     generated: false
     name: Type
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -46,6 +50,7 @@ columns:
     dataType: 12
     generated: false
     name: Enabled
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/processlist.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/processlist.yaml
index 589a63995b2..41cf922bbde 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/processlist.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/processlist.yaml
@@ -16,20 +16,23 @@
 #
 
 name: processlist
+type: TABLE
 columns:
   thd_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: thd_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   conn_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: conn_id
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -38,6 +41,7 @@ columns:
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -46,6 +50,7 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -54,6 +59,7 @@ columns:
     dataType: 12
     generated: false
     name: command
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,14 +68,16 @@ columns:
     dataType: 12
     generated: false
     name: state
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   time:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: time
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,14 +86,25 @@ columns:
     dataType: -1
     generated: false
     name: current_statement
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  execution_engine:
+    caseSensitive: false
+    dataType: 1
+    generated: false
+    name: execution_engine
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   statement_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: statement_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -94,54 +113,70 @@ columns:
     dataType: 3
     generated: false
     name: progress
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   rows_affected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_affected
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   tmp_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: tmp_tables
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   tmp_disk_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: tmp_disk_tables
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -150,6 +185,7 @@ columns:
     dataType: 12
     generated: false
     name: full_scan
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -158,22 +194,25 @@ columns:
     dataType: -1
     generated: false
     name: last_statement
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   last_statement_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: last_statement_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_memory:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_memory
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -182,14 +221,16 @@ columns:
     dataType: 12
     generated: false
     name: last_wait
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   last_wait_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: last_wait_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -198,30 +239,34 @@ columns:
     dataType: 12
     generated: false
     name: source
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   trx_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: trx_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   trx_state:
     caseSensitive: false
-    dataType: 12
+    dataType: 1
     generated: false
     name: trx_state
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   trx_autocommit:
     caseSensitive: false
-    dataType: 12
+    dataType: 1
     generated: false
     name: trx_autocommit
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -230,6 +275,7 @@ columns:
     dataType: 12
     generated: false
     name: pid
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -238,6 +284,7 @@ columns:
     dataType: 12
     generated: false
     name: program_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
index a556b9e8b89..ad36bc64191 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/ps_check_lost_instrumentation.yaml
@@ -16,12 +16,14 @@
 #
 
 name: ps_check_lost_instrumentation
+type: TABLE
 columns:
   variable_name:
     caseSensitive: false
     dataType: 12
     generated: false
     name: variable_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: variable_value
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
index 6b85ac1d726..b3a104455d3 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_auto_increment_columns.yaml
@@ -16,20 +16,23 @@
 #
 
 name: schema_auto_increment_columns
+type: TABLE
 columns:
   table_schema:
-    caseSensitive: false
+    caseSensitive: true
     dataType: 12
     generated: false
     name: table_schema
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   table_name:
-    caseSensitive: false
+    caseSensitive: true
     dataType: 12
     generated: false
     name: table_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,22 +41,25 @@ columns:
     dataType: 12
     generated: false
     name: column_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   data_type:
-    caseSensitive: false
-    dataType: 12
+    caseSensitive: true
+    dataType: -1
     generated: false
     name: data_type
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   column_type:
-    caseSensitive: false
+    caseSensitive: true
     dataType: -1
     generated: false
     name: column_type
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,6 +68,7 @@ columns:
     dataType: 4
     generated: false
     name: is_signed
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -70,22 +77,25 @@ columns:
     dataType: 4
     generated: false
     name: is_unsigned
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   max_value:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: max_value
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   auto_increment:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: auto_increment
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -94,6 +104,7 @@ columns:
     dataType: 3
     generated: false
     name: auto_increment_ratio
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
index f9f3f5dcddc..31e71a156f7 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_index_statistics.yaml
@@ -16,12 +16,14 @@
 #
 
 name: schema_index_statistics
+type: TABLE
 columns:
   table_schema:
     caseSensitive: false
     dataType: 12
     generated: false
     name: table_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: table_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,70 +41,79 @@ columns:
     dataType: 12
     generated: false
     name: index_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_selected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_selected
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   select_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: select_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_inserted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_inserted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   insert_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: insert_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_updated:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_updated
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   update_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: update_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_deleted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_deleted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   delete_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: delete_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
index 3d2682151ae..81371ccaf57 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_object_overview.yaml
@@ -16,28 +16,32 @@
 #
 
 name: schema_object_overview
+type: TABLE
 columns:
   db:
-    caseSensitive: false
+    caseSensitive: true
     dataType: 12
     generated: false
     name: db
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   object_type:
-    caseSensitive: false
+    caseSensitive: true
     dataType: 12
     generated: false
     name: object_type
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: count
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
index 1b128543453..8797550261f 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_redundant_indexes.yaml
@@ -16,20 +16,23 @@
 #
 
 name: schema_redundant_indexes
+type: TABLE
 columns:
   table_schema:
-    caseSensitive: false
+    caseSensitive: true
     dataType: 12
     generated: false
     name: table_schema
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   table_name:
-    caseSensitive: false
+    caseSensitive: true
     dataType: 12
     generated: false
     name: table_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,6 +41,7 @@ columns:
     dataType: 12
     generated: false
     name: redundant_index_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -46,6 +50,7 @@ columns:
     dataType: -1
     generated: false
     name: redundant_index_columns
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -54,6 +59,7 @@ columns:
     dataType: 4
     generated: false
     name: redundant_index_non_unique
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,6 +68,7 @@ columns:
     dataType: 12
     generated: false
     name: dominant_index_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -70,6 +77,7 @@ columns:
     dataType: -1
     generated: false
     name: dominant_index_columns
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +86,7 @@ columns:
     dataType: 4
     generated: false
     name: dominant_index_non_unique
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,6 +95,7 @@ columns:
     dataType: 4
     generated: false
     name: subpart_exists
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -94,6 +104,7 @@ columns:
     dataType: 12
     generated: false
     name: sql_drop_index
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
index cec4bec310d..94dfd94d89f 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_lock_waits.yaml
@@ -16,12 +16,14 @@
 #
 
 name: schema_table_lock_waits
+type: TABLE
 columns:
   object_schema:
     caseSensitive: false
     dataType: 12
     generated: false
     name: object_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,22 +32,25 @@ columns:
     dataType: 12
     generated: false
     name: object_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   waiting_thread_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_thread_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   waiting_pid:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_pid
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -54,6 +59,7 @@ columns:
     dataType: -1
     generated: false
     name: waiting_account
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,6 +68,7 @@ columns:
     dataType: 12
     generated: false
     name: waiting_lock_type
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -70,6 +77,7 @@ columns:
     dataType: 12
     generated: false
     name: waiting_lock_duration
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,46 +86,52 @@ columns:
     dataType: -1
     generated: false
     name: waiting_query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   waiting_query_secs:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_query_secs
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   waiting_query_rows_affected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_query_rows_affected
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   waiting_query_rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: waiting_query_rows_examined
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   blocking_thread_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: blocking_thread_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   blocking_pid:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: blocking_pid
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -126,6 +140,7 @@ columns:
     dataType: -1
     generated: false
     name: blocking_account
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -134,6 +149,7 @@ columns:
     dataType: 12
     generated: false
     name: blocking_lock_type
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -142,6 +158,7 @@ columns:
     dataType: 12
     generated: false
     name: blocking_lock_duration
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -150,6 +167,7 @@ columns:
     dataType: 12
     generated: false
     name: sql_kill_blocking_query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -158,6 +176,7 @@ columns:
     dataType: 12
     generated: false
     name: sql_kill_blocking_connection
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
index 0112f9ad913..ac502de9f68 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics.yaml
@@ -16,12 +16,14 @@
 #
 
 name: schema_table_statistics
+type: TABLE
 columns:
   table_schema:
     caseSensitive: false
     dataType: 12
     generated: false
     name: table_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,78 +32,88 @@ columns:
     dataType: 12
     generated: false
     name: table_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_fetched:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_fetched
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   fetch_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: fetch_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_inserted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_inserted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   insert_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: insert_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_updated:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_updated
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   update_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: update_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_deleted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_deleted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   delete_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: delete_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -110,22 +122,25 @@ columns:
     dataType: 3
     generated: false
     name: io_read_requests
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_read_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_read_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -134,22 +149,25 @@ columns:
     dataType: 3
     generated: false
     name: io_write_requests
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_write:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_write
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_write_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_write_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -158,14 +176,16 @@ columns:
     dataType: 3
     generated: false
     name: io_misc_requests
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_misc_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_misc_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
index 4ceb192af46..842f7b2ca38 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_table_statistics_with_buffer.yaml
@@ -16,12 +16,14 @@
 #
 
 name: schema_table_statistics_with_buffer
+type: TABLE
 columns:
   table_schema:
     caseSensitive: false
     dataType: 12
     generated: false
     name: table_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,70 +32,79 @@ columns:
     dataType: 12
     generated: false
     name: table_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_fetched:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_fetched
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   fetch_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: fetch_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_inserted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_inserted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   insert_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: insert_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_updated:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_updated
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   update_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: update_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_deleted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_deleted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   delete_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: delete_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -102,22 +113,25 @@ columns:
     dataType: 3
     generated: false
     name: io_read_requests
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_read:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_read
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_read_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_read_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -126,22 +140,25 @@ columns:
     dataType: 3
     generated: false
     name: io_write_requests
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_write:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_write
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_write_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_write_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -150,62 +167,70 @@ columns:
     dataType: 3
     generated: false
     name: io_misc_requests
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_misc_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_misc_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   innodb_buffer_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: innodb_buffer_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   innodb_buffer_data:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: innodb_buffer_data
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   innodb_buffer_free:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: innodb_buffer_free
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   innodb_buffer_pages:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: innodb_buffer_pages
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   innodb_buffer_pages_hashed:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: innodb_buffer_pages_hashed
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   innodb_buffer_pages_old:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: innodb_buffer_pages_old
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -214,6 +239,7 @@ columns:
     dataType: 3
     generated: false
     name: innodb_buffer_rows_cached
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
index 7af7e419af3..44b21082696 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_tables_with_full_table_scans.yaml
@@ -16,12 +16,14 @@
 #
 
 name: schema_tables_with_full_table_scans
+type: TABLE
 columns:
   object_schema:
     caseSensitive: false
     dataType: 12
     generated: false
     name: object_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,22 +32,25 @@ columns:
     dataType: 12
     generated: false
     name: object_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_full_scanned:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_full_scanned
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
index 3275def3ec8..a55fad670cd 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/schema_unused_indexes.yaml
@@ -16,12 +16,14 @@
 #
 
 name: schema_unused_indexes
+type: TABLE
 columns:
   object_schema:
     caseSensitive: false
     dataType: 12
     generated: false
     name: object_schema
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: object_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,6 +41,7 @@ columns:
     dataType: 12
     generated: false
     name: index_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session.yaml 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session.yaml
index 84556e362c7..1e2304341b9 100644
--- a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session.yaml
+++ b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session.yaml
@@ -16,20 +16,23 @@
 #
 
 name: session
+type: TABLE
 columns:
   thd_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: thd_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   conn_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: conn_id
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -38,6 +41,7 @@ columns:
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -46,6 +50,7 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -54,6 +59,7 @@ columns:
     dataType: 12
     generated: false
     name: command
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,14 +68,16 @@ columns:
     dataType: 12
     generated: false
     name: state
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   time:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: time
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,14 +86,25 @@ columns:
     dataType: -1
     generated: false
     name: current_statement
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  execution_engine:
+    caseSensitive: false
+    dataType: 1
+    generated: false
+    name: execution_engine
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   statement_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: statement_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -94,54 +113,70 @@ columns:
     dataType: 3
     generated: false
     name: progress
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   rows_affected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_affected
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   tmp_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: tmp_tables
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
   tmp_disk_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: tmp_disk_tables
+    nullable: true
     primaryKey: false
     unsigned: true
     visible: true
@@ -150,6 +185,7 @@ columns:
     dataType: 12
     generated: false
     name: full_scan
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -158,22 +194,25 @@ columns:
     dataType: -1
     generated: false
     name: last_statement
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   last_statement_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: last_statement_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   current_memory:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_memory
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -182,14 +221,16 @@ columns:
     dataType: 12
     generated: false
     name: last_wait
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   last_wait_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: last_wait_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -198,30 +239,34 @@ columns:
     dataType: 12
     generated: false
     name: source
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   trx_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: trx_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   trx_state:
     caseSensitive: false
-    dataType: 12
+    dataType: 1
     generated: false
     name: trx_state
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   trx_autocommit:
     caseSensitive: false
-    dataType: 12
+    dataType: 1
     generated: false
     name: trx_autocommit
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -230,6 +275,7 @@ columns:
     dataType: 12
     generated: false
     name: pid
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -238,6 +284,7 @@ columns:
     dataType: 12
     generated: false
     name: program_name
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
index 456fecff674..da710aeb7fe 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/session_ssl_status.yaml
@@ -16,12 +16,14 @@
 #
 
 name: session_ssl_status
+type: TABLE
 columns:
   thread_id:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: thread_id
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: ssl_version
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,6 +41,7 @@ columns:
     dataType: 12
     generated: false
     name: ssl_cipher
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -46,6 +50,7 @@ columns:
     dataType: 12
     generated: false
     name: ssl_sessions_reused
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statement_analysis.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statement_analysis.yaml
index 75fee706abe..72ae67152bd 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statement_analysis.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statement_analysis.yaml
@@ -16,12 +16,14 @@
 #
 
 name: statement_analysis
+type: TABLE
 columns:
   query:
     caseSensitive: false
     dataType: -1
     generated: false
     name: query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,70 +41,88 @@ columns:
     dataType: 12
     generated: false
     name: full_scan
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   exec_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: exec_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   err_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: err_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   warn_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: warn_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -110,14 +131,16 @@ columns:
     dataType: 3
     generated: false
     name: rows_sent_avg
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -126,14 +149,16 @@ columns:
     dataType: 3
     generated: false
     name: rows_examined_avg
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   rows_affected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_affected
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -142,46 +167,70 @@ columns:
     dataType: 3
     generated: false
     name: rows_affected_avg
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   tmp_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: tmp_tables
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   tmp_disk_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: tmp_disk_tables
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_sorted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sorted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   sort_merge_passes:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: sort_merge_passes
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
+  max_controlled_memory:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: max_controlled_memory
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  max_total_memory:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: max_total_memory
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
   digest:
     caseSensitive: false
     dataType: 12
     generated: false
     name: digest
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -190,6 +239,7 @@ columns:
     dataType: 93
     generated: false
     name: first_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -198,6 +248,7 @@ columns:
     dataType: 93
     generated: false
     name: last_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
index 342a852f5da..62386400eba 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_errors_or_warnings.yaml
@@ -16,12 +16,14 @@
 #
 
 name: statements_with_errors_or_warnings
+type: TABLE
 columns:
   query:
     caseSensitive: false
     dataType: -1
     generated: false
     name: query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,22 +32,25 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   exec_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: exec_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   errors:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: errors
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -54,14 +59,16 @@ columns:
     dataType: 3
     generated: false
     name: error_pct
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   warnings:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: warnings
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -70,6 +77,7 @@ columns:
     dataType: 3
     generated: false
     name: warning_pct
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +86,7 @@ columns:
     dataType: 93
     generated: false
     name: first_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,6 +95,7 @@ columns:
     dataType: 93
     generated: false
     name: last_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -94,6 +104,7 @@ columns:
     dataType: 12
     generated: false
     name: digest
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
index 692dc08a8d3..3c73708344f 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_full_table_scans.yaml
@@ -16,12 +16,14 @@
 #
 
 name: statements_with_full_table_scans
+type: TABLE
 columns:
   query:
     caseSensitive: false
     dataType: -1
     generated: false
     name: query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   exec_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: exec_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   no_index_used_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: no_index_used_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   no_good_index_used_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: no_good_index_used_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -70,22 +77,25 @@ columns:
     dataType: 3
     generated: false
     name: no_index_used_pct
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -94,22 +104,25 @@ columns:
     dataType: 3
     generated: false
     name: rows_sent_avg
+    nullable: true
     primaryKey: false
-    unsigned: true
+    unsigned: false
     visible: true
   rows_examined_avg:
     caseSensitive: false
     dataType: 3
     generated: false
     name: rows_examined_avg
+    nullable: true
     primaryKey: false
-    unsigned: true
+    unsigned: false
     visible: true
   first_seen:
     caseSensitive: false
     dataType: 93
     generated: false
     name: first_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -118,6 +131,7 @@ columns:
     dataType: 93
     generated: false
     name: last_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -126,6 +140,7 @@ columns:
     dataType: 12
     generated: false
     name: digest
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
index 1fb2f69e8c4..fec37a3f3b8 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_runtimes_in_95th_percentile.yaml
@@ -16,12 +16,14 @@
 #
 
 name: statements_with_runtimes_in_95th_percentile
+type: TABLE
 columns:
   query:
     caseSensitive: false
     dataType: -1
     generated: false
     name: query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -38,62 +41,70 @@ columns:
     dataType: 12
     generated: false
     name: full_scan
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   exec_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: exec_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   err_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: err_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   warn_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: warn_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -102,14 +113,16 @@ columns:
     dataType: 3
     generated: false
     name: rows_sent_avg
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -118,6 +131,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_examined_avg
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -126,6 +140,7 @@ columns:
     dataType: 93
     generated: false
     name: first_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -134,6 +149,7 @@ columns:
     dataType: 93
     generated: false
     name: last_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -142,6 +158,7 @@ columns:
     dataType: 12
     generated: false
     name: digest
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
index 424c1afa9e1..2da0ea82768 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_sorting.yaml
@@ -16,12 +16,14 @@
 #
 
 name: statements_with_sorting
+type: TABLE
 columns:
   query:
     caseSensitive: false
     dataType: -1
     generated: false
     name: query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,34 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   exec_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: exec_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   sort_merge_passes:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: sort_merge_passes
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -62,30 +68,34 @@ columns:
     dataType: 3
     generated: false
     name: avg_sort_merges
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   sorts_using_scans:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: sorts_using_scans
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   sort_using_range:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: sort_using_range
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_sorted:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sorted
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -94,6 +104,7 @@ columns:
     dataType: 3
     generated: false
     name: avg_rows_sorted
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -102,6 +113,7 @@ columns:
     dataType: 93
     generated: false
     name: first_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -110,6 +122,7 @@ columns:
     dataType: 93
     generated: false
     name: last_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -118,6 +131,7 @@ columns:
     dataType: 12
     generated: false
     name: digest
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
index 10a91857e14..59866cda647 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/statements_with_temp_tables.yaml
@@ -16,12 +16,14 @@
 #
 
 name: statements_with_temp_tables
+type: TABLE
 columns:
   query:
     caseSensitive: false
     dataType: -1
     generated: false
     name: query
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 12
     generated: false
     name: db
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   exec_count:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: exec_count
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   memory_tmp_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: memory_tmp_tables
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   disk_tmp_tables:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: disk_tmp_tables
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
@@ -70,6 +77,7 @@ columns:
     dataType: 3
     generated: false
     name: avg_tmp_tables_per_query
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +86,7 @@ columns:
     dataType: 3
     generated: false
     name: tmp_tables_to_disk_pct
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,6 +95,7 @@ columns:
     dataType: 93
     generated: false
     name: first_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -94,6 +104,7 @@ columns:
     dataType: 93
     generated: false
     name: last_seen
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -102,6 +113,7 @@ columns:
     dataType: 12
     generated: false
     name: digest
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys-config.yaml 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys-config.yaml
deleted file mode 100644
index 7742857793b..00000000000
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys-config.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: sys_config
-columns:
-  variable:
-    caseSensitive: false
-    dataType: 12
-    generated: false
-    name: variable
-    primaryKey: true
-    visible: true
-  value:
-    caseSensitive: false
-    dataType: 12
-    generated: false
-    name: value
-    primaryKey: false
-    visible: true
-  set_time:
-    caseSensitive: false
-    dataType: 93
-    generated: false
-    name: set_time
-    primaryKey: false
-    visible: true
-  set_by:
-    caseSensitive: false
-    dataType: 12
-    generated: false
-    name: set_by
-    primaryKey: false
-    visible: true
-indexes:
-  primary:
-    name: PRIMARY
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys_config.yaml 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys_config.yaml
index 7742857793b..f119411f660 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys_config.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/sys_config.yaml
@@ -16,35 +16,47 @@
 #
 
 name: sys_config
+type: TABLE
 columns:
   variable:
     caseSensitive: false
     dataType: 12
     generated: false
     name: variable
+    nullable: false
     primaryKey: true
+    unsigned: false
     visible: true
   value:
     caseSensitive: false
     dataType: 12
     generated: false
     name: value
+    nullable: true
     primaryKey: false
+    unsigned: false
     visible: true
   set_time:
     caseSensitive: false
     dataType: 93
     generated: false
     name: set_time
+    nullable: true
     primaryKey: false
+    unsigned: false
     visible: true
   set_by:
     caseSensitive: false
     dataType: 12
     generated: false
     name: set_by
+    nullable: true
     primaryKey: false
+    unsigned: false
     visible: true
 indexes:
   primary:
     name: PRIMARY
+    unique: true
+    columns:
+      - variable
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary.yaml
index 92207220ec9..b1211e1bed2 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary.yaml
@@ -16,12 +16,14 @@
 #
 
 name: user_summary
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,22 +32,25 @@ columns:
     dataType: 3
     generated: false
     name: statements
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   statement_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: statement_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   statement_avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: statement_avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -54,6 +59,7 @@ columns:
     dataType: 3
     generated: false
     name: table_scans
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,14 +68,16 @@ columns:
     dataType: 3
     generated: false
     name: file_ios
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   file_io_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: file_io_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +86,7 @@ columns:
     dataType: 3
     generated: false
     name: current_connections
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,30 +95,34 @@ columns:
     dataType: 3
     generated: false
     name: total_connections
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   unique_hosts:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: unique_hosts
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   current_memory:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: current_memory
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_memory_allocated:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_memory_allocated
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
index 8663f266c70..a64d9b6a4c9 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io.yaml
@@ -16,12 +16,14 @@
 #
 
 name: user_summary_by_file_io
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,14 +32,16 @@ columns:
     dataType: 3
     generated: false
     name: ios
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   io_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: io_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
index 38982f6997d..316bf4b961b 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_file_io_type.yaml
@@ -16,12 +16,14 @@
 #
 
 name: user_summary_by_file_io_type
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,34 @@ columns:
     dataType: 12
     generated: false
     name: event_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
index 2ad78ef2f20..67cb353f3ea 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_stages.yaml
@@ -16,12 +16,14 @@
 #
 
 name: user_summary_by_stages
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,34 @@ columns:
     dataType: 12
     generated: false
     name: event_name
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
index d22848dd554..f86d64f7475 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: user_summary_by_statement_latency
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,30 +32,43 @@ columns:
     dataType: 3
     generated: false
     name: total
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -62,6 +77,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_sent
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -70,6 +86,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_examined
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -78,6 +95,7 @@ columns:
     dataType: 3
     generated: false
     name: rows_affected
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -86,6 +104,7 @@ columns:
     dataType: 3
     generated: false
     name: full_scans
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
index 867834d5eee..94d9d8b8a49 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/user_summary_by_statement_type.yaml
@@ -16,12 +16,14 @@
 #
 
 name: user_summary_by_statement_type
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,70 +32,88 @@ columns:
     dataType: 12
     generated: false
     name: statement
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   lock_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: lock_latency
+    nullable: true
+    primaryKey: false
+    unsigned: false
+    visible: true
+  cpu_latency:
+    caseSensitive: false
+    dataType: 12
+    generated: false
+    name: cpu_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   rows_sent:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_sent
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_examined:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_examined
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   rows_affected:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: rows_affected
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   full_scans:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: full_scans
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/version.yaml 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/version.yaml
index e75e4bb26b2..79ead667a16 100644
--- a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/version.yaml
+++ b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/version.yaml
@@ -16,12 +16,14 @@
 #
 
 name: version
+type: TABLE
 columns:
   sys_version:
     caseSensitive: false
     dataType: 12
     generated: false
     name: sys_version
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,6 +32,7 @@ columns:
     dataType: 12
     generated: false
     name: mysql_version
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
index 5a7b6e87e6a..3a53856683d 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_avg_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: wait_classes_global_by_avg_latency
+type: TABLE
 columns:
   event_class:
     caseSensitive: false
     dataType: 12
     generated: false
     name: event_class
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 3
     generated: false
     name: total
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   min_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: min_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
index 946b245ba31..34e39b1ffa7 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/wait_classes_global_by_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: wait_classes_global_by_latency
+type: TABLE
 columns:
   event_class:
     caseSensitive: false
     dataType: 12
     generated: false
     name: event_class
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 3
     generated: false
     name: total
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   min_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: min_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
index 298e2860368..2c494b57b44 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_host_by_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: waits_by_host_by_latency
+type: TABLE
 columns:
   host:
-    caseSensitive: true
+    caseSensitive: false
     dataType: 12
     generated: false
     name: host
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 12
     generated: false
     name: event
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
index 923ad211367..6dde6da9ea3 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_by_user_by_latency.yaml
@@ -16,12 +16,14 @@
 #
 
 name: waits_by_user_by_latency
+type: TABLE
 columns:
   user:
     caseSensitive: true
     dataType: 12
     generated: false
     name: user
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
@@ -30,38 +32,43 @@ columns:
     dataType: 12
     generated: false
     name: event
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
index ad8bff55412..17a644a0d44 100644
--- 
a/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
+++ 
b/infra/database/type/mysql/src/main/resources/schema/mysql/sys/waits_global_by_latency.yaml
@@ -16,44 +16,50 @@
 #
 
 name: waits_global_by_latency
+type: TABLE
 columns:
   events:
     caseSensitive: false
     dataType: 12
     generated: false
     name: events
+    nullable: false
     primaryKey: false
     unsigned: false
     visible: true
   total:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
     name: total
+    nullable: false
     primaryKey: false
     unsigned: true
     visible: true
   total_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: total_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   avg_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: avg_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
   max_latency:
     caseSensitive: false
-    dataType: -1
+    dataType: 12
     generated: false
     name: max_latency
+    nullable: true
     primaryKey: false
     unsigned: false
     visible: true
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_latency.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_latency.xml
index 3e0be588ce7..7090a573ed4 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_latency.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_latency.xml
@@ -22,6 +22,7 @@
         <column name="total_latency"/>
         <column name="max_latency"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_sent"/>
         <column name="rows_examined"/>
         <column name="rows_affected"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_type.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_type.xml
index 63b8898f23a..88b7d22cd5a 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_type.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_host_summary_by_statement_type.xml
@@ -23,6 +23,7 @@
         <column name="total_latency"/>
         <column name="max_latency"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_sent"/>
         <column name="rows_examined"/>
         <column name="rows_affected"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_innodb_lock_waits.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_innodb_lock_waits.xml
index 8958979f71c..5bbbcc9fc61 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_innodb_lock_waits.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_innodb_lock_waits.xml
@@ -21,6 +21,10 @@
         <column name="wait_age"/>
         <column name="wait_age_secs"/>
         <column name="locked_table"/>
+        <column name="locked_table_schema"/>
+        <column name="locked_table_name"/>
+        <column name="locked_table_partition"/>
+        <column name="locked_table_subpartition"/>
         <column name="locked_index"/>
         <column name="locked_type"/>
         <column name="waiting_trx_id"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_processlist.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_processlist.xml
index 175a8199f10..6801ef8a53e 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_processlist.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_processlist.xml
@@ -25,9 +25,11 @@
         <column name="state"/>
         <column name="time"/>
         <column name="current_statement"/>
+        <column name="execution_engine"/>
         <column name="statement_latency"/>
         <column name="progress"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_examined"/>
         <column name="rows_sent"/>
         <column name="rows_affected"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_session.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_session.xml
index 175a8199f10..6801ef8a53e 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_session.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_session.xml
@@ -25,9 +25,11 @@
         <column name="state"/>
         <column name="time"/>
         <column name="current_statement"/>
+        <column name="execution_engine"/>
         <column name="statement_latency"/>
         <column name="progress"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_examined"/>
         <column name="rows_sent"/>
         <column name="rows_affected"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_statement_analysis.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_statement_analysis.xml
index f1108d82b85..4eea6bf034d 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_statement_analysis.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_statement_analysis.xml
@@ -27,6 +27,7 @@
         <column name="max_latency"/>
         <column name="avg_latency"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_sent"/>
         <column name="rows_sent_avg"/>
         <column name="rows_examined"/>
@@ -37,6 +38,8 @@
         <column name="tmp_disk_tables"/>
         <column name="rows_sorted"/>
         <column name="sort_merge_passes"/>
+        <column name="max_controlled_memory"/>
+        <column name="max_total_memory"/>
         <column name="digest"/>
         <column name="first_seen"/>
         <column name="last_seen"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_latency.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_latency.xml
index f4bf5d47b23..4e69162ba54 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_latency.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_latency.xml
@@ -22,6 +22,7 @@
         <column name="total_latency"/>
         <column name="max_latency"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_sent"/>
         <column name="rows_examined"/>
         <column name="rows_affected"/>
diff --git 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_type.xml
 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_type.xml
index 2e62715a44e..bb77f314dec 100644
--- 
a/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_type.xml
+++ 
b/test/e2e/sql/src/test/resources/cases/dql/dataset/empty_storage_units/mysql/select_mysql_sys_user_summary_by_statement_type.xml
@@ -23,6 +23,7 @@
         <column name="total_latency"/>
         <column name="max_latency"/>
         <column name="lock_latency"/>
+        <column name="cpu_latency"/>
         <column name="rows_sent"/>
         <column name="rows_examined"/>
         <column name="rows_affected"/>


Reply via email to