hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!3205 【5.0.0回合master】修复重复索引问题

Browse Source 
Merge pull request !3205 from Cross-罗/test_master
This commit is contained in:
opengauss-bot
2023-03-21 07:43:40 +00:00
committed by Gitee
parent 812b102943 0f71ab5f74
commit 96c639970b
6 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/backend/utils/init/globals.cpp
View File

@ -59,7 +59,7 @@ bool open_join_children = true;
bool will_shutdown = false;
/* hard-wired binary version number */
const uint32 GRAND_VERSION_NUM = 92847;
const uint32 GRAND_VERSION_NUM = 92848;
const uint32 SRF_FUSION_VERSION_NUM = 92847;
const uint32 INNER_UNIQUE_VERSION_NUM = 92845;

2
src/include/catalog/indexing.h
View File

@ -237,8 +237,6 @@ DECLARE_UNIQUE_INDEX(pg_pltemplate_name_index, 1137, on pg_pltemplate using btre
DECLARE_UNIQUE_INDEX(pg_proc_oid_index, 2690, on pg_proc using btree(oid oid_ops));
#define ProcedureOidIndexId 2690
DECLARE_INDEX(pg_proc_proname_args_nsp_index, 2691, on pg_proc using btree(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops));
#define ProcedureNameArgsNspIndexId 2691
DECLARE_INDEX(pg_proc_proname_all_args_nsp_index, 9666, on pg_proc using btree(proname name_ops, allargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops));
#define ProcedureNameAllArgsNspIndexId 9666

13
src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_848.sql Normal file
View File

@ -0,0 +1,13 @@
DO $$
BEGIN
if working_version_num() < 92507 then
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
CREATE UNIQUE INDEX IF NOT EXISTS pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops);
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
elseif working_version_num() < 92609 or working_version_num() > 92655 then
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
CREATE INDEX IF NOT EXISTS pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops);
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
end if;
END
$$;

13
src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_848.sql Normal file
View File

@ -0,0 +1,13 @@
DO $$
BEGIN
if working_version_num() < 92507 then
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
CREATE UNIQUE INDEX IF NOT EXISTS pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops);
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
elseif working_version_num() < 92609 or working_version_num() > 92655 then
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 2691;
CREATE INDEX IF NOT EXISTS pg_catalog.pg_proc_proname_args_nsp_index on pg_catalog.pg_proc USING BTREE(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops, propackageid oid_ops);
SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
end if;
END
$$;

1
src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_848.sql Normal file
View File

@ -0,0 +1 @@
DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;

1
src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_848.sql Normal file
View File

@ -0,0 +1 @@
DROP INDEX IF EXISTS pg_catalog.pg_proc_proname_args_nsp_index;