You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/08 06:49:49 UTC

(shardingsphere) branch master updated: Refactor Firebird system tables logic to work with Proxy (#36480)

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

zhangliang 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 3a3c6090daf Refactor Firebird system tables logic to work with Proxy (#36480)
3a3c6090daf is described below

commit 3a3c6090daf82a11351d6f980e651eb35712867e
Author: Maxim Sentyabrskiy <16...@users.noreply.github.com>
AuthorDate: Mon Sep 8 09:49:42 2025 +0300

    Refactor Firebird system tables logic to work with Proxy (#36480)
    
    * RS-226041. fix loading system tables
    
    * RS-226041. fix execution for regular tables
    
    * move project directories
    
    * RS-226041. add test for SchemaMetaDataLoader
    
    * RS-226041. add Firebird system tables definitions
    
    * spotless fix
---
 .../database/FirebirdDatabaseMetaData.java         |   4 +-
 .../database/option/FirebirdSchemaOption.java      |   4 +-
 .../database/system/FirebirdSystemDatabase.java    |  24 ++-
 ...adata.database.metadata.DialectDatabaseMetaData |   2 +-
 ....metadata.database.system.DialectSystemDatabase |   2 +-
 .../mon$attachments.yaml}                          | 172 +++++++++------------
 .../mon$call_stack.yaml}                           |  61 ++++----
 .../mon$context_variables.yaml}                    |  27 ++--
 .../mon$database.yaml}                             | 168 ++++++++++----------
 .../mon$io_stats.yaml}                             |  36 ++---
 .../mon$memory_usage.yaml}                         |  36 ++---
 .../mon$record_stats.yaml}                         | 115 +++++++-------
 .../mon$statements.yaml}                           |  63 ++++----
 .../mon$table_stats.yaml}                          |  23 ++-
 .../mon$transactions.yaml}                         |  86 +++++------
 .../{rdb => system_tables}/rdb$auth_mapping.yaml   |   0
 .../{rdb => system_tables}/rdb$backup_history.yaml |   0
 .../{rdb => system_tables}/rdb$character_sets.yaml |   0
 .../rdb$check_constraints.yaml                     |   0
 .../{rdb => system_tables}/rdb$collations.yaml     |   0
 .../{rdb => system_tables}/rdb$config.yaml         |   0
 .../{rdb => system_tables}/rdb$database.yaml       |   0
 .../{rdb => system_tables}/rdb$db_creators.yaml    |   0
 .../{rdb => system_tables}/rdb$dependencies.yaml   |   0
 .../{rdb => system_tables}/rdb$exceptions.yaml     |   0
 .../rdb$field_dimensions.yaml                      |   0
 .../{rdb => system_tables}/rdb$fields.yaml         |   0
 .../firebird/{rdb => system_tables}/rdb$files.yaml |   0
 .../{rdb => system_tables}/rdb$filters.yaml        |   0
 .../{rdb => system_tables}/rdb$formats.yaml        |   0
 .../rdb$function_arguments.yaml                    |   0
 .../{rdb => system_tables}/rdb$functions.yaml      |   0
 .../{rdb => system_tables}/rdb$generators.yaml     |   0
 .../{rdb => system_tables}/rdb$index_segments.yaml |   0
 .../{rdb => system_tables}/rdb$indices.yaml        |   0
 .../firebird/{rdb => system_tables}/rdb$pages.yaml |   0
 .../rdb$procedure_parameters.yaml                  |   0
 .../{rdb => system_tables}/rdb$procedures.yaml     |   0
 .../rdb$ref_constraints.yaml                       |   0
 .../rdb$relation_constraints.yaml                  |   0
 .../rdb$relation_fields.yaml                       |   0
 .../{rdb => system_tables}/rdb$relations.yaml      |   0
 .../firebird/{rdb => system_tables}/rdb$roles.yaml |   0
 .../rdb$security_classes.yaml                      |   0
 .../{rdb => system_tables}/rdb$time_zones.yaml     |   0
 .../{rdb => system_tables}/rdb$transactions.yaml   |   0
 .../rdb$trigger_messages.yaml                      |   0
 .../{rdb => system_tables}/rdb$triggers.yaml       |   0
 .../firebird/{rdb => system_tables}/rdb$types.yaml |   0
 .../rdb$user_privileges.yaml                       |   0
 .../{rdb => system_tables}/rdb$view_relations.yaml |   0
 .../sec$db_creators.yaml}                          |  12 +-
 .../sec$global_auth_mapping.yaml}                  |  46 +++---
 .../sec$user_attributes.yaml}                      |  25 ++-
 .../sec$users.yaml}                                |  48 +++---
 .../loader/FirebirdSchemaMetaDataLoaderTest.java   |  91 +++++++++++
 .../system/FirebirdSystemDatabaseTest.java         |  47 ++++++
 .../FirebirdPrepareStatementCommandExecutor.java   |   4 +
 58 files changed, 595 insertions(+), 501 deletions(-)

diff --git a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/FirebirdDatabaseMetaData.java b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/FirebirdDatabaseMetaData.java
similarity index 92%
rename from database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/FirebirdDatabaseMetaData.java
rename to database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/FirebirdDatabaseMetaData.java
index e67fa96331c..1fc038b07f8 100644
--- a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/FirebirdDatabaseMetaData.java
+++ b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/FirebirdDatabaseMetaData.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.database.connector.firebird.database;
+package org.apache.shardingsphere.database.connector.firebird.metadata.database;
 
 import org.apache.shardingsphere.database.connector.core.metadata.database.enums.NullsOrderType;
 import org.apache.shardingsphere.database.connector.core.metadata.database.enums.QuoteCharacter;
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.database.connector.core.metadata.database.metad
 import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.IdentifierPatternType;
 import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.schema.DialectSchemaOption;
 import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
-import org.apache.shardingsphere.database.connector.firebird.database.option.FirebirdSchemaOption;
+import org.apache.shardingsphere.database.connector.firebird.metadata.database.option.FirebirdSchemaOption;
 
 import java.sql.Connection;
 
diff --git a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/option/FirebirdSchemaOption.java b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/option/FirebirdSchemaOption.java
similarity index 92%
rename from database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/option/FirebirdSchemaOption.java
rename to database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/option/FirebirdSchemaOption.java
index df45c2eab67..cc0dd636c58 100644
--- a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/option/FirebirdSchemaOption.java
+++ b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/option/FirebirdSchemaOption.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.database.connector.firebird.database.option;
+package org.apache.shardingsphere.database.connector.firebird.metadata.database.option;
 
 import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.schema.DefaultSchemaOption;
 import org.apache.shardingsphere.database.connector.core.metadata.database.metadata.option.schema.DialectSchemaOption;
@@ -47,6 +47,6 @@ public final class FirebirdSchemaOption implements DialectSchemaOption {
     
     @Override
     public Optional<String> getDefaultSystemSchema() {
-        return Optional.of("rdb");
+        return Optional.of("system_tables");
     }
 }
diff --git a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/system/FirebirdSystemDatabase.java b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
similarity index 74%
rename from database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/system/FirebirdSystemDatabase.java
rename to database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
index 585d51bd536..832b93d3b22 100644
--- a/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/database/system/FirebirdSystemDatabase.java
+++ b/database/connector/dialect/firebird/src/main/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabase.java
@@ -15,28 +15,36 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.database.connector.firebird.database.system;
+package org.apache.shardingsphere.database.connector.firebird.metadata.database.system;
 
 import org.apache.shardingsphere.database.connector.core.metadata.database.system.DialectSystemDatabase;
 
+import java.util.AbstractMap;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * System database of Firebird.
  */
 public final class FirebirdSystemDatabase implements DialectSystemDatabase {
     
-    private static final Map<String, Collection<String>> SYSTEM_DATABASE_SCHEMA_MAP = new HashMap<>();
+    private static final Collection<String> SYSTEM_SCHEMAS = new HashSet<>(Collections.singletonList("system_tables"));
     
-    private static final Collection<String> SYSTEM_SCHEMAS = new HashSet<>(Collections.singletonList("rdb"));
-    
-    static {
-        SYSTEM_DATABASE_SCHEMA_MAP.put("logic_db", SYSTEM_SCHEMAS);
-    }
+    private static final Map<String, Collection<String>> SYSTEM_DATABASE_SCHEMA_MAP = new AbstractMap<String, Collection<String>>() {
+        
+        @Override
+        public Collection<String> get(final Object key) {
+            return SYSTEM_SCHEMAS;
+        }
+        
+        @Override
+        public Set<Entry<String, Collection<String>>> entrySet() {
+            return Collections.emptySet();
+        }
+    };
     
     @Override
     public Map<String, Collection<String>> getSystemDatabaseSchemaMap() {
diff --git a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData b/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData
index 4b10564a6fc..2a9005b2bdb 100644
--- a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData
+++ b/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.database.connector.firebird.database.FirebirdDatabaseMetaData
+org.apache.shardingsphere.database.connector.firebird.metadata.database.FirebirdDatabaseMetaData
diff --git a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.system.DialectSystemDatabase b/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.system.DialectSystemDatabase
index a94aac12966..aa63b0950c5 100644
--- a/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.system.DialectSystemDatabase
+++ b/database/connector/dialect/firebird/src/main/resources/META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.system.DialectSystemDatabase
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.database.connector.firebird.database.system.FirebirdSystemDatabase
+org.apache.shardingsphere.database.connector.firebird.metadata.database.system.FirebirdSystemDatabase
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$attachments.yaml
similarity index 60%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$attachments.yaml
index 593172be2a1..1e7cbd78e73 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$attachments.yaml
@@ -15,209 +15,187 @@
 # limitations under the License.
 #
 
-name: RDB$FIELDS
+name: MON$ATTACHMENTS
 columns:
-  RDB$FIELD_NAME:
+  MON$ATTACHMENT_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$FIELD_NAME
+    name: MON$ATTACHMENT_ID
     primaryKey: false
     visible: true
-  RDB$QUERY_NAME:
+  MON$SERVER_PID:
     caseSensitive: false
-    dataType: 1
+    dataType: 4
     generated: false
-    name: RDB$QUERY_NAME
+    name: MON$SERVER_PID
     primaryKey: false
     visible: true
-  RDB$VALIDATION_BLR:
+  MON$STATE:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$VALIDATION_BLR
+    name: MON$STATE
     primaryKey: false
     visible: true
-  RDB$VALIDATION_SOURCE:
+  MON$ATTACHMENT_NAME:
     caseSensitive: false
-    dataType: 2004
+    dataType: 12
     generated: false
-    name: RDB$VALIDATION_SOURCE
+    name: MON$ATTACHMENT_NAME
     primaryKey: false
     visible: true
-  RDB$COMPUTED_BLR:
+  MON$USER:
     caseSensitive: false
-    dataType: 2004
+    dataType: 1
     generated: false
-    name: RDB$COMPUTED_BLR
+    name: MON$USER
     primaryKey: false
     visible: true
-  RDB$COMPUTED_SOURCE:
+  MON$ROLE:
     caseSensitive: false
-    dataType: 2004
+    dataType: 1
     generated: false
-    name: RDB$COMPUTED_SOURCE
+    name: MON$ROLE
     primaryKey: false
     visible: true
-  RDB$DEFAULT_VALUE:
+  MON$REMOTE_PROTOCOL:
     caseSensitive: false
-    dataType: 2004
+    dataType: 12
     generated: false
-    name: RDB$DEFAULT_VALUE
+    name: MON$REMOTE_PROTOCOL
     primaryKey: false
     visible: true
-  RDB$DEFAULT_SOURCE:
+  MON$REMOTE_ADDRESS:
     caseSensitive: false
-    dataType: 2004
+    dataType: 12
     generated: false
-    name: RDB$DEFAULT_SOURCE
+    name: MON$REMOTE_ADDRESS
     primaryKey: false
     visible: true
-  RDB$FIELD_LENGTH:
+  MON$REMOTE_PID:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$FIELD_LENGTH
+    name: MON$REMOTE_PID
     primaryKey: false
     visible: true
-  RDB$FIELD_SCALE:
+  MON$CHARACTER_SET_ID:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FIELD_SCALE
+    name: MON$CHARACTER_SET_ID
     primaryKey: false
     visible: true
-  RDB$FIELD_TYPE:
+  MON$TIMESTAMP:
     caseSensitive: false
-    dataType: 5
+    dataType: 2014
     generated: false
-    name: RDB$FIELD_TYPE
+    name: MON$TIMESTAMP
     primaryKey: false
     visible: true
-  RDB$FIELD_SUB_TYPE:
+  MON$GARBAGE_COLLECTION:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FIELD_SUB_TYPE
-    primaryKey: false
-    visible: true
-  RDB$MISSING_VALUE:
-    caseSensitive: false
-    dataType: 2004
-    generated: false
-    name: RDB$MISSING_VALUE
-    primaryKey: false
-    visible: true
-  RDB$MISSING_SOURCE:
-    caseSensitive: false
-    dataType: 2004
-    generated: false
-    name: RDB$MISSING_SOURCE
-    primaryKey: false
-    visible: true
-  RDB$DESCRIPTION:
-    caseSensitive: false
-    dataType: 2004
-    generated: false
-    name: RDB$DESCRIPTION
+    name: MON$GARBAGE_COLLECTION
     primaryKey: false
     visible: true
-  RDB$SYSTEM_FLAG:
+  MON$REMOTE_PROCESS:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$SYSTEM_FLAG
+    name: MON$REMOTE_PROCESS
     primaryKey: false
     visible: true
-  RDB$QUERY_HEADER:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 2004
+    dataType: 4
     generated: false
-    name: RDB$QUERY_HEADER
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$SEGMENT_LENGTH:
+  MON$CLIENT_VERSION:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$SEGMENT_LENGTH
+    name: MON$CLIENT_VERSION
     primaryKey: false
     visible: true
-  RDB$EDIT_STRING:
+  MON$REMOTE_VERSION:
     caseSensitive: false
     dataType: 12
     generated: false
-    name: RDB$EDIT_STRING
+    name: MON$REMOTE_VERSION
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_LENGTH:
+  MON$REMOTE_HOST:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$EXTERNAL_LENGTH
+    name: MON$REMOTE_HOST
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_SCALE:
+  MON$REMOTE_OS_USER:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$EXTERNAL_SCALE
+    name: MON$REMOTE_OS_USER
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_TYPE:
+  MON$AUTH_METHOD:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$EXTERNAL_TYPE
+    name: MON$AUTH_METHOD
     primaryKey: false
     visible: true
-  RDB$DIMENSIONS:
+  MON$SYSTEM_FLAG:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$DIMENSIONS
+    name: MON$SYSTEM_FLAG
     primaryKey: false
     visible: true
-  RDB$NULL_FLAG:
+  MON$IDLE_TIMEOUT:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$NULL_FLAG
+    name: MON$IDLE_TIMEOUT
     primaryKey: false
     visible: true
-  RDB$CHARACTER_LENGTH:
+  MON$IDLE_TIMER:
     caseSensitive: false
-    dataType: 5
+    dataType: 2014
     generated: false
-    name: RDB$CHARACTER_LENGTH
+    name: MON$IDLE_TIMER
     primaryKey: false
     visible: true
-  RDB$CHARACTER_SET_ID:
+  MON$STATEMENT_TIMEOUT:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$CHARACTER_SET_ID
+    name: MON$STATEMENT_TIMEOUT
     primaryKey: false
     visible: true
-  RDB$FIELD_PRECISION:
+  MON$WIRE_COMPRESSED:
     caseSensitive: false
-    dataType: 5
+    dataType: 16
     generated: false
-    name: RDB$FIELD_PRECISION
+    name: MON$WIRE_COMPRESSED
     primaryKey: false
     visible: true
-  RDB$SECURITY_CLASS:
+  MON$WIRE_ENCRYPTED:
     caseSensitive: false
-    dataType: 1
+    dataType: 16
     generated: false
-    name: RDB$SECURITY_CLASS
+    name: MON$WIRE_ENCRYPTED
     primaryKey: false
     visible: true
-  RDB$OWNER_NAME:
+  MON$WIRE_CRYPT_PLUGIN:
     caseSensitive: false
-    dataType: 1
+    dataType: 12
     generated: false
-    name: RDB$OWNER_NAME
+    name: MON$WIRE_CRYPT_PLUGIN
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$call_stack.yaml
similarity index 74%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$call_stack.yaml
index 03d98e658dc..a0c12548156 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$call_stack.yaml
@@ -15,76 +15,75 @@
 # limitations under the License.
 #
 
-name: RDB$AUTH_MAPPING
+name: MON$CALL_STACK
 columns:
-  RDB$MAP_NAME:
+  MON$CALL_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$MAP_NAME
+    name: MON$CALL_ID
     primaryKey: false
     visible: true
-  RDB$MAP_USING:
+  MON$STATEMENT_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$MAP_USING
+    name: MON$STATEMENT_ID
     primaryKey: false
     visible: true
-  RDB$MAP_PLUGIN:
+  MON$CALLER_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$MAP_PLUGIN
+    name: MON$CALLER_ID
     primaryKey: false
     visible: true
-  RDB$MAP_DB:
+  MON$OBJECT_NAME:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$MAP_DB
+    name: MON$OBJECT_NAME
     primaryKey: false
     visible: true
-  RDB$MAP_FROM_TYPE:
+  MON$OBJECT_TYPE:
     caseSensitive: false
-    dataType: 1
+    dataType: 5
     generated: false
-    name: RDB$MAP_FROM_TYPE
+    name: MON$OBJECT_TYPE
     primaryKey: false
     visible: true
-  RDB$MAP_FROM:
+  MON$TIMESTAMP:
     caseSensitive: false
-    dataType: 1
+    dataType: 2014
     generated: false
-    name: RDB$MAP_FROM
+    name: MON$TIMESTAMP
     primaryKey: false
     visible: true
-  RDB$MAP_TO_TYPE:
+  MON$SOURCE_LINE:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$MAP_TO_TYPE
+    name: MON$SOURCE_LINE
     primaryKey: false
     visible: true
-  RDB$MAP_TO:
+  MON$SOURCE_COLUMN:
     caseSensitive: false
-    dataType: 1
+    dataType: 4
     generated: false
-    name: RDB$MAP_TO
+    name: MON$SOURCE_COLUMN
     primaryKey: false
     visible: true
-  RDB$SYSTEM_FLAG:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$SYSTEM_FLAG
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$DESCRIPTION:
+  MON$PACKAGE_NAME:
     caseSensitive: false
-    dataType: 2004
+    dataType: 1
     generated: false
-    name: RDB$DESCRIPTION
+    name: MON$PACKAGE_NAME
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$context_variables.yaml
similarity index 79%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$context_variables.yaml
index 9d84089f050..629f2309fdf 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$context_variables.yaml
@@ -15,34 +15,33 @@
 # limitations under the License.
 #
 
-name: RDB$PAGES
+name: MON$CONTEXT_VARIABLES
 columns:
-  RDB$PAGE_NUMBER:
+  MON$ATTACHMENT_ID:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
-    name: RDB$PAGE_NUMBER
+    name: MON$ATTACHMENT_ID
     primaryKey: false
     visible: true
-  RDB$RELATION_ID:
+  MON$TRANSACTION_ID:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$RELATION_ID
+    name: MON$TRANSACTION_ID
     primaryKey: false
     visible: true
-  RDB$PAGE_SEQUENCE:
+  MON$VARIABLE_NAME:
     caseSensitive: false
-    dataType: 4
+    dataType: 12
     generated: false
-    name: RDB$PAGE_SEQUENCE
+    name: MON$VARIABLE_NAME
     primaryKey: false
     visible: true
-  RDB$PAGE_TYPE:
+  MON$VARIABLE_VALUE:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$PAGE_TYPE
+    name: MON$VARIABLE_VALUE
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$database.yaml
similarity index 66%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$database.yaml
index 593172be2a1..98c7b1f50cc 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$database.yaml
@@ -15,209 +15,201 @@
 # limitations under the License.
 #
 
-name: RDB$FIELDS
+name: MON$DATABASE
 columns:
-  RDB$FIELD_NAME:
+  MON$DATABASE_NAME:
     caseSensitive: false
-    dataType: 1
-    generated: false
-    name: RDB$FIELD_NAME
-    primaryKey: false
-    visible: true
-  RDB$QUERY_NAME:
-    caseSensitive: false
-    dataType: 1
+    dataType: 12
     generated: false
-    name: RDB$QUERY_NAME
+    name: MON$DATABASE_NAME
     primaryKey: false
     visible: true
-  RDB$VALIDATION_BLR:
+  MON$PAGE_SIZE:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$VALIDATION_BLR
+    name: MON$PAGE_SIZE
     primaryKey: false
     visible: true
-  RDB$VALIDATION_SOURCE:
+  MON$ODS_MAJOR:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$VALIDATION_SOURCE
+    name: MON$ODS_MAJOR
     primaryKey: false
     visible: true
-  RDB$COMPUTED_BLR:
+  MON$ODS_MINOR:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$COMPUTED_BLR
+    name: MON$ODS_MINOR
     primaryKey: false
     visible: true
-  RDB$COMPUTED_SOURCE:
+  MON$OLDEST_TRANSACTION:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$COMPUTED_SOURCE
+    name: MON$OLDEST_TRANSACTION
     primaryKey: false
     visible: true
-  RDB$DEFAULT_VALUE:
+  MON$OLDEST_ACTIVE:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$DEFAULT_VALUE
+    name: MON$OLDEST_ACTIVE
     primaryKey: false
     visible: true
-  RDB$DEFAULT_SOURCE:
+  MON$OLDEST_SNAPSHOT:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$DEFAULT_SOURCE
+    name: MON$OLDEST_SNAPSHOT
     primaryKey: false
     visible: true
-  RDB$FIELD_LENGTH:
+  MON$NEXT_TRANSACTION:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FIELD_LENGTH
+    name: MON$NEXT_TRANSACTION
     primaryKey: false
     visible: true
-  RDB$FIELD_SCALE:
+  MON$PAGE_BUFFERS:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$FIELD_SCALE
+    name: MON$PAGE_BUFFERS
     primaryKey: false
     visible: true
-  RDB$FIELD_TYPE:
+  MON$SQL_DIALECT:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FIELD_TYPE
+    name: MON$SQL_DIALECT
     primaryKey: false
     visible: true
-  RDB$FIELD_SUB_TYPE:
+  MON$SHUTDOWN_MODE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FIELD_SUB_TYPE
+    name: MON$SHUTDOWN_MODE
     primaryKey: false
     visible: true
-  RDB$MISSING_VALUE:
+  MON$SWEEP_INTERVAL:
     caseSensitive: false
-    dataType: 2004
+    dataType: 4
     generated: false
-    name: RDB$MISSING_VALUE
+    name: MON$SWEEP_INTERVAL
     primaryKey: false
     visible: true
-  RDB$MISSING_SOURCE:
+  MON$READ_ONLY:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$MISSING_SOURCE
+    name: MON$READ_ONLY
     primaryKey: false
     visible: true
-  RDB$DESCRIPTION:
+  MON$FORCED_WRITES:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$DESCRIPTION
+    name: MON$FORCED_WRITES
     primaryKey: false
     visible: true
-  RDB$SYSTEM_FLAG:
+  MON$RESERVE_SPACE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$SYSTEM_FLAG
+    name: MON$RESERVE_SPACE
     primaryKey: false
     visible: true
-  RDB$QUERY_HEADER:
+  MON$CREATION_DATE:
     caseSensitive: false
-    dataType: 2004
+    dataType: 2014
     generated: false
-    name: RDB$QUERY_HEADER
+    name: MON$CREATION_DATE
     primaryKey: false
     visible: true
-  RDB$SEGMENT_LENGTH:
+  MON$PAGES:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$SEGMENT_LENGTH
+    name: MON$PAGES
     primaryKey: false
     visible: true
-  RDB$EDIT_STRING:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 12
+    dataType: 4
     generated: false
-    name: RDB$EDIT_STRING
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_LENGTH:
+  MON$BACKUP_STATE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$EXTERNAL_LENGTH
+    name: MON$BACKUP_STATE
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_SCALE:
+  MON$CRYPT_PAGE:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$EXTERNAL_SCALE
+    name: MON$CRYPT_PAGE
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_TYPE:
+  MON$OWNER:
     caseSensitive: false
-    dataType: 5
+    dataType: 1
     generated: false
-    name: RDB$EXTERNAL_TYPE
+    name: MON$OWNER
     primaryKey: false
     visible: true
-  RDB$DIMENSIONS:
+  MON$SEC_DATABASE:
     caseSensitive: false
-    dataType: 5
+    dataType: 1
     generated: false
-    name: RDB$DIMENSIONS
+    name: MON$SEC_DATABASE
     primaryKey: false
     visible: true
-  RDB$NULL_FLAG:
+  MON$CRYPT_STATE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$NULL_FLAG
+    name: MON$CRYPT_STATE
     primaryKey: false
     visible: true
-  RDB$CHARACTER_LENGTH:
+  MON$GUID:
     caseSensitive: false
-    dataType: 5
+    dataType: 1
     generated: false
-    name: RDB$CHARACTER_LENGTH
+    name: MON$GUID
     primaryKey: false
     visible: true
-  RDB$CHARACTER_SET_ID:
+  MON$FILE_ID:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$CHARACTER_SET_ID
+    name: MON$FILE_ID
     primaryKey: false
     visible: true
-  RDB$FIELD_PRECISION:
+  MON$NEXT_ATTACHMENT:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FIELD_PRECISION
+    name: MON$NEXT_ATTACHMENT
     primaryKey: false
     visible: true
-  RDB$SECURITY_CLASS:
+  MON$NEXT_STATEMENT:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$SECURITY_CLASS
+    name: MON$NEXT_STATEMENT
     primaryKey: false
     visible: true
-  RDB$OWNER_NAME:
+  MON$REPLICA_MODE:
     caseSensitive: false
-    dataType: 1
+    dataType: 5
     generated: false
-    name: RDB$OWNER_NAME
+    name: MON$REPLICA_MODE
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$io_stats.yaml
similarity index 79%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$io_stats.yaml
index a159dd940dd..2964703e5d5 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$io_stats.yaml
@@ -15,47 +15,47 @@
 # limitations under the License.
 #
 
-name: RDB$FILES
+name: MON$IO_STATS
 columns:
-  RDB$FILE_NAME:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 12
+    dataType: 4
     generated: false
-    name: RDB$FILE_NAME
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$FILE_SEQUENCE:
+  MON$STAT_GROUP:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FILE_SEQUENCE
+    name: MON$STAT_GROUP
     primaryKey: false
     visible: true
-  RDB$FILE_START:
+  MON$PAGE_READS:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
-    name: RDB$FILE_START
+    name: MON$PAGE_READS
     primaryKey: false
     visible: true
-  RDB$FILE_LENGTH:
+  MON$PAGE_WRITES:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
-    name: RDB$FILE_LENGTH
+    name: MON$PAGE_WRITES
     primaryKey: false
     visible: true
-  RDB$FILE_FLAGS:
+  MON$PAGE_FETCHES:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FILE_FLAGS
+    name: MON$PAGE_FETCHES
     primaryKey: false
     visible: true
-  RDB$SHADOW_NUMBER:
+  MON$PAGE_MARKS:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$SHADOW_NUMBER
+    name: MON$PAGE_MARKS
     primaryKey: false
     visible: true
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$memory_usage.yaml
similarity index 77%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$memory_usage.yaml
index a159dd940dd..7db74e9fe97 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$memory_usage.yaml
@@ -15,47 +15,47 @@
 # limitations under the License.
 #
 
-name: RDB$FILES
+name: MON$MEMORY_USAGE
 columns:
-  RDB$FILE_NAME:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 12
+    dataType: 4
     generated: false
-    name: RDB$FILE_NAME
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$FILE_SEQUENCE:
+  MON$STAT_GROUP:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FILE_SEQUENCE
+    name: MON$STAT_GROUP
     primaryKey: false
     visible: true
-  RDB$FILE_START:
+  MON$MEMORY_USED:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
-    name: RDB$FILE_START
+    name: MON$MEMORY_USED
     primaryKey: false
     visible: true
-  RDB$FILE_LENGTH:
+  MON$MEMORY_ALLOCATED:
     caseSensitive: false
-    dataType: 4
+    dataType: -5
     generated: false
-    name: RDB$FILE_LENGTH
+    name: MON$MEMORY_ALLOCATED
     primaryKey: false
     visible: true
-  RDB$FILE_FLAGS:
+  MON$MAX_MEMORY_USED:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FILE_FLAGS
+    name: MON$MAX_MEMORY_USED
     primaryKey: false
     visible: true
-  RDB$SHADOW_NUMBER:
+  MON$MAX_MEMORY_ALLOCATED:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$SHADOW_NUMBER
+    name: MON$MAX_MEMORY_ALLOCATED
     primaryKey: false
     visible: true
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relations.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$record_stats.yaml
similarity index 61%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relations.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$record_stats.yaml
index 87fbd67cd82..39061788648 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relations.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$record_stats.yaml
@@ -1,7 +1,7 @@
 #
 # 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.
+# 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
@@ -9,137 +9,130 @@
 #     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,
+# 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: RDB$RELATIONS
+name: MON$RECORD_STATS
 columns:
-  RDB$VIEW_BLR:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 2004
+    dataType: 4
     generated: false
-    name: RDB$VIEW_BLR
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$VIEW_SOURCE:
+  MON$STAT_GROUP:
     caseSensitive: false
-    dataType: 2004
+    dataType: 5
     generated: false
-    name: RDB$VIEW_SOURCE
+    name: MON$STAT_GROUP
     primaryKey: false
     visible: true
-  RDB$DESCRIPTION:
+  MON$RECORD_SEQ_READS:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$DESCRIPTION
+    name: MON$RECORD_SEQ_READS
     primaryKey: false
     visible: true
-  RDB$RELATION_ID:
+  MON$RECORD_IDX_READS:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$RELATION_ID
+    name: MON$RECORD_IDX_READS
     primaryKey: false
     visible: true
-  RDB$SYSTEM_FLAG:
+  MON$RECORD_INSERTS:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$SYSTEM_FLAG
+    name: MON$RECORD_INSERTS
     primaryKey: false
     visible: true
-  RDB$DBKEY_LENGTH:
+  MON$RECORD_UPDATES:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$DBKEY_LENGTH
+    name: MON$RECORD_UPDATES
     primaryKey: false
     visible: true
-  RDB$FORMAT:
+  MON$RECORD_DELETES:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FORMAT
+    name: MON$RECORD_DELETES
     primaryKey: false
     visible: true
-  RDB$FIELD_ID:
+  MON$RECORD_BACKOUTS:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FIELD_ID
+    name: MON$RECORD_BACKOUTS
     primaryKey: false
     visible: true
-  RDB$RELATION_NAME:
+  MON$RECORD_PURGES:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$RELATION_NAME
+    name: MON$RECORD_PURGES
     primaryKey: false
     visible: true
-  RDB$SECURITY_CLASS:
+  MON$RECORD_EXPUNGES:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$SECURITY_CLASS
+    name: MON$RECORD_EXPUNGES
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_FILE:
+  MON$RECORD_LOCKS:
     caseSensitive: false
-    dataType: 12
+    dataType: -5
     generated: false
-    name: RDB$EXTERNAL_FILE
+    name: MON$RECORD_LOCKS
     primaryKey: false
     visible: true
-  RDB$RUNTIME:
+  MON$RECORD_WAITS:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$RUNTIME
+    name: MON$RECORD_WAITS
     primaryKey: false
     visible: true
-  RDB$EXTERNAL_DESCRIPTION:
+  MON$RECORD_CONFLICTS:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$EXTERNAL_DESCRIPTION
+    name: MON$RECORD_CONFLICTS
     primaryKey: false
     visible: true
-  RDB$OWNER_NAME:
+  MON$BACKVERSION_READS:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$OWNER_NAME
+    name: MON$BACKVERSION_READS
     primaryKey: false
     visible: true
-  RDB$DEFAULT_CLASS:
+  MON$FRAGMENT_READS:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$DEFAULT_CLASS
+    name: MON$FRAGMENT_READS
     primaryKey: false
     visible: true
-  RDB$FLAGS:
+  MON$RECORD_RPT_READS:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$FLAGS
+    name: MON$RECORD_RPT_READS
     primaryKey: false
     visible: true
-  RDB$RELATION_TYPE:
+  MON$RECORD_IMGC:
     caseSensitive: false
-    dataType: 5
+    dataType: -5
     generated: false
-    name: RDB$RELATION_TYPE
+    name: MON$RECORD_IMGC
     primaryKey: false
     visible: true
-  RDB$SQL_SECURITY:
-    caseSensitive: false
-    dataType: 5
-    generated: false
-    name: RDB$SQL_SECURITY
-    primaryKey: false
-    visible: true
\ No newline at end of file
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$statements.yaml
similarity index 73%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$statements.yaml
index 03d98e658dc..d764580b388 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$statements.yaml
@@ -15,76 +15,75 @@
 # limitations under the License.
 #
 
-name: RDB$AUTH_MAPPING
+name: MON$STATEMENTS
 columns:
-  RDB$MAP_NAME:
+  MON$STATEMENT_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$MAP_NAME
+    name: MON$STATEMENT_ID
     primaryKey: false
     visible: true
-  RDB$MAP_USING:
+  MON$ATTACHMENT_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$MAP_USING
+    name: MON$ATTACHMENT_ID
     primaryKey: false
     visible: true
-  RDB$MAP_PLUGIN:
+  MON$TRANSACTION_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$MAP_PLUGIN
+    name: MON$TRANSACTION_ID
     primaryKey: false
     visible: true
-  RDB$MAP_DB:
+  MON$STATE:
     caseSensitive: false
-    dataType: 1
+    dataType: 5
     generated: false
-    name: RDB$MAP_DB
+    name: MON$STATE
     primaryKey: false
     visible: true
-  RDB$MAP_FROM_TYPE:
+  MON$TIMESTAMP:
     caseSensitive: false
-    dataType: 1
+    dataType: 2014
     generated: false
-    name: RDB$MAP_FROM_TYPE
+    name: MON$TIMESTAMP
     primaryKey: false
     visible: true
-  RDB$MAP_FROM:
+  MON$SQL_TEXT:
     caseSensitive: false
-    dataType: 1
+    dataType: 2004
     generated: false
-    name: RDB$MAP_FROM
+    name: MON$SQL_TEXT
     primaryKey: false
     visible: true
-  RDB$MAP_TO_TYPE:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$MAP_TO_TYPE
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$MAP_TO:
+  MON$EXPLAINED_PLAN:
     caseSensitive: false
-    dataType: 1
+    dataType: 2004
     generated: false
-    name: RDB$MAP_TO
+    name: MON$EXPLAINED_PLAN
     primaryKey: false
     visible: true
-  RDB$SYSTEM_FLAG:
+  MON$STATEMENT_TIMEOUT:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$SYSTEM_FLAG
+    name: MON$STATEMENT_TIMEOUT
     primaryKey: false
     visible: true
-  RDB$DESCRIPTION:
+  MON$STATEMENT_TIMER:
     caseSensitive: false
-    dataType: 2004
+    dataType: 2014
     generated: false
-    name: RDB$DESCRIPTION
+    name: MON$STATEMENT_TIMER
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$table_stats.yaml
similarity index 84%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$table_stats.yaml
index 9d84089f050..e8296bddf64 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$table_stats.yaml
@@ -15,34 +15,33 @@
 # limitations under the License.
 #
 
-name: RDB$PAGES
+name: MON$TABLE_STATS
 columns:
-  RDB$PAGE_NUMBER:
+  MON$STAT_ID:
     caseSensitive: false
     dataType: 4
     generated: false
-    name: RDB$PAGE_NUMBER
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
-  RDB$RELATION_ID:
+  MON$STAT_GROUP:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$RELATION_ID
+    name: MON$STAT_GROUP
     primaryKey: false
     visible: true
-  RDB$PAGE_SEQUENCE:
+  MON$TABLE_NAME:
     caseSensitive: false
-    dataType: 4
+    dataType: 1
     generated: false
-    name: RDB$PAGE_SEQUENCE
+    name: MON$TABLE_NAME
     primaryKey: false
     visible: true
-  RDB$PAGE_TYPE:
+  MON$RECORD_STAT_ID:
     caseSensitive: false
-    dataType: 5
+    dataType: 4
     generated: false
-    name: RDB$PAGE_TYPE
+    name: MON$RECORD_STAT_ID
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$triggers.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$transactions.yaml
similarity index 63%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$triggers.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$transactions.yaml
index dc7cf4fe4e6..c18a904c611 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$triggers.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/mon$transactions.yaml
@@ -1,7 +1,7 @@
 #
 # 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.
+# 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
@@ -15,110 +15,96 @@
 # limitations under the License.
 #
 
-name: RDB$TRIGGERS
+name: MON$TRANSACTIONS
 columns:
-  RDB$TRIGGER_NAME:
+  MON$TRANSACTION_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$TRIGGER_NAME
+    name: MON$TRANSACTION_ID
     primaryKey: false
     visible: true
-  RDB$RELATION_NAME:
+  MON$ATTACHMENT_ID:
     caseSensitive: false
-    dataType: 1
+    dataType: -5
     generated: false
-    name: RDB$RELATION_NAME
+    name: MON$ATTACHMENT_ID
     primaryKey: false
     visible: true
-  RDB$TRIGGER_SEQUENCE:
+  MON$STATE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$TRIGGER_SEQUENCE
+    name: MON$STATE
     primaryKey: false
     visible: true
-  RDB$TRIGGER_TYPE:
+  MON$TIMESTAMP:
     caseSensitive: false
-    dataType: -5
+    dataType: 2014
     generated: false
-    name: RDB$TRIGGER_TYPE
+    name: MON$TIMESTAMP
     primaryKey: false
     visible: true
-  RDB$TRIGGER_SOURCE:
+  MON$TOP_TRANSACTION:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$TRIGGER_SOURCE
+    name: MON$TOP_TRANSACTION
     primaryKey: false
     visible: true
-  RDB$TRIGGER_BLR:
+  MON$OLDEST_TRANSACTION:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$TRIGGER_BLR
+    name: MON$OLDEST_TRANSACTION
     primaryKey: false
     visible: true
-  RDB$DESCRIPTION:
+  MON$OLDEST_ACTIVE:
     caseSensitive: false
-    dataType: 2004
+    dataType: -5
     generated: false
-    name: RDB$DESCRIPTION
+    name: MON$OLDEST_ACTIVE
     primaryKey: false
     visible: true
-  RDB$TRIGGER_INACTIVE:
+  MON$ISOLATION_MODE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$TRIGGER_INACTIVE
+    name: MON$ISOLATION_MODE
     primaryKey: false
     visible: true
-  RDB$SYSTEM_FLAG:
+  MON$LOCK_TIMEOUT:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$SYSTEM_FLAG
+    name: MON$LOCK_TIMEOUT
     primaryKey: false
     visible: true
-  RDB$FLAGS:
+  MON$READ_ONLY:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$FLAGS
+    name: MON$READ_ONLY
     primaryKey: false
     visible: true
-  RDB$VALID_BLR:
+  MON$AUTO_COMMIT:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$VALID_BLR
+    name: MON$AUTO_COMMIT
     primaryKey: false
     visible: true
-  RDB$DEBUG_INFO:
+  MON$AUTO_UNDO:
     caseSensitive: false
-    dataType: 2004
-    generated: false
-    name: RDB$DEBUG_INFO
-    primaryKey: false
-    visible: true
-  RDB$ENGINE_NAME:
-    caseSensitive: false
-    dataType: 1
-    generated: false
-    name: RDB$ENGINE_NAME
-    primaryKey: false
-    visible: true
-  RDB$ENTRYPOINT:
-    caseSensitive: false
-    dataType: 1
+    dataType: 5
     generated: false
-    name: RDB$ENTRYPOINT
+    name: MON$AUTO_UNDO
     primaryKey: false
     visible: true
-  RDB$SQL_SECURITY:
+  MON$STAT_ID:
     caseSensitive: false
-    dataType: 16
+    dataType: 4
     generated: false
-    name: RDB$SQL_SECURITY
+    name: MON$STAT_ID
     primaryKey: false
     visible: true
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$auth_mapping.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$auth_mapping.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$auth_mapping.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$backup_history.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$backup_history.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$backup_history.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$backup_history.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$character_sets.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$character_sets.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$character_sets.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$character_sets.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$check_constraints.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$check_constraints.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$check_constraints.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$check_constraints.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$collations.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$collations.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$collations.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$collations.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$config.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$config.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$config.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$config.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$database.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$database.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$database.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$database.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$db_creators.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$db_creators.yaml
similarity index 100%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$db_creators.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$db_creators.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$dependencies.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$dependencies.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$dependencies.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$dependencies.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$exceptions.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$exceptions.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$exceptions.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$exceptions.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$field_dimensions.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$field_dimensions.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$field_dimensions.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$field_dimensions.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$fields.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$fields.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$fields.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$files.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$files.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$files.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$filters.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$filters.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$filters.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$filters.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$formats.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$formats.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$formats.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$formats.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$function_arguments.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$function_arguments.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$function_arguments.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$function_arguments.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$functions.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$functions.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$functions.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$functions.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$generators.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$generators.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$generators.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$generators.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$index_segments.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$index_segments.yaml
similarity index 100%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$index_segments.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$index_segments.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$indices.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$indices.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$indices.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$indices.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$pages.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$pages.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$pages.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$procedure_parameters.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$procedure_parameters.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$procedure_parameters.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$procedure_parameters.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$procedures.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$procedures.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$procedures.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$procedures.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$ref_constraints.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$ref_constraints.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$ref_constraints.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$ref_constraints.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relation_constraints.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$relation_constraints.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relation_constraints.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$relation_constraints.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relation_fields.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$relation_fields.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relation_fields.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$relation_fields.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relations.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$relations.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$relations.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$relations.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$roles.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$roles.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$roles.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$roles.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$security_classes.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$security_classes.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$security_classes.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$security_classes.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$time_zones.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$time_zones.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$time_zones.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$time_zones.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$transactions.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$transactions.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$transactions.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$transactions.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$trigger_messages.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$trigger_messages.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$trigger_messages.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$trigger_messages.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$triggers.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$triggers.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$triggers.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$triggers.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$types.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$types.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$types.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$types.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$user_privileges.yaml
similarity index 100%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$user_privileges.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$view_relations.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$view_relations.yaml
similarity index 100%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$view_relations.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/rdb$view_relations.yaml
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$db_creators.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$db_creators.yaml
similarity index 89%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$db_creators.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$db_creators.yaml
index 6f8f1a53305..b77e58518f1 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$db_creators.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$db_creators.yaml
@@ -15,19 +15,19 @@
 # limitations under the License.
 #
 
-name: RDB$DB_CREATORS
+name: SEC$DB_CREATORS
 columns:
-  RDB$USER:
+  SEC$USER:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$USER
+    name: SEC$USER
     primaryKey: false
     visible: true
-  RDB$USER_TYPE:
+  SEC$USER_TYPE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$USER_TYPE
+    name: SEC$USER_TYPE
     primaryKey: false
-    visible: true
\ No newline at end of file
+    visible: true
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$global_auth_mapping.yaml
similarity index 69%
copy from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml
copy to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$global_auth_mapping.yaml
index 7cad52fd5be..b5bbcc18305 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$global_auth_mapping.yaml
@@ -1,7 +1,7 @@
 #
 # 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.
+# 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
@@ -9,67 +9,67 @@
 #     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.
+# 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: RDB$USER_PRIVILEGES
+name: SEC$GLOBAL_AUTH_MAPPING
 columns:
-  RDB$USER:
+  SEC$MAP_NAME:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$USER
+    name: SEC$MAP_NAME
     primaryKey: false
     visible: true
-  RDB$GRANTOR:
+  SEC$MAP_USING:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$GRANTOR
+    name: SEC$MAP_USING
     primaryKey: false
     visible: true
-  RDB$PRIVILEGE:
+  SEC$MAP_PLUGIN:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$PRIVILEGE
+    name: SEC$MAP_PLUGIN
     primaryKey: false
     visible: true
-  RDB$GRANT_OPTION:
+  SEC$MAP_DB:
     caseSensitive: false
-    dataType: 5
+    dataType: 1
     generated: false
-    name: RDB$GRANT_OPTION
+    name: SEC$MAP_DB
     primaryKey: false
     visible: true
-  RDB$RELATION_NAME:
+  SEC$MAP_FROM_TYPE:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$RELATION_NAME
+    name: SEC$MAP_FROM_TYPE
     primaryKey: false
     visible: true
-  RDB$FIELD_NAME:
+  SEC$MAP_FROM:
     caseSensitive: false
-    dataType: 1
+    dataType: 12
     generated: false
-    name: RDB$FIELD_NAME
+    name: SEC$MAP_FROM
     primaryKey: false
     visible: true
-  RDB$USER_TYPE:
+  SEC$MAP_TO_TYPE:
     caseSensitive: false
     dataType: 5
     generated: false
-    name: RDB$USER_TYPE
+    name: SEC$MAP_TO_TYPE
     primaryKey: false
     visible: true
-  RDB$OBJECT_TYPE:
+  SEC$MAP_TO:
     caseSensitive: false
-    dataType: 5
+    dataType: 1
     generated: false
-    name: RDB$OBJECT_TYPE
+    name: SEC$MAP_TO
     primaryKey: false
     visible: true
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$index_segments.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$user_attributes.yaml
similarity index 83%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$index_segments.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$user_attributes.yaml
index e0cbf3df087..2f377e84f30 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$index_segments.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$user_attributes.yaml
@@ -15,34 +15,33 @@
 # limitations under the License.
 #
 
-name: RDB$INDEX_SEGMENTS
+name: SEC$USER_ATTRIBUTES
 columns:
-  RDB$INDEX_NAME:
+  SEC$USER_NAME:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$INDEX_NAME
+    name: SEC$USER_NAME
     primaryKey: false
     visible: true
-  RDB$FIELD_NAME:
+  SEC$KEY:
     caseSensitive: false
-    dataType: 1
+    dataType: 12
     generated: false
-    name: RDB$FIELD_NAME
+    name: SEC$KEY
     primaryKey: false
     visible: true
-  RDB$FIELD_POSITION:
+  SEC$VALUE:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$FIELD_POSITION
+    name: SEC$VALUE
     primaryKey: false
     visible: true
-  RDB$STATISTICS:
+  SEC$PLUGIN:
     caseSensitive: false
-    dataType: 8
+    dataType: 1
     generated: false
-    name: RDB$STATISTICS
+    name: SEC$PLUGIN
     primaryKey: false
     visible: true
-
diff --git a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$users.yaml
similarity index 76%
rename from database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml
rename to database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$users.yaml
index 7cad52fd5be..50f4cc8cdf1 100644
--- a/database/connector/dialect/firebird/src/main/resources/schema/firebird/rdb/rdb$user_privileges.yaml
+++ b/database/connector/dialect/firebird/src/main/resources/schema/firebird/system_tables/sec$users.yaml
@@ -15,61 +15,61 @@
 # limitations under the License.
 #
 
-name: RDB$USER_PRIVILEGES
+name: SEC$USERS
 columns:
-  RDB$USER:
+  SEC$USER_NAME:
     caseSensitive: false
     dataType: 1
     generated: false
-    name: RDB$USER
+    name: SEC$USER_NAME
     primaryKey: false
     visible: true
-  RDB$GRANTOR:
+  SEC$FIRST_NAME:
     caseSensitive: false
-    dataType: 1
+    dataType: 12
     generated: false
-    name: RDB$GRANTOR
+    name: SEC$FIRST_NAME
     primaryKey: false
     visible: true
-  RDB$PRIVILEGE:
+  SEC$MIDDLE_NAME:
     caseSensitive: false
-    dataType: 1
+    dataType: 12
     generated: false
-    name: RDB$PRIVILEGE
+    name: SEC$MIDDLE_NAME
     primaryKey: false
     visible: true
-  RDB$GRANT_OPTION:
+  SEC$LAST_NAME:
     caseSensitive: false
-    dataType: 5
+    dataType: 12
     generated: false
-    name: RDB$GRANT_OPTION
+    name: SEC$LAST_NAME
     primaryKey: false
     visible: true
-  RDB$RELATION_NAME:
+  SEC$ACTIVE:
     caseSensitive: false
-    dataType: 1
+    dataType: 16
     generated: false
-    name: RDB$RELATION_NAME
+    name: SEC$ACTIVE
     primaryKey: false
     visible: true
-  RDB$FIELD_NAME:
+  SEC$ADMIN:
     caseSensitive: false
-    dataType: 1
+    dataType: 16
     generated: false
-    name: RDB$FIELD_NAME
+    name: SEC$ADMIN
     primaryKey: false
     visible: true
-  RDB$USER_TYPE:
+  SEC$DESCRIPTION:
     caseSensitive: false
-    dataType: 5
+    dataType: 2004
     generated: false
-    name: RDB$USER_TYPE
+    name: SEC$DESCRIPTION
     primaryKey: false
     visible: true
-  RDB$OBJECT_TYPE:
+  SEC$PLUGIN:
     caseSensitive: false
-    dataType: 5
+    dataType: 1
     generated: false
-    name: RDB$OBJECT_TYPE
+    name: SEC$PLUGIN
     primaryKey: false
     visible: true
diff --git a/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/loader/FirebirdSchemaMetaDataLoaderTest.java b/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/loader/FirebirdSchemaMetaDataLoaderTest.java
new file mode 100644
index 00000000000..74095781609
--- /dev/null
+++ b/database/connector/dialect/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/data/loader/FirebirdSchemaMetaDataLoaderTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.database.connector.firebird.metadata.data.loader;
+
+import com.cedarsoftware.util.CaseInsensitiveSet;
+import org.apache.shardingsphere.database.connector.core.metadata.data.loader.type.SchemaMetaDataLoader;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class FirebirdSchemaMetaDataLoaderTest {
+    
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private DataSource dataSource;
+    
+    private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "Firebird");
+    
+    @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
+    @BeforeEach
+    void setUp() throws SQLException {
+        ResultSet tableResultSet = mockTableResultSet();
+        when(dataSource.getConnection().getMetaData().getTables("catalog", "sharding_db", null, new String[]{"TABLE", "PARTITIONED TABLE", "VIEW", "SYSTEM TABLE", "SYSTEM VIEW"}))
+                .thenReturn(tableResultSet);
+        when(dataSource.getConnection().getCatalog()).thenReturn("catalog");
+        when(dataSource.getConnection().getSchema()).thenReturn("sharding_db");
+        ResultSet schemaResultSet = mockSchemaResultSet();
+        when(dataSource.getConnection().getMetaData().getSchemas()).thenReturn(schemaResultSet);
+    }
+    
+    private ResultSet mockTableResultSet() throws SQLException {
+        ResultSet result = mock(ResultSet.class);
+        when(result.next()).thenReturn(true, true, true, true, true, false);
+        when(result.getString("TABLE_NAME")).thenReturn("tbl", "$tbl", "/tbl", "##tbl", "partitioned_tbl", "RDB$RELATIONS", "RDB$REL", "RDB_Relations", "rdb$functions");
+        return result;
+    }
+    
+    private ResultSet mockSchemaResultSet() throws SQLException {
+        ResultSet result = mock(ResultSet.class);
+        when(result.next()).thenReturn(true, true, true, true, false);
+        when(result.getString("TABLE_SCHEM")).thenReturn("system_tables", "sharding_db", "schema1", "schema2");
+        return result;
+    }
+    
+    @Test
+    void assertLoadSchemaTableNames() throws SQLException {
+        Map<String, Collection<String>> schemaTableNames = Collections.singletonMap("foo_db", new CaseInsensitiveSet<>(Arrays.asList("tbl", "partitioned_tbl")));
+        assertThat(new SchemaMetaDataLoader(databaseType).loadSchemaTableNames("foo_db", dataSource, Collections.emptyList()), is(schemaTableNames));
+    }
+    
+    @Test
+    void assertLoadSchemaNames() throws SQLException {
+        assertThat(new SchemaMetaDataLoader(databaseType).loadSchemaNames(dataSource.getConnection()), is(Collections.singletonList("sharding_db")));
+    }
+}
diff --git a/database/connector/type/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java b/database/connector/type/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java
new file mode 100644
index 00000000000..18ecac6ab48
--- /dev/null
+++ b/database/connector/type/firebird/src/test/java/org/apache/shardingsphere/database/connector/firebird/metadata/database/system/FirebirdSystemDatabaseTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.database.connector.firebird.metadata.database.system;
+
+import org.apache.shardingsphere.database.connector.core.metadata.database.system.DialectSystemDatabase;
+import org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
+import org.junit.jupiter.api.Test;
+
+import java.util.Collections;
+import java.util.HashSet;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+class FirebirdSystemDatabaseTest {
+    
+    private final DialectSystemDatabase systemDatabase = DatabaseTypedSPILoader.getService(DialectSystemDatabase.class, TypedSPILoader.getService(DatabaseType.class, "Firebird"));
+
+    @Test
+    void assertGetSystemSchemas() {
+        assertThat(systemDatabase.getSystemSchemas(), is(new HashSet<>(Collections.singletonList("system_tables"))));
+    }
+
+    @Test
+    void assertGetSystemSchemasByDatabaseName() {
+        assertThat(systemDatabase.getSystemDatabaseSchemaMap().get("sharding_db"), is(Collections.singleton("system_tables")));
+        assertThat(systemDatabase.getSystemDatabaseSchemaMap().get("logic_db"), is(Collections.singleton("system_tables")));
+        assertThat(systemDatabase.getSystemDatabaseSchemaMap().get("firebird"), is(Collections.singleton("system_tables")));
+    }
+}
diff --git a/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java b/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java
index cb96ecf5992..ad845566744 100644
--- a/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java
+++ b/proxy/frontend/dialect/firebird/src/main/java/org/apache/shardingsphere/proxy/frontend/firebird/command/query/statement/prepare/FirebirdPrepareStatementCommandExecutor.java
@@ -225,6 +225,10 @@ public final class FirebirdPrepareStatementCommandExecutor implements CommandExe
             if (each instanceof ColumnProjection) {
                 String tableName = ((ColumnProjection) each).getOriginalTable().getValue();
                 ShardingSphereTable table = schema.getTable(tableName.isEmpty() ? getTableNames(sqlStatementContext).iterator().next() : tableName);
+                if (table == null) {
+                    table = metaDataContexts.getMetaData().getDatabase(databaseName).getSchema("system_tables")
+                            .getTable(tableName.isEmpty() ? getTableNames(sqlStatementContext).iterator().next() : tableName);
+                }
                 ShardingSphereColumn column = table.getColumn(((ColumnProjection) each).getOriginalColumn().getValue());
                 processColumn(describeColumns, requestedItems, table, column, ((ColumnProjection) each).getOwner().orElse(null), each.getAlias().orElse(null), ++columnCount);
             } else if (each instanceof ExpressionProjection) {