diff --git a/src/include/catalog/gs_model.h b/src/include/catalog/gs_model.h
index d64c52435..01f72003f 100644
--- a/src/include/catalog/gs_model.h
+++ b/src/include/catalog/gs_model.h
@@ -50,8 +50,8 @@ CATALOG(gs_model_warehouse,3991) BKI_ROWTYPE_OID(3994) BKI_SCHEMA_MACRO
     timestamp   createtime;     /* Model storage time */
     int4        processedtuples;
     int4        discardedtuples;
-    float4      pre_process_time;
-    float4      exec_time;
+    float4      preprocesstime;
+    float4      exectime;
     int4        iterations;
     Oid         outputtype;
 #ifdef CATALOG_VARLEN /* variable-length fields start here */
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_305.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_305.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_305.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_305.sql
new file mode 100644
index 000000000..fd6ac3901
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback_catalog_maindb_92_305.sql
@@ -0,0 +1,10 @@
+DROP SCHEMA IF EXISTS db4ai cascade;
+
+--delete system relation pg_catalog.gs_model_warehouse and its indexes
+DROP INDEX IF EXISTS pg_toast.pg_toast_3991_index;
+DROP TYPE IF EXISTS pg_toast.pg_toast_3991;
+DROP TABLE IF EXISTS pg_toast.pg_toast_3991;
+DROP INDEX IF EXISTS pg_catalog.gs_model_oid_index;
+DROP INDEX IF EXISTS pg_catalog.gs_model_name_index;
+DROP TYPE IF EXISTS pg_catalog.gs_model_warehouse;
+DROP TABLE IF EXISTS pg_catalog.gs_model_warehouse;
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_305.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_305.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_305.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_305.sql
new file mode 100644
index 000000000..fd6ac3901
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback_catalog_otherdb_92_305.sql
@@ -0,0 +1,10 @@
+DROP SCHEMA IF EXISTS db4ai cascade;
+
+--delete system relation pg_catalog.gs_model_warehouse and its indexes
+DROP INDEX IF EXISTS pg_toast.pg_toast_3991_index;
+DROP TYPE IF EXISTS pg_toast.pg_toast_3991;
+DROP TABLE IF EXISTS pg_toast.pg_toast_3991;
+DROP INDEX IF EXISTS pg_catalog.gs_model_oid_index;
+DROP INDEX IF EXISTS pg_catalog.gs_model_name_index;
+DROP TYPE IF EXISTS pg_catalog.gs_model_warehouse;
+DROP TABLE IF EXISTS pg_catalog.gs_model_warehouse;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_305.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_305.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_305.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_305.sql
new file mode 100644
index 000000000..d38216c71
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade_catalog_maindb_92_305.sql
@@ -0,0 +1,42 @@
+DROP SCHEMA IF EXISTS db4ai cascade;
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_NAMESPACE, 4991;
+CREATE SCHEMA db4ai;
+COMMENT ON schema db4ai IS 'db4ai schema';
+
+/* Create table gs_model_warehouse */
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 3991, 3994, 3995, 3996;
+
+CREATE TABLE IF NOT EXISTS pg_catalog.gs_model_warehouse
+(
+    modelname name NOCOMPRESS NOT NULL,
+    modelowner Oid NOCOMPRESS NOT NULL,
+    createtime timestamp with time zone NOCOMPRESS NOT NULL,
+    processedtuples int4 NOCOMPRESS NOT NULL,
+    discardedtuples int4 NOCOMPRESS NOT NULL,
+    preprocesstime float4 NOCOMPRESS NOT NULL,
+    exectime float4 NOCOMPRESS NOT NULL,
+    iterations int4 NOCOMPRESS NOT NULL,
+    outputtype Oid NOCOMPRESS NOT NULL,
+    modeltype text,
+    query text,
+    modeldata bytea,
+    weight float4[1],
+    hyperparametersnames text[1],
+    hyperparametersvalues text[1],
+    hyperparametersoids Oid[1],
+    coefnames text[1],
+    coefvalues text[1],
+    coefoids Oid[1],
+    trainingscoresname text[1],
+    trainingscoresvalue float4[1],
+    modeldescribe text[1]
+)WITH OIDS TABLESPACE pg_default;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3992;
+CREATE UNIQUE INDEX gs_model_oid_index ON pg_catalog.gs_model_warehouse USING BTREE(oid OID_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3993;
+CREATE UNIQUE INDEX gs_model_name_index ON pg_catalog.gs_model_warehouse USING BTREE(modelname name_ops);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+GRANT SELECT ON TABLE pg_catalog.gs_model_warehouse TO PUBLIC;
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_305.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_305.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_305.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_305.sql
new file mode 100644
index 000000000..d38216c71
--- /dev/null
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade_catalog_otherdb_92_305.sql
@@ -0,0 +1,42 @@
+DROP SCHEMA IF EXISTS db4ai cascade;
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_NAMESPACE, 4991;
+CREATE SCHEMA db4ai;
+COMMENT ON schema db4ai IS 'db4ai schema';
+
+/* Create table gs_model_warehouse */
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 3991, 3994, 3995, 3996;
+
+CREATE TABLE IF NOT EXISTS pg_catalog.gs_model_warehouse
+(
+    modelname name NOCOMPRESS NOT NULL,
+    modelowner Oid NOCOMPRESS NOT NULL,
+    createtime timestamp with time zone NOCOMPRESS NOT NULL,
+    processedtuples int4 NOCOMPRESS NOT NULL,
+    discardedtuples int4 NOCOMPRESS NOT NULL,
+    preprocesstime float4 NOCOMPRESS NOT NULL,
+    exectime float4 NOCOMPRESS NOT NULL,
+    iterations int4 NOCOMPRESS NOT NULL,
+    outputtype Oid NOCOMPRESS NOT NULL,
+    modeltype text,
+    query text,
+    modeldata bytea,
+    weight float4[1],
+    hyperparametersnames text[1],
+    hyperparametersvalues text[1],
+    hyperparametersoids Oid[1],
+    coefnames text[1],
+    coefvalues text[1],
+    coefoids Oid[1],
+    trainingscoresname text[1],
+    trainingscoresvalue float4[1],
+    modeldescribe text[1]
+)WITH OIDS TABLESPACE pg_default;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3992;
+CREATE UNIQUE INDEX gs_model_oid_index ON pg_catalog.gs_model_warehouse USING BTREE(oid OID_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3993;
+CREATE UNIQUE INDEX gs_model_name_index ON pg_catalog.gs_model_warehouse USING BTREE(modelname name_ops);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+GRANT SELECT ON TABLE pg_catalog.gs_model_warehouse TO PUBLIC;