From cc3def5c0f8eefd9af05aad50918013d2717ec43 Mon Sep 17 00:00:00 2001 From: maxiang Date: Thu, 13 Mar 2025 20:22:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpg=5Fset=20reltypeoid?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/include/catalog/pg_set.h | 4 +-- .../rollback-post_catalog_maindb_92_812.sql | 9 ------ .../rollback-post_catalog_maindb_93_038.sql | 10 +++++- .../rollback-post_catalog_otherdb_92_812.sql | 9 ------ .../rollback-post_catalog_otherdb_93_038.sql | 10 +++++- .../upgrade-post_catalog_maindb_92_812.sql | 27 ---------------- .../upgrade-post_catalog_maindb_93_038.sql | 32 ++++++++++++++++++- .../upgrade-post_catalog_otherdb_92_812.sql | 27 ---------------- .../upgrade-post_catalog_otherdb_93_038.sql | 32 ++++++++++++++++++- 9 files changed, 82 insertions(+), 78 deletions(-) diff --git a/src/include/catalog/pg_set.h b/src/include/catalog/pg_set.h index 9c5177b2c8..c3aa480984 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/rollback_catalog_maindb/rollback-post_catalog_maindb_92_812.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_812.sql index 9b20a17887..33855a671f 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_812.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_812.sql @@ -240,14 +240,5 @@ END; DROP TYPE IF EXISTS pg_catalog.anyset CASCADE; --------------------------------------------------------------- --- delete pg_set --------------------------------------------------------------- -DROP INDEX IF EXISTS pg_catalog.pg_set_typid_order_index; -DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index; -DROP INDEX IF EXISTS pg_catalog.pg_set_oid_index; -DROP TYPE IF EXISTS pg_catalog.pg_set; -DROP TABLE IF EXISTS pg_catalog.pg_set; - END IF; END $upgrade$; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_93_038.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_93_038.sql index 75de2b7009..0694a5051b 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_93_038.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_93_038.sql @@ -1 +1,9 @@ -DROP FUNCTION IF EXISTS pg_catalog.to_char(unknown, unknown) CASCADE; \ No newline at end of file +DROP FUNCTION IF EXISTS pg_catalog.to_char(unknown, unknown) CASCADE; +-------------------------------------------------------------- +-- delete pg_set +-------------------------------------------------------------- +DROP INDEX IF EXISTS pg_catalog.pg_set_typid_order_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_oid_index; +DROP TYPE IF EXISTS pg_catalog.pg_set; +DROP TABLE IF EXISTS pg_catalog.pg_set; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_812.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_812.sql index 9b20a17887..33855a671f 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_812.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_812.sql @@ -240,14 +240,5 @@ END; DROP TYPE IF EXISTS pg_catalog.anyset CASCADE; --------------------------------------------------------------- --- delete pg_set --------------------------------------------------------------- -DROP INDEX IF EXISTS pg_catalog.pg_set_typid_order_index; -DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index; -DROP INDEX IF EXISTS pg_catalog.pg_set_oid_index; -DROP TYPE IF EXISTS pg_catalog.pg_set; -DROP TABLE IF EXISTS pg_catalog.pg_set; - END IF; END $upgrade$; diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_93_038.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_93_038.sql index 75de2b7009..0694a5051b 100644 --- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_93_038.sql +++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_93_038.sql @@ -1 +1,9 @@ -DROP FUNCTION IF EXISTS pg_catalog.to_char(unknown, unknown) CASCADE; \ No newline at end of file +DROP FUNCTION IF EXISTS pg_catalog.to_char(unknown, unknown) CASCADE; +-------------------------------------------------------------- +-- delete pg_set +-------------------------------------------------------------- +DROP INDEX IF EXISTS pg_catalog.pg_set_typid_order_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_oid_index; +DROP TYPE IF EXISTS pg_catalog.pg_set; +DROP TABLE IF EXISTS pg_catalog.pg_set; \ No newline at end of file diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql index 8c1cdd1c08..b6fe8605ae 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_812.sql @@ -1,33 +1,6 @@ DO $upgrade$ BEGIN IF working_version_num() < 92780 then --------------------------------------------------------------- --- add pg_set table --------------------------------------------------------------- -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; - -------------------------------------------------------------- -- add new data type : anyset -------------------------------------------------------------- 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 146a7980ed..adb42d8c2b 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_typid_order_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_oid_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_92_812.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql index 8c1cdd1c08..b6fe8605ae 100644 --- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql +++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_812.sql @@ -1,33 +1,6 @@ DO $upgrade$ BEGIN IF working_version_num() < 92780 then --------------------------------------------------------------- --- add pg_set table --------------------------------------------------------------- -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; - -------------------------------------------------------------- -- add new data type : anyset -------------------------------------------------------------- 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 146a7980ed..adb42d8c2b 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_typid_order_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_typid_label_index; +DROP INDEX IF EXISTS pg_catalog.pg_set_oid_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 -- Gitee