diff --git a/src/include/catalog/pg_set.h b/src/include/catalog/pg_set.h
index 9c5177b2c807d0549ed0a4066de2cc441bcf9902..c3aa48098485fa71b65f18eef69386c5bf5b3651 100644
--- a/src/include/catalog/pg_set.h
+++ b/src/include/catalog/pg_set.h
@@ -42,9 +42,9 @@
  * ----------------
  */
 #define SetRelationId    3516
-#define SetRelation_Rowtype_Id 11654
+#define SetRelation_Rowtype_Id 9377
 
-CATALOG(pg_set,3516) BKI_SCHEMA_MACRO
+CATALOG(pg_set,3516) BKI_ROWTYPE_OID(9377) BKI_SCHEMA_MACRO
 {
     Oid     settypid;        /* OID of set type */
     int1    setnum;          /* number of set value, not include null string */
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql
index 146a7980ed8970bb89e2a3b960f826c9bcbab00a..f01a802c4247539e131feb483ae8cfae5e70697d 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_93_038.sql
@@ -74,4 +74,34 @@ DROP FUNCTION IF EXISTS pg_catalog.gs_repair_urq(oid, OUT result text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_meta(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_record(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_translot(text, int8, int8, boolean, OUT zone_id int8, OUT detail text) CASCADE;
-DROP FUNCTION IF EXISTS pg_catalog.gs_verify_urq(oid, text, int8, text, OUT error_code text, OUT detail text) CASCADE;
\ No newline at end of file
+DROP FUNCTION IF EXISTS pg_catalog.gs_verify_urq(oid, text, int8, text, OUT error_code text, OUT detail text) CASCADE;
+
+--------------------------------------------------------------
+-- add pg_set table
+--------------------------------------------------------------
+DROP INDEX IF EXISTS pg_catalog.pg_set_oid_index;
+DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index;
+DROP INDEX IF EXISTS pg_catalog.pg_set_typid_order_index;
+DROP TYPE IF EXISTS pg_catalog.pg_set;
+DROP TABLE IF EXISTS pg_catalog.pg_set;
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 3516, 9377, 0, 0;
+CREATE TABLE pg_catalog.pg_set
+(
+  settypid oid NOT NULL,
+  setnum tinyint NOT NULL,
+  setsortorder tinyint NOT NULL,
+  setlabel text NOCOMPRESS
+) WITH OIDS TABLESPACE pg_default;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3517;
+CREATE UNIQUE INDEX pg_set_oid_index ON pg_catalog.pg_set USING BTREE(oid OID_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3518;
+CREATE UNIQUE INDEX pg_set_typid_label_index ON pg_catalog.pg_set USING BTREE(settypid OID_OPS, setlabel TEXT_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3519;
+CREATE UNIQUE INDEX pg_set_typid_order_index ON pg_catalog.pg_set USING BTREE(settypid OID_OPS, setsortorder INT1_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+
+GRANT SELECT ON TABLE pg_catalog.pg_set TO PUBLIC;
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql
index 146a7980ed8970bb89e2a3b960f826c9bcbab00a..f01a802c4247539e131feb483ae8cfae5e70697d 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_93_038.sql
@@ -74,4 +74,34 @@ DROP FUNCTION IF EXISTS pg_catalog.gs_repair_urq(oid, OUT result text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_meta(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_record(text, int8, int8, boolean, OUT zone_id oid, OUT detail text) CASCADE;
 DROP FUNCTION IF EXISTS pg_catalog.gs_verify_undo_translot(text, int8, int8, boolean, OUT zone_id int8, OUT detail text) CASCADE;
-DROP FUNCTION IF EXISTS pg_catalog.gs_verify_urq(oid, text, int8, text, OUT error_code text, OUT detail text) CASCADE;
\ No newline at end of file
+DROP FUNCTION IF EXISTS pg_catalog.gs_verify_urq(oid, text, int8, text, OUT error_code text, OUT detail text) CASCADE;
+
+--------------------------------------------------------------
+-- add pg_set table
+--------------------------------------------------------------
+DROP INDEX IF EXISTS pg_catalog.pg_set_oid_index;
+DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index;
+DROP INDEX IF EXISTS pg_catalog.pg_set_typid_order_index;
+DROP TYPE IF EXISTS pg_catalog.pg_set;
+DROP TABLE IF EXISTS pg_catalog.pg_set;
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 3516, 9377, 0, 0;
+CREATE TABLE pg_catalog.pg_set
+(
+  settypid oid NOT NULL,
+  setnum tinyint NOT NULL,
+  setsortorder tinyint NOT NULL,
+  setlabel text NOCOMPRESS
+) WITH OIDS TABLESPACE pg_default;
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3517;
+CREATE UNIQUE INDEX pg_set_oid_index ON pg_catalog.pg_set USING BTREE(oid OID_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3518;
+CREATE UNIQUE INDEX pg_set_typid_label_index ON pg_catalog.pg_set USING BTREE(settypid OID_OPS, setlabel TEXT_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 3519;
+CREATE UNIQUE INDEX pg_set_typid_order_index ON pg_catalog.pg_set USING BTREE(settypid OID_OPS, setsortorder INT1_OPS);
+
+SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
+
+GRANT SELECT ON TABLE pg_catalog.pg_set TO PUBLIC;
\ No newline at end of file