This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 8efc5929e69 Move gp index declare from gp_index.h to others
8efc5929e69 is described below
commit 8efc5929e694a3a43e0698e5c0243ae6cdedbd70
Author: Jinbao Chen <[email protected]>
AuthorDate: Thu Oct 2 17:17:23 2025 +0800
Move gp index declare from gp_index.h to others
---
src/include/catalog/gp_distribution_policy.h | 1 +
src/include/catalog/gp_fastsequence.h | 1 +
src/include/catalog/gp_indexing.h | 64 +++-------------------------
src/include/catalog/gp_partition_template.h | 1 +
src/include/catalog/gp_storage_server.h | 6 +--
src/include/catalog/pg_appendonly.h | 1 +
src/include/catalog/pg_attribute_encoding.h | 2 +
src/include/catalog/pg_authid.h | 4 ++
src/include/catalog/pg_compression.h | 1 +
src/include/catalog/pg_extprotocol.h | 3 +-
src/include/catalog/pg_proc_callback.h | 3 +-
src/include/catalog/pg_resgroup.h | 3 +-
src/include/catalog/pg_resgroupcapability.h | 3 +-
src/include/catalog/pg_resourcetype.h | 3 ++
src/include/catalog/pg_resqueue.h | 3 +-
src/include/catalog/pg_resqueuecapability.h | 2 +
src/include/catalog/pg_stat_last_operation.h | 3 ++
src/include/catalog/pg_tag.h | 6 +--
src/include/catalog/pg_type_encoding.h | 1 +
19 files changed, 40 insertions(+), 71 deletions(-)
diff --git a/src/include/catalog/gp_distribution_policy.h
b/src/include/catalog/gp_distribution_policy.h
index fdb864e6813..da35a12b10f 100644
--- a/src/include/catalog/gp_distribution_policy.h
+++ b/src/include/catalog/gp_distribution_policy.h
@@ -40,6 +40,7 @@ CATALOG(gp_distribution_policy,7142,GpPolicyRelationId)
/* GPDB added foreign key definitions for gpcheckcat. */
FOREIGN_KEY(localoid REFERENCES pg_class(oid));
+DECLARE_UNIQUE_INDEX(gp_distribution_policy_localoid_index, 7167,
GpPolicyLocalOidIndexId, on gp_distribution_policy using btree(localoid
oid_ops));
/* ----------------
* Form_gp_distribution_policy corresponds to a pointer to a tuple
with
diff --git a/src/include/catalog/gp_fastsequence.h
b/src/include/catalog/gp_fastsequence.h
index 97014669a23..0854b3db694 100644
--- a/src/include/catalog/gp_fastsequence.h
+++ b/src/include/catalog/gp_fastsequence.h
@@ -32,6 +32,7 @@ CATALOG(gp_fastsequence,7023,FastSequenceRelationId)
/* GPDB added foreign key definitions for gpcheckcat. */
FOREIGN_KEY(objid REFERENCES pg_class(oid));
+DECLARE_UNIQUE_INDEX(gp_fastsequence_objid_objmod_index, 6067,
FastSequenceObjidObjmodIndexId, on gp_fastsequence using btree(objid oid_ops,
objmod int8_ops));
/* ----------------
* Form_gp_fastsequence corresponds to a pointer to a tuple with
diff --git a/src/include/catalog/gp_indexing.h
b/src/include/catalog/gp_indexing.h
index 0c5211bc02a..5fe96f8ddde 100644
--- a/src/include/catalog/gp_indexing.h
+++ b/src/include/catalog/gp_indexing.h
@@ -17,14 +17,7 @@
#include "catalog/genbki.h"
-DECLARE_INDEX(pg_authid_rolresqueue_index, 6029, on pg_authid using
btree(rolresqueue oid_ops));
-#define AuthIdRolResQueueIndexId 6029
-DECLARE_INDEX(pg_authid_rolresgroup_index, 6440, on pg_authid using
btree(rolresgroup oid_ops));
-#define AuthIdRolResGroupIndexId 6440
-DECLARE_INDEX(pg_authid_rolprofile_index, 6441, on pg_authid using
btree(rolprofile oid_ops));
-#define AuthIdRolProfileIndexId 6441
-DECLARE_INDEX(pg_auth_time_constraint_authid_index, 6449, on
pg_auth_time_constraint using btree(authid oid_ops));
-#define AuthTimeConstraintAuthIdIndexId 6449
+
/* GPDB_14_MERGE_FIXME: not used in upstream anymore */
/*
@@ -32,63 +25,18 @@ DECLARE_UNIQUE_INDEX(pg_pltemplate_name_index, 1137, on
pg_pltemplate using btre
#define PLTemplateNameIndexId 1137
*/
-DECLARE_UNIQUE_INDEX(gp_distribution_policy_localoid_index, 7167, on
gp_distribution_policy using btree(localoid oid_ops));
-#define GpPolicyLocalOidIndexId 7167
-DECLARE_UNIQUE_INDEX(pg_appendonly_relid_index, 7141, on pg_appendonly using
btree(relid oid_ops));
-#define AppendOnlyRelidIndexId 7141
-DECLARE_UNIQUE_INDEX(gp_fastsequence_objid_objmod_index, 6067, on
gp_fastsequence using btree(objid oid_ops, objmod int8_ops));
-#define FastSequenceObjidObjmodIndexId 6067
/* MPP-6929: metadata tracking */
-DECLARE_UNIQUE_INDEX(pg_statlastop_classid_objid_staactionname_index, 6054, on
pg_stat_last_operation using btree(classid oid_ops, objid oid_ops,
staactionname name_ops));
-#define StatLastOpClassidObjidStaactionnameIndexId 6054
/* Note: no dbid */
-DECLARE_INDEX(pg_statlastshop_classid_objid_index, 6057, on
pg_stat_last_shoperation using btree(classid oid_ops, objid oid_ops));
-#define StatLastShOpClassidObjidIndexId 6057
-DECLARE_UNIQUE_INDEX(pg_statlastshop_classid_objid_staactionname_index, 6058,
on pg_stat_last_shoperation using btree(classid oid_ops, objid oid_ops,
staactionname name_ops));
-#define StatLastShOpClassidObjidStaactionnameIndexId 6058
-DECLARE_UNIQUE_INDEX(pg_resqueue_oid_index, 6027, on pg_resqueue using
btree(oid oid_ops));
-#define ResQueueOidIndexId 6027
-DECLARE_UNIQUE_INDEX(pg_resqueue_rsqname_index, 6028, on pg_resqueue using
btree(rsqname name_ops));
-#define ResQueueRsqnameIndexId 6028
-DECLARE_UNIQUE_INDEX(pg_resourcetype_oid_index, 6061, on pg_resourcetype using
btree(oid oid_ops));
-#define ResourceTypeOidIndexId 6061
-DECLARE_UNIQUE_INDEX(pg_resourcetype_restypid_index, 6062, on pg_resourcetype
using btree(restypid int2_ops));
-#define ResourceTypeRestypidIndexId 6062
-DECLARE_UNIQUE_INDEX(pg_resourcetype_resname_index, 6063, on pg_resourcetype
using btree(resname name_ops));
-#define ResourceTypeResnameIndexId 6063
-DECLARE_INDEX(pg_resqueuecapability_resqueueid_index, 6442, on
pg_resqueuecapability using btree(resqueueid oid_ops));
-#define ResQueueCapabilityResqueueidIndexId 6442
-DECLARE_INDEX(pg_resqueuecapability_restypid_index, 6443, on
pg_resqueuecapability using btree(restypid int2_ops));
-#define ResQueueCapabilityRestypidIndexId 6443
-DECLARE_UNIQUE_INDEX(pg_resgroup_oid_index, 6447, on pg_resgroup using
btree(oid oid_ops));
-#define ResGroupOidIndexId 6447
-DECLARE_UNIQUE_INDEX(pg_resgroup_rsgname_index, 6444, on pg_resgroup using
btree(rsgname name_ops));
-#define ResGroupRsgnameIndexId 6444
-DECLARE_UNIQUE_INDEX(pg_resgroupcapability_resgroupid_reslimittype_index,
6445, on pg_resgroupcapability using btree(resgroupid oid_ops, reslimittype
int2_ops));
-#define ResGroupCapabilityResgroupidResLimittypeIndexId 6445
-DECLARE_INDEX(pg_resgroupcapability_resgroupid_index, 6446, on
pg_resgroupcapability using btree(resgroupid oid_ops));
-#define ResGroupCapabilityResgroupidIndexId 6446
-DECLARE_UNIQUE_INDEX(pg_extprotocol_oid_index, 7156, on pg_extprotocol using
btree(oid oid_ops));
-#define ExtprotocolOidIndexId 7156
-DECLARE_UNIQUE_INDEX(pg_extprotocol_ptcname_index, 7177, on pg_extprotocol
using btree(ptcname name_ops));
-#define ExtprotocolPtcnameIndexId 7177
-DECLARE_INDEX(pg_attribute_encoding_attrelid_index, 6236, on
pg_attribute_encoding using btree(attrelid oid_ops));
-#define AttributeEncodingAttrelidIndexId 6236
-DECLARE_UNIQUE_INDEX(pg_attribute_encoding_attrelid_attnum_index, 6237, on
pg_attribute_encoding using btree(attrelid oid_ops, attnum int2_ops));
+
+
+
+
+
/* GPDB_14_MERGE_FIXME: seems not directly used */
-#define AttributeEncodingAttrelidAttnumIndexId 6237
-DECLARE_UNIQUE_INDEX(pg_type_encoding_typid_index, 6207, on pg_type_encoding
using btree(typid oid_ops));
-#define TypeEncodingTypidIndexId 6207
-DECLARE_UNIQUE_INDEX(pg_proc_callback_profnoid_promethod_index, 9926, on
pg_proc_callback using btree(profnoid oid_ops, promethod char_ops));
-#define ProcCallbackProfnoidPromethodIndexId 9926
-DECLARE_UNIQUE_INDEX(pg_compression_compname_index, 7059, on pg_compression
using btree(compname name_ops));
-#define CompressionCompnameIndexId 7059
/* GPDB_14_MERGE_FIXME: oid conflicts, assgin new */
-DECLARE_UNIQUE_INDEX(gp_partition_template_relid_level_index, 7168, on
gp_partition_template using btree(relid oid_ops, level int2_ops));
-#define GpPartitionTemplateRelidLevelIndexId 7168
#endif /* GP_INDEXING_H */
diff --git a/src/include/catalog/gp_partition_template.h
b/src/include/catalog/gp_partition_template.h
index 4353427f9ff..b7ee41e29c2 100644
--- a/src/include/catalog/gp_partition_template.h
+++ b/src/include/catalog/gp_partition_template.h
@@ -40,6 +40,7 @@
CATALOG(gp_partition_template,7131,PartitionTemplateRelationId)
} FormData_gp_partition_template;
FOREIGN_KEY(relid REFERENCES pg_class(oid));
+DECLARE_UNIQUE_INDEX(gp_partition_template_relid_level_index, 7168,
GpPartitionTemplateRelidLevelIndexId, on gp_partition_template using
btree(relid oid_ops, level int2_ops));
/* ----------------
* Form_gp_partition_template corresponds to a pointer to a tuple
with
diff --git a/src/include/catalog/gp_storage_server.h
b/src/include/catalog/gp_storage_server.h
index 25ccfaccf80..18647332486 100644
--- a/src/include/catalog/gp_storage_server.h
+++ b/src/include/catalog/gp_storage_server.h
@@ -65,9 +65,7 @@ DECLARE_TOAST(gp_storage_server, 6016, 6017);
#define GpStorageServerToastTable 6016
#define GpStorageServerToastIndex 6017
-DECLARE_UNIQUE_INDEX_PKEY(gp_storage_server_oid_index, 6018, on
gp_storage_server using btree(oid oid_ops));
-#define StorageServerOidIndexId 6018
-DECLARE_UNIQUE_INDEX(gp_storage_server_name_index, 6019, on gp_storage_server
using btree(srvname name_ops));
-#define StorageServerNameIndexId 6019
+DECLARE_UNIQUE_INDEX_PKEY(gp_storage_server_oid_index, 6018,
StorageServerOidIndexId, on gp_storage_server using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(gp_storage_server_name_index, 6019,
StorageServerNameIndexId, on gp_storage_server using btree(srvname name_ops));
#endif //GP_STORAGE_SERVER_H
diff --git a/src/include/catalog/pg_appendonly.h
b/src/include/catalog/pg_appendonly.h
index d73b0661990..d2f7023f9f0 100644
--- a/src/include/catalog/pg_appendonly.h
+++ b/src/include/catalog/pg_appendonly.h
@@ -43,6 +43,7 @@ CATALOG(pg_appendonly,6105,AppendOnlyRelationId)
/* GPDB added foreign key definitions for gpcheckcat. */
FOREIGN_KEY(relid REFERENCES pg_class(oid));
+DECLARE_UNIQUE_INDEX(pg_appendonly_relid_index, 7141, AppendOnlyRelidIndexId,
on pg_appendonly using btree(relid oid_ops));
/*
* Size of fixed part of pg_appendonly tuples, not counting var-length fields
diff --git a/src/include/catalog/pg_attribute_encoding.h
b/src/include/catalog/pg_attribute_encoding.h
index 094fb27ca4f..cf1e9a20754 100644
--- a/src/include/catalog/pg_attribute_encoding.h
+++ b/src/include/catalog/pg_attribute_encoding.h
@@ -60,6 +60,8 @@ typedef FormData_pg_attribute_encoding
*Form_pg_attribute_encoding;
DECLARE_TOAST(pg_attribute_encoding, 6412, 6427);
DECLARE_UNIQUE_INDEX(pg_attribute_encoding_attrelid_filenum_index, 6453,
AttributeEncodingAttrelidFilenumIndexId, on pg_attribute_encoding using
btree(attrelid oid_ops, filenum int2_ops));
+DECLARE_INDEX(pg_attribute_encoding_attrelid_index, 6467,
AttributeEncodingAttrelidIndexId, on pg_attribute_encoding using btree(attrelid
oid_ops));
+DECLARE_UNIQUE_INDEX(pg_attribute_encoding_attrelid_attnum_index, 6466,
AttributeEncodingAttrelidAttnumIndexId, on pg_attribute_encoding using
btree(attrelid oid_ops, attnum int2_ops));
extern PGFunction *get_funcs_for_compression(char *compresstype);
extern StdRdOptions **RelationGetAttributeOptions(Relation rel);
diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h
index bf86680b5fd..c9a76bb53ab 100644
--- a/src/include/catalog/pg_authid.h
+++ b/src/include/catalog/pg_authid.h
@@ -106,5 +106,9 @@ DECLARE_TOAST_WITH_MACRO(pg_authid, 4175, 4176,
PgAuthidToastTable, PgAuthidToas
DECLARE_UNIQUE_INDEX(pg_authid_rolname_index, 2676, AuthIdRolnameIndexId, on
pg_authid using btree(rolname name_ops));
DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index, 2677, AuthIdOidIndexId, on
pg_authid using btree(oid oid_ops));
+DECLARE_INDEX(pg_authid_rolresqueue_index, 6029, AuthIdRolResQueueIndexId, on
pg_authid using btree(rolresqueue oid_ops));
+DECLARE_INDEX(pg_authid_rolresgroup_index, 6440, AuthIdRolResGroupIndexId, on
pg_authid using btree(rolresgroup oid_ops));
+DECLARE_INDEX(pg_authid_rolprofile_index, 6441, AuthIdRolProfileIndexId, on
pg_authid using btree(rolprofile oid_ops));
+DECLARE_INDEX(pg_auth_time_constraint_authid_index, 6449,
AuthTimeConstraintAuthIdIndexId, on pg_auth_time_constraint using btree(authid
oid_ops));
#endif /* PG_AUTHID_H */
diff --git a/src/include/catalog/pg_compression.h
b/src/include/catalog/pg_compression.h
index e5fb5e936a5..c351be8dea2 100644
--- a/src/include/catalog/pg_compression.h
+++ b/src/include/catalog/pg_compression.h
@@ -46,6 +46,7 @@ FOREIGN_KEY(compcompressor REFERENCES pg_proc(oid));
FOREIGN_KEY(compdecompressor REFERENCES pg_proc(oid));
FOREIGN_KEY(compvalidator REFERENCES pg_proc(oid));
FOREIGN_KEY(compowner REFERENCES pg_authid(oid));
+DECLARE_UNIQUE_INDEX(pg_compression_compname_index, 7059,
CompressionCompnameIndexId, on pg_compression using btree(compname name_ops));
/* ----------------
* Form_pg_compression corresponds to a pointer to a tuple with
diff --git a/src/include/catalog/pg_extprotocol.h
b/src/include/catalog/pg_extprotocol.h
index cab50affd13..8e65e993db7 100644
--- a/src/include/catalog/pg_extprotocol.h
+++ b/src/include/catalog/pg_extprotocol.h
@@ -43,7 +43,8 @@ CATALOG(pg_extprotocol,7175,ExtprotocolRelationId)
FOREIGN_KEY(ptcreadfn REFERENCES pg_proc(oid));
FOREIGN_KEY(ptcwritefn REFERENCES pg_proc(oid));
FOREIGN_KEY(ptcvalidatorfn REFERENCES pg_proc(oid));
-
+DECLARE_UNIQUE_INDEX(pg_extprotocol_oid_index, 7156, ExtprotocolOidIndexId, on
pg_extprotocol using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_extprotocol_ptcname_index, 7177,
ExtprotocolPtcnameIndexId, on pg_extprotocol using btree(ptcname name_ops));
/* ----------------
* Form_pg_extprotocol corresponds to a pointer to a tuple with
* the format of pg_extprotocol relation.
diff --git a/src/include/catalog/pg_proc_callback.h
b/src/include/catalog/pg_proc_callback.h
index a0aac88041a..186a841fb88 100644
--- a/src/include/catalog/pg_proc_callback.h
+++ b/src/include/catalog/pg_proc_callback.h
@@ -42,8 +42,9 @@ FOREIGN_KEY(procallback REFERENCES pg_proc(oid));
* Form_pg_proc_callback corresponds to a pointer to a tuple with
* the format of pg_proc_callback relation.
* ----------------
- */
+ */\
typedef FormData_pg_proc_callback *Form_pg_proc_callback;
+DECLARE_UNIQUE_INDEX(pg_proc_callback_profnoid_promethod_index, 9926,
ProcCallbackProfnoidPromethodIndexId, on pg_proc_callback using btree(profnoid
oid_ops, promethod char_ops));
/* values for promethod */
#define PROMETHOD_DESCRIBE 'd'
diff --git a/src/include/catalog/pg_resgroup.h
b/src/include/catalog/pg_resgroup.h
index 4dd603f8f86..37298b98ec4 100644
--- a/src/include/catalog/pg_resgroup.h
+++ b/src/include/catalog/pg_resgroup.h
@@ -33,7 +33,8 @@ CATALOG(pg_resgroup,6436,ResGroupRelationId)
BKI_SHARED_RELATION
} FormData_pg_resgroup;
/* no foreign keys */
-
+DECLARE_UNIQUE_INDEX(pg_resgroup_oid_index, 6447, ResGroupOidIndexId, on
pg_resgroup using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_resgroup_rsgname_index, 6444, ResGroupRsgnameIndexId,
on pg_resgroup using btree(rsgname name_ops));
/* ----------------
* Form_pg_resgroup corresponds to a pointer to a tuple with
* the format of pg_resgroup relation.
diff --git a/src/include/catalog/pg_resgroupcapability.h
b/src/include/catalog/pg_resgroupcapability.h
index 7b203125c62..fe820974ec9 100644
--- a/src/include/catalog/pg_resgroupcapability.h
+++ b/src/include/catalog/pg_resgroupcapability.h
@@ -31,7 +31,8 @@
CATALOG(pg_resgroupcapability,6439,ResGroupCapabilityRelationId) BKI_SHARED_RELA
/* GPDB added foreign key definitions for gpcheckcat. */
FOREIGN_KEY(resgroupid REFERENCES pg_resgroup(oid));
-
+DECLARE_UNIQUE_INDEX(pg_resgroupcapability_resgroupid_reslimittype_index,
6445, ResGroupCapabilityResgroupidResLimittypeIndexId, on pg_resgroupcapability
using btree(resgroupid oid_ops, reslimittype int2_ops));
+DECLARE_INDEX(pg_resgroupcapability_resgroupid_index, 6446,
ResGroupCapabilityResgroupidIndexId, on pg_resgroupcapability using
btree(resgroupid oid_ops));
/* ----------------
* Form_pg_resgroupcapability corresponds to a pointer to a tuple with
* the format of pg_resgroupcapability relation.
diff --git a/src/include/catalog/pg_resourcetype.h
b/src/include/catalog/pg_resourcetype.h
index d27184407ec..8b9124745a9 100644
--- a/src/include/catalog/pg_resourcetype.h
+++ b/src/include/catalog/pg_resourcetype.h
@@ -76,6 +76,9 @@ CATALOG(pg_resourcetype,6059,ResourceTypeRelationId)
BKI_SHARED_RELATION
} FormData_pg_resourcetype;
/* no foreign keys */
+DECLARE_UNIQUE_INDEX(pg_resourcetype_oid_index, 6061, ResourceTypeOidIndexId,
on pg_resourcetype using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_resourcetype_restypid_index, 6062,
ResourceTypeRestypidIndexId, on pg_resourcetype using btree(restypid int2_ops));
+DECLARE_UNIQUE_INDEX(pg_resourcetype_resname_index, 6063,
ResourceTypeResnameIndexId, on pg_resourcetype using btree(resname name_ops));
/* ----------------
* Form_pg_resourcetype corresponds to a pointer to a tuple with
diff --git a/src/include/catalog/pg_resqueue.h
b/src/include/catalog/pg_resqueue.h
index fa68f11da62..15561adea53 100644
--- a/src/include/catalog/pg_resqueue.h
+++ b/src/include/catalog/pg_resqueue.h
@@ -45,7 +45,8 @@ CATALOG(pg_resqueue,6026,ResQueueRelationId)
BKI_SHARED_RELATION
} FormData_pg_resqueue;
/* no foreign keys */
-
+DECLARE_UNIQUE_INDEX(pg_resqueue_oid_index, 6027, ResQueueOidIndexId, on
pg_resqueue using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_resqueue_rsqname_index, 6028, ResQueueRsqnameIndexId,
on pg_resqueue using btree(rsqname name_ops));
/* ----------------
* Form_pg_resqueue corresponds to a pointer to a tuple with
* the format of pg_resqueue relation.
diff --git a/src/include/catalog/pg_resqueuecapability.h
b/src/include/catalog/pg_resqueuecapability.h
index c467423312d..e05955acbfb 100644
--- a/src/include/catalog/pg_resqueuecapability.h
+++ b/src/include/catalog/pg_resqueuecapability.h
@@ -41,6 +41,8 @@
CATALOG(pg_resqueuecapability,6060,ResQueueCapabilityRelationId) BKI_SHARED_RELA
FOREIGN_KEY(resqueueid REFERENCES pg_resqueue(oid));
FOREIGN_KEY(restypid REFERENCES pg_resourcetype(restypid));
+DECLARE_INDEX(pg_resqueuecapability_resqueueid_index, 6442,
ResQueueCapabilityResqueueidIndexId, on pg_resqueuecapability using
btree(resqueueid oid_ops));
+DECLARE_INDEX(pg_resqueuecapability_restypid_index, 6443,
ResQueueCapabilityRestypidIndexId, on pg_resqueuecapability using
btree(restypid int2_ops));
/* ----------------
* Form_pg_resqueuecapability corresponds to a pointer to a tuple
with
* the format of pg_resqueuecapability relation.
diff --git a/src/include/catalog/pg_stat_last_operation.h
b/src/include/catalog/pg_stat_last_operation.h
index 9ee8fe47a21..c7033ef3a74 100644
--- a/src/include/catalog/pg_stat_last_operation.h
+++ b/src/include/catalog/pg_stat_last_operation.h
@@ -52,6 +52,9 @@ CATALOG(pg_stat_last_operation,6052,StatLastOpRelationId)
/* GPDB added foreign key definitions for gpcheckcat. */
FOREIGN_KEY(classid REFERENCES pg_class(oid));
FOREIGN_KEY(stasysid REFERENCES pg_authid(oid));
+DECLARE_UNIQUE_INDEX(pg_statlastop_classid_objid_staactionname_index, 6054,
StatLastOpClassidObjidStaactionnameIndexId, on pg_stat_last_operation using
btree(classid oid_ops, objid oid_ops, staactionname name_ops));
+DECLARE_INDEX(pg_statlastshop_classid_objid_index, 6057,
StatLastShOpClassidObjidIndexId, on pg_stat_last_shoperation using
btree(classid oid_ops, objid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_statlastshop_classid_objid_staactionname_index, 6058,
StatLastShOpClassidObjidStaactionnameIndexId, on pg_stat_last_shoperation using
btree(classid oid_ops, objid oid_ops, staactionname name_ops));
#undef timestamptz
diff --git a/src/include/catalog/pg_tag.h b/src/include/catalog/pg_tag.h
index c0f8fc7a541..e627133a48c 100644
--- a/src/include/catalog/pg_tag.h
+++ b/src/include/catalog/pg_tag.h
@@ -61,9 +61,7 @@ CATALOG(pg_tag,6461,TagRelationId) BKI_SHARED_RELATION
BKI_ROWTYPE_OID(6462,TagR
*/
typedef FormData_pg_tag *Form_pg_tag;
-DECLARE_UNIQUE_INDEX_PKEY(pg_tag_tagname_index, 6463, on pg_tag using
btree(tagname name_ops));
-#define TagNameIndexId 6463
-DECLARE_UNIQUE_INDEX(pg_tag_oid_index, 6465, on pg_tag using btree(oid
oid_ops));
-#define TagOidIndexId 6465
+DECLARE_UNIQUE_INDEX_PKEY(pg_tag_tagname_index, 6463, TagNameIndexId, on
pg_tag using btree(tagname name_ops));
+DECLARE_UNIQUE_INDEX(pg_tag_oid_index, 6465, TagOidIndexId, on pg_tag using
btree(oid oid_ops));
#endif /* PG_TAG_H */
\ No newline at end of file
diff --git a/src/include/catalog/pg_type_encoding.h
b/src/include/catalog/pg_type_encoding.h
index 884b2eb08b4..32268cc430d 100644
--- a/src/include/catalog/pg_type_encoding.h
+++ b/src/include/catalog/pg_type_encoding.h
@@ -41,5 +41,6 @@ FOREIGN_KEY(typid REFERENCES pg_type(oid));
*/
typedef FormData_pg_type_encoding *Form_pg_type_encoding;
DECLARE_TOAST(pg_type_encoding, 6416, 6417);
+DECLARE_UNIQUE_INDEX(pg_type_encoding_typid_index, 6468,
TypeEncodingTypidIndexId, on pg_type_encoding using btree(typid oid_ops));
#endif /* PG_TYPE_ENCODING_H */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
