Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit226d0a6

Browse files
committed
Restructure DECLARE_INDEX arguments
Separate the table name from the index declaration. We need thatanyway later for the ALTER TABLE / USING INDEX commands, so we mightas well structure the declarations like that to begin with.Discussion:https://www.postgresql.org/message-id/flat/75ae5875-3abc-dafc-8aec-73247ed41cde@eisentraut.org
1 parentb5934bf commit226d0a6

File tree

67 files changed

+133
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+133
-133
lines changed

‎src/backend/catalog/Catalog.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ sub ParseHeader
117117
(?<index_name>\w+),\s*
118118
(?<index_oid>\d+),\s*
119119
(?<index_oid_macro>\w+),\s*
120+
(?<table_name>\w+),\s*
120121
(?<index_decl>.+)\s*
121122
\)/x
122123
)

‎src/backend/catalog/genbki.pl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,18 @@
135135
foreachmy$index (@{$catalog->{indexing} })
136136
{
137137
push@index_decls,
138-
sprintf"declare%sindex%s%s%s\n",
138+
sprintf"declare%sindex%s%son%s using%s\n",
139139
$index->{is_unique} ?'unique' :'',
140140
$index->{index_name},$index->{index_oid},
141+
$index->{table_name},
141142
$index->{index_decl};
142143
$oidcounts{$index->{index_oid} }++;
143144

144145
if ($index->{is_unique})
145146
{
146-
$index->{index_decl} =~/on (\w+) using/;
147-
my$tblname =$1;
148147
push@system_constraints,
149148
sprintf"ALTER TABLE%s ADD%s USING INDEX%s;",
150-
$tblname,
149+
$index->{table_name},
151150
$index->{is_pkey} ?"PRIMARY KEY" :"UNIQUE",
152151
$index->{index_name};
153152
}

‎src/include/catalog/genbki.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@
7676
* The first two arguments are the index's name and OID. The third argument
7777
* is the name of a #define to generate for its OID. References to the index
7878
* in the C code should always use these #defines, not the actual index name
79-
* (much less the numeric OID). Therestismuch like a standard 'create
80-
* index' SQL command.
79+
* (much less the numeric OID). Thefourth argumentisthe table name. The
80+
*rest is much like a standard 'createindex' SQL command.
8181
*
8282
* The macro definitions are just to keep the C compiler from spitting up.
8383
*/
84-
#defineDECLARE_INDEX(name,oid,oidmacro,decl) extern int no_such_variable
85-
#defineDECLARE_UNIQUE_INDEX(name,oid,oidmacro,decl) extern int no_such_variable
86-
#defineDECLARE_UNIQUE_INDEX_PKEY(name,oid,oidmacro,decl) extern int no_such_variable
84+
#defineDECLARE_INDEX(name,oid,oidmacro,tblname,decl) extern int no_such_variable
85+
#defineDECLARE_UNIQUE_INDEX(name,oid,oidmacro,tblname,decl) extern int no_such_variable
86+
#defineDECLARE_UNIQUE_INDEX_PKEY(name,oid,oidmacro,tblname,decl) extern int no_such_variable
8787

8888
/*
8989
* These lines inform genbki.pl about manually-assigned OIDs that do not

‎src/include/catalog/pg_aggregate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
110110

111111
DECLARE_TOAST(pg_aggregate,4159,4160);
112112

113-
DECLARE_UNIQUE_INDEX_PKEY(pg_aggregate_fnoid_index,2650,AggregateFnoidIndexId,onpg_aggregateusingbtree(aggfnoidoid_ops));
113+
DECLARE_UNIQUE_INDEX_PKEY(pg_aggregate_fnoid_index,2650,AggregateFnoidIndexId,pg_aggregate,btree(aggfnoidoid_ops));
114114

115115
#ifdefEXPOSE_TO_CLIENT_CODE
116116

‎src/include/catalog/pg_am.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ CATALOG(pg_am,2601,AccessMethodRelationId)
4747
*/
4848
typedefFormData_pg_am*Form_pg_am;
4949

50-
DECLARE_UNIQUE_INDEX(pg_am_name_index,2651,AmNameIndexId,onpg_amusingbtree(amnamename_ops));
51-
DECLARE_UNIQUE_INDEX_PKEY(pg_am_oid_index,2652,AmOidIndexId,onpg_amusingbtree(oidoid_ops));
50+
DECLARE_UNIQUE_INDEX(pg_am_name_index,2651,AmNameIndexId,pg_am,btree(amnamename_ops));
51+
DECLARE_UNIQUE_INDEX_PKEY(pg_am_oid_index,2652,AmOidIndexId,pg_am,btree(oidoid_ops));
5252

5353
#ifdefEXPOSE_TO_CLIENT_CODE
5454

‎src/include/catalog/pg_amop.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ CATALOG(pg_amop,2602,AccessMethodOperatorRelationId)
8787
*/
8888
typedefFormData_pg_amop*Form_pg_amop;
8989

90-
DECLARE_UNIQUE_INDEX(pg_amop_fam_strat_index,2653,AccessMethodStrategyIndexId,onpg_amopusingbtree(amopfamilyoid_ops,amoplefttypeoid_ops,amoprighttypeoid_ops,amopstrategyint2_ops));
91-
DECLARE_UNIQUE_INDEX(pg_amop_opr_fam_index,2654,AccessMethodOperatorIndexId,onpg_amopusingbtree(amopoproid_ops,amoppurposechar_ops,amopfamilyoid_ops));
92-
DECLARE_UNIQUE_INDEX_PKEY(pg_amop_oid_index,2756,AccessMethodOperatorOidIndexId,onpg_amopusingbtree(oidoid_ops));
90+
DECLARE_UNIQUE_INDEX(pg_amop_fam_strat_index,2653,AccessMethodStrategyIndexId,pg_amop,btree(amopfamilyoid_ops,amoplefttypeoid_ops,amoprighttypeoid_ops,amopstrategyint2_ops));
91+
DECLARE_UNIQUE_INDEX(pg_amop_opr_fam_index,2654,AccessMethodOperatorIndexId,pg_amop,btree(amopoproid_ops,amoppurposechar_ops,amopfamilyoid_ops));
92+
DECLARE_UNIQUE_INDEX_PKEY(pg_amop_oid_index,2756,AccessMethodOperatorOidIndexId,pg_amop,btree(oidoid_ops));
9393

9494
#ifdefEXPOSE_TO_CLIENT_CODE
9595

‎src/include/catalog/pg_amproc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ CATALOG(pg_amproc,2603,AccessMethodProcedureRelationId)
6767
*/
6868
typedefFormData_pg_amproc*Form_pg_amproc;
6969

70-
DECLARE_UNIQUE_INDEX(pg_amproc_fam_proc_index,2655,AccessMethodProcedureIndexId,onpg_amprocusingbtree(amprocfamilyoid_ops,amproclefttypeoid_ops,amprocrighttypeoid_ops,amprocnumint2_ops));
71-
DECLARE_UNIQUE_INDEX_PKEY(pg_amproc_oid_index,2757,AccessMethodProcedureOidIndexId,onpg_amprocusingbtree(oidoid_ops));
70+
DECLARE_UNIQUE_INDEX(pg_amproc_fam_proc_index,2655,AccessMethodProcedureIndexId,pg_amproc,btree(amprocfamilyoid_ops,amproclefttypeoid_ops,amprocrighttypeoid_ops,amprocnumint2_ops));
71+
DECLARE_UNIQUE_INDEX_PKEY(pg_amproc_oid_index,2757,AccessMethodProcedureOidIndexId,pg_amproc,btree(oidoid_ops));
7272

7373
#endif/* PG_AMPROC_H */

‎src/include/catalog/pg_attrdef.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ typedef FormData_pg_attrdef *Form_pg_attrdef;
5050

5151
DECLARE_TOAST(pg_attrdef,2830,2831);
5252

53-
DECLARE_UNIQUE_INDEX(pg_attrdef_adrelid_adnum_index,2656,AttrDefaultIndexId,onpg_attrdefusingbtree(adrelidoid_ops,adnumint2_ops));
54-
DECLARE_UNIQUE_INDEX_PKEY(pg_attrdef_oid_index,2657,AttrDefaultOidIndexId,onpg_attrdefusingbtree(oidoid_ops));
53+
DECLARE_UNIQUE_INDEX(pg_attrdef_adrelid_adnum_index,2656,AttrDefaultIndexId,pg_attrdef,btree(adrelidoid_ops,adnumint2_ops));
54+
DECLARE_UNIQUE_INDEX_PKEY(pg_attrdef_oid_index,2657,AttrDefaultOidIndexId,pg_attrdef,btree(oidoid_ops));
5555

5656
DECLARE_FOREIGN_KEY((adrelid,adnum),pg_attribute, (attrelid,attnum));
5757

‎src/include/catalog/pg_attribute.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ CATALOG(pg_attribute,1249,AttributeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(75,
208208
*/
209209
typedefFormData_pg_attribute*Form_pg_attribute;
210210

211-
DECLARE_UNIQUE_INDEX(pg_attribute_relid_attnam_index,2658,AttributeRelidNameIndexId,onpg_attributeusingbtree(attrelidoid_ops,attnamename_ops));
212-
DECLARE_UNIQUE_INDEX_PKEY(pg_attribute_relid_attnum_index,2659,AttributeRelidNumIndexId,onpg_attributeusingbtree(attrelidoid_ops,attnumint2_ops));
211+
DECLARE_UNIQUE_INDEX(pg_attribute_relid_attnam_index,2658,AttributeRelidNameIndexId,pg_attribute,btree(attrelidoid_ops,attnamename_ops));
212+
DECLARE_UNIQUE_INDEX_PKEY(pg_attribute_relid_attnum_index,2659,AttributeRelidNumIndexId,pg_attribute,btree(attrelidoid_ops,attnumint2_ops));
213213

214214
#ifdefEXPOSE_TO_CLIENT_CODE
215215

‎src/include/catalog/pg_auth_members.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ CATALOG(pg_auth_members,1261,AuthMemRelationId) BKI_SHARED_RELATION BKI_ROWTYPE_
4545
*/
4646
typedefFormData_pg_auth_members*Form_pg_auth_members;
4747

48-
DECLARE_UNIQUE_INDEX_PKEY(pg_auth_members_oid_index,6303,AuthMemOidIndexId,onpg_auth_membersusingbtree(oidoid_ops));
49-
DECLARE_UNIQUE_INDEX(pg_auth_members_role_member_index,2694,AuthMemRoleMemIndexId,onpg_auth_membersusingbtree(roleidoid_ops,memberoid_ops,grantoroid_ops));
50-
DECLARE_UNIQUE_INDEX(pg_auth_members_member_role_index,2695,AuthMemMemRoleIndexId,onpg_auth_membersusingbtree(memberoid_ops,roleidoid_ops,grantoroid_ops));
51-
DECLARE_INDEX(pg_auth_members_grantor_index,6302,AuthMemGrantorIndexId,onpg_auth_membersusingbtree(grantoroid_ops));
48+
DECLARE_UNIQUE_INDEX_PKEY(pg_auth_members_oid_index,6303,AuthMemOidIndexId,pg_auth_members,btree(oidoid_ops));
49+
DECLARE_UNIQUE_INDEX(pg_auth_members_role_member_index,2694,AuthMemRoleMemIndexId,pg_auth_members,btree(roleidoid_ops,memberoid_ops,grantoroid_ops));
50+
DECLARE_UNIQUE_INDEX(pg_auth_members_member_role_index,2695,AuthMemMemRoleIndexId,pg_auth_members,btree(memberoid_ops,roleidoid_ops,grantoroid_ops));
51+
DECLARE_INDEX(pg_auth_members_grantor_index,6302,AuthMemGrantorIndexId,pg_auth_members,btree(grantoroid_ops));
5252

5353
#endif/* PG_AUTH_MEMBERS_H */

‎src/include/catalog/pg_authid.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ typedef FormData_pg_authid *Form_pg_authid;
5757

5858
DECLARE_TOAST_WITH_MACRO(pg_authid,4175,4176,PgAuthidToastTable,PgAuthidToastIndex);
5959

60-
DECLARE_UNIQUE_INDEX(pg_authid_rolname_index,2676,AuthIdRolnameIndexId,onpg_authidusingbtree(rolnamename_ops));
61-
DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index,2677,AuthIdOidIndexId,onpg_authidusingbtree(oidoid_ops));
60+
DECLARE_UNIQUE_INDEX(pg_authid_rolname_index,2676,AuthIdRolnameIndexId,pg_authid,btree(rolnamename_ops));
61+
DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index,2677,AuthIdOidIndexId,pg_authid,btree(oidoid_ops));
6262

6363
#endif/* PG_AUTHID_H */

‎src/include/catalog/pg_cast.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ CATALOG(pg_cast,2605,CastRelationId)
5656
*/
5757
typedefFormData_pg_cast*Form_pg_cast;
5858

59-
DECLARE_UNIQUE_INDEX_PKEY(pg_cast_oid_index,2660,CastOidIndexId,onpg_castusingbtree(oidoid_ops));
60-
DECLARE_UNIQUE_INDEX(pg_cast_source_target_index,2661,CastSourceTargetIndexId,onpg_castusingbtree(castsourceoid_ops,casttargetoid_ops));
59+
DECLARE_UNIQUE_INDEX_PKEY(pg_cast_oid_index,2660,CastOidIndexId,pg_cast,btree(oidoid_ops));
60+
DECLARE_UNIQUE_INDEX(pg_cast_source_target_index,2661,CastSourceTargetIndexId,pg_cast,btree(castsourceoid_ops,casttargetoid_ops));
6161

6262
#ifdefEXPOSE_TO_CLIENT_CODE
6363

‎src/include/catalog/pg_class.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ CATALOG(pg_class,1259,RelationRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(83,Relat
152152
*/
153153
typedefFormData_pg_class*Form_pg_class;
154154

155-
DECLARE_UNIQUE_INDEX_PKEY(pg_class_oid_index,2662,ClassOidIndexId,onpg_classusingbtree(oidoid_ops));
156-
DECLARE_UNIQUE_INDEX(pg_class_relname_nsp_index,2663,ClassNameNspIndexId,onpg_classusingbtree(relnamename_ops,relnamespaceoid_ops));
157-
DECLARE_INDEX(pg_class_tblspc_relfilenode_index,3455,ClassTblspcRelfilenodeIndexId,onpg_classusingbtree(reltablespaceoid_ops,relfilenodeoid_ops));
155+
DECLARE_UNIQUE_INDEX_PKEY(pg_class_oid_index,2662,ClassOidIndexId,pg_class,btree(oidoid_ops));
156+
DECLARE_UNIQUE_INDEX(pg_class_relname_nsp_index,2663,ClassNameNspIndexId,pg_class,btree(relnamename_ops,relnamespaceoid_ops));
157+
DECLARE_INDEX(pg_class_tblspc_relfilenode_index,3455,ClassTblspcRelfilenodeIndexId,pg_class,btree(reltablespaceoid_ops,relfilenodeoid_ops));
158158

159159
#ifdefEXPOSE_TO_CLIENT_CODE
160160

‎src/include/catalog/pg_collation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ typedef FormData_pg_collation *Form_pg_collation;
5959

6060
DECLARE_TOAST(pg_collation,6175,6176);
6161

62-
DECLARE_UNIQUE_INDEX(pg_collation_name_enc_nsp_index,3164,CollationNameEncNspIndexId,onpg_collationusingbtree(collnamename_ops,collencodingint4_ops,collnamespaceoid_ops));
63-
DECLARE_UNIQUE_INDEX_PKEY(pg_collation_oid_index,3085,CollationOidIndexId,onpg_collationusingbtree(oidoid_ops));
62+
DECLARE_UNIQUE_INDEX(pg_collation_name_enc_nsp_index,3164,CollationNameEncNspIndexId,pg_collation,btree(collnamename_ops,collencodingint4_ops,collnamespaceoid_ops));
63+
DECLARE_UNIQUE_INDEX_PKEY(pg_collation_oid_index,3085,CollationOidIndexId,pg_collation,btree(oidoid_ops));
6464

6565
#ifdefEXPOSE_TO_CLIENT_CODE
6666

‎src/include/catalog/pg_constraint.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ typedef FormData_pg_constraint *Form_pg_constraint;
166166

167167
DECLARE_TOAST(pg_constraint,2832,2833);
168168

169-
DECLARE_INDEX(pg_constraint_conname_nsp_index,2664,ConstraintNameNspIndexId,onpg_constraintusingbtree(connamename_ops,connamespaceoid_ops));
170-
DECLARE_UNIQUE_INDEX(pg_constraint_conrelid_contypid_conname_index,2665,ConstraintRelidTypidNameIndexId,onpg_constraintusingbtree(conrelidoid_ops,contypidoid_ops,connamename_ops));
171-
DECLARE_INDEX(pg_constraint_contypid_index,2666,ConstraintTypidIndexId,onpg_constraintusingbtree(contypidoid_ops));
172-
DECLARE_UNIQUE_INDEX_PKEY(pg_constraint_oid_index,2667,ConstraintOidIndexId,onpg_constraintusingbtree(oidoid_ops));
173-
DECLARE_INDEX(pg_constraint_conparentid_index,2579,ConstraintParentIndexId,onpg_constraintusingbtree(conparentidoid_ops));
169+
DECLARE_INDEX(pg_constraint_conname_nsp_index,2664,ConstraintNameNspIndexId,pg_constraint,btree(connamename_ops,connamespaceoid_ops));
170+
DECLARE_UNIQUE_INDEX(pg_constraint_conrelid_contypid_conname_index,2665,ConstraintRelidTypidNameIndexId,pg_constraint,btree(conrelidoid_ops,contypidoid_ops,connamename_ops));
171+
DECLARE_INDEX(pg_constraint_contypid_index,2666,ConstraintTypidIndexId,pg_constraint,btree(contypidoid_ops));
172+
DECLARE_UNIQUE_INDEX_PKEY(pg_constraint_oid_index,2667,ConstraintOidIndexId,pg_constraint,btree(oidoid_ops));
173+
DECLARE_INDEX(pg_constraint_conparentid_index,2579,ConstraintParentIndexId,pg_constraint,btree(conparentidoid_ops));
174174

175175
/* conkey can contain zero (InvalidAttrNumber) if a whole-row Var is used */
176176
DECLARE_ARRAY_FOREIGN_KEY_OPT((conrelid,conkey),pg_attribute, (attrelid,attnum));

‎src/include/catalog/pg_conversion.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ CATALOG(pg_conversion,2607,ConversionRelationId)
6060
*/
6161
typedefFormData_pg_conversion*Form_pg_conversion;
6262

63-
DECLARE_UNIQUE_INDEX(pg_conversion_default_index,2668,ConversionDefaultIndexId,onpg_conversionusingbtree(connamespaceoid_ops,conforencodingint4_ops,contoencodingint4_ops,oidoid_ops));
64-
DECLARE_UNIQUE_INDEX(pg_conversion_name_nsp_index,2669,ConversionNameNspIndexId,onpg_conversionusingbtree(connamename_ops,connamespaceoid_ops));
65-
DECLARE_UNIQUE_INDEX_PKEY(pg_conversion_oid_index,2670,ConversionOidIndexId,onpg_conversionusingbtree(oidoid_ops));
63+
DECLARE_UNIQUE_INDEX(pg_conversion_default_index,2668,ConversionDefaultIndexId,pg_conversion,btree(connamespaceoid_ops,conforencodingint4_ops,contoencodingint4_ops,oidoid_ops));
64+
DECLARE_UNIQUE_INDEX(pg_conversion_name_nsp_index,2669,ConversionNameNspIndexId,pg_conversion,btree(connamename_ops,connamespaceoid_ops));
65+
DECLARE_UNIQUE_INDEX_PKEY(pg_conversion_oid_index,2670,ConversionOidIndexId,pg_conversion,btree(oidoid_ops));
6666

6767

6868
externObjectAddressConversionCreate(constchar*conname,Oidconnamespace,

‎src/include/catalog/pg_database.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ typedef FormData_pg_database *Form_pg_database;
9494

9595
DECLARE_TOAST_WITH_MACRO(pg_database,4177,4178,PgDatabaseToastTable,PgDatabaseToastIndex);
9696

97-
DECLARE_UNIQUE_INDEX(pg_database_datname_index,2671,DatabaseNameIndexId,onpg_databaseusingbtree(datnamename_ops));
98-
DECLARE_UNIQUE_INDEX_PKEY(pg_database_oid_index,2672,DatabaseOidIndexId,onpg_databaseusingbtree(oidoid_ops));
97+
DECLARE_UNIQUE_INDEX(pg_database_datname_index,2671,DatabaseNameIndexId,pg_database,btree(datnamename_ops));
98+
DECLARE_UNIQUE_INDEX_PKEY(pg_database_oid_index,2672,DatabaseOidIndexId,pg_database,btree(oidoid_ops));
9999

100100
/*
101101
* pg_database.dat contains an entry for template1, but not for the template0

‎src/include/catalog/pg_db_role_setting.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ typedef FormData_pg_db_role_setting * Form_pg_db_role_setting;
4848

4949
DECLARE_TOAST_WITH_MACRO(pg_db_role_setting,2966,2967,PgDbRoleSettingToastTable,PgDbRoleSettingToastIndex);
5050

51-
DECLARE_UNIQUE_INDEX_PKEY(pg_db_role_setting_databaseid_rol_index,2965,DbRoleSettingDatidRolidIndexId,onpg_db_role_settingusingbtree(setdatabaseoid_ops,setroleoid_ops));
51+
DECLARE_UNIQUE_INDEX_PKEY(pg_db_role_setting_databaseid_rol_index,2965,DbRoleSettingDatidRolidIndexId,pg_db_role_setting,btree(setdatabaseoid_ops,setroleoid_ops));
5252

5353
/*
5454
* prototypes for functions in pg_db_role_setting.c

‎src/include/catalog/pg_default_acl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ typedef FormData_pg_default_acl *Form_pg_default_acl;
5151

5252
DECLARE_TOAST(pg_default_acl,4143,4144);
5353

54-
DECLARE_UNIQUE_INDEX(pg_default_acl_role_nsp_obj_index,827,DefaultAclRoleNspObjIndexId,onpg_default_aclusingbtree(defaclroleoid_ops,defaclnamespaceoid_ops,defaclobjtypechar_ops));
55-
DECLARE_UNIQUE_INDEX_PKEY(pg_default_acl_oid_index,828,DefaultAclOidIndexId,onpg_default_aclusingbtree(oidoid_ops));
54+
DECLARE_UNIQUE_INDEX(pg_default_acl_role_nsp_obj_index,827,DefaultAclRoleNspObjIndexId,pg_default_acl,btree(defaclroleoid_ops,defaclnamespaceoid_ops,defaclobjtypechar_ops));
55+
DECLARE_UNIQUE_INDEX_PKEY(pg_default_acl_oid_index,828,DefaultAclOidIndexId,pg_default_acl,btree(oidoid_ops));
5656

5757
#ifdefEXPOSE_TO_CLIENT_CODE
5858

‎src/include/catalog/pg_depend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ CATALOG(pg_depend,2608,DependRelationId)
7171
*/
7272
typedefFormData_pg_depend*Form_pg_depend;
7373

74-
DECLARE_INDEX(pg_depend_depender_index,2673,DependDependerIndexId,onpg_dependusingbtree(classidoid_ops,objidoid_ops,objsubidint4_ops));
75-
DECLARE_INDEX(pg_depend_reference_index,2674,DependReferenceIndexId,onpg_dependusingbtree(refclassidoid_ops,refobjidoid_ops,refobjsubidint4_ops));
74+
DECLARE_INDEX(pg_depend_depender_index,2673,DependDependerIndexId,pg_depend,btree(classidoid_ops,objidoid_ops,objsubidint4_ops));
75+
DECLARE_INDEX(pg_depend_reference_index,2674,DependReferenceIndexId,pg_depend,btree(refclassidoid_ops,refobjidoid_ops,refobjsubidint4_ops));
7676

7777
#endif/* PG_DEPEND_H */

‎src/include/catalog/pg_description.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef FormData_pg_description * Form_pg_description;
6565

6666
DECLARE_TOAST(pg_description,2834,2835);
6767

68-
DECLARE_UNIQUE_INDEX_PKEY(pg_description_o_c_o_index,2675,DescriptionObjIndexId,onpg_descriptionusingbtree(objoidoid_ops,classoidoid_ops,objsubidint4_ops));
68+
DECLARE_UNIQUE_INDEX_PKEY(pg_description_o_c_o_index,2675,DescriptionObjIndexId,pg_description,btree(objoidoid_ops,classoidoid_ops,objsubidint4_ops));
6969

7070
/* We do not use BKI_LOOKUP here because it causes problems for genbki.pl */
7171
DECLARE_FOREIGN_KEY((classoid),pg_class, (oid));

‎src/include/catalog/pg_enum.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ CATALOG(pg_enum,3501,EnumRelationId)
4343
*/
4444
typedefFormData_pg_enum*Form_pg_enum;
4545

46-
DECLARE_UNIQUE_INDEX_PKEY(pg_enum_oid_index,3502,EnumOidIndexId,onpg_enumusingbtree(oidoid_ops));
47-
DECLARE_UNIQUE_INDEX(pg_enum_typid_label_index,3503,EnumTypIdLabelIndexId,onpg_enumusingbtree(enumtypidoid_ops,enumlabelname_ops));
48-
DECLARE_UNIQUE_INDEX(pg_enum_typid_sortorder_index,3534,EnumTypIdSortOrderIndexId,onpg_enumusingbtree(enumtypidoid_ops,enumsortorderfloat4_ops));
46+
DECLARE_UNIQUE_INDEX_PKEY(pg_enum_oid_index,3502,EnumOidIndexId,pg_enum,btree(oidoid_ops));
47+
DECLARE_UNIQUE_INDEX(pg_enum_typid_label_index,3503,EnumTypIdLabelIndexId,pg_enum,btree(enumtypidoid_ops,enumlabelname_ops));
48+
DECLARE_UNIQUE_INDEX(pg_enum_typid_sortorder_index,3534,EnumTypIdSortOrderIndexId,pg_enum,btree(enumtypidoid_ops,enumsortorderfloat4_ops));
4949

5050
/*
5151
* prototypes for functions in pg_enum.c

‎src/include/catalog/pg_event_trigger.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ typedef FormData_pg_event_trigger *Form_pg_event_trigger;
5151

5252
DECLARE_TOAST(pg_event_trigger,4145,4146);
5353

54-
DECLARE_UNIQUE_INDEX(pg_event_trigger_evtname_index,3467,EventTriggerNameIndexId,onpg_event_triggerusingbtree(evtnamename_ops));
55-
DECLARE_UNIQUE_INDEX_PKEY(pg_event_trigger_oid_index,3468,EventTriggerOidIndexId,onpg_event_triggerusingbtree(oidoid_ops));
54+
DECLARE_UNIQUE_INDEX(pg_event_trigger_evtname_index,3467,EventTriggerNameIndexId,pg_event_trigger,btree(evtnamename_ops));
55+
DECLARE_UNIQUE_INDEX_PKEY(pg_event_trigger_oid_index,3468,EventTriggerOidIndexId,pg_event_trigger,btree(oidoid_ops));
5656

5757
#endif/* PG_EVENT_TRIGGER_H */

‎src/include/catalog/pg_extension.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ typedef FormData_pg_extension *Form_pg_extension;
5353

5454
DECLARE_TOAST(pg_extension,4147,4148);
5555

56-
DECLARE_UNIQUE_INDEX_PKEY(pg_extension_oid_index,3080,ExtensionOidIndexId,onpg_extensionusingbtree(oidoid_ops));
57-
DECLARE_UNIQUE_INDEX(pg_extension_name_index,3081,ExtensionNameIndexId,onpg_extensionusingbtree(extnamename_ops));
56+
DECLARE_UNIQUE_INDEX_PKEY(pg_extension_oid_index,3080,ExtensionOidIndexId,pg_extension,btree(oidoid_ops));
57+
DECLARE_UNIQUE_INDEX(pg_extension_name_index,3081,ExtensionNameIndexId,pg_extension,btree(extnamename_ops));
5858

5959
#endif/* PG_EXTENSION_H */

‎src/include/catalog/pg_foreign_data_wrapper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ typedef FormData_pg_foreign_data_wrapper *Form_pg_foreign_data_wrapper;
5252

5353
DECLARE_TOAST(pg_foreign_data_wrapper,4149,4150);
5454

55-
DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_data_wrapper_oid_index,112,ForeignDataWrapperOidIndexId,onpg_foreign_data_wrapperusingbtree(oidoid_ops));
56-
DECLARE_UNIQUE_INDEX(pg_foreign_data_wrapper_name_index,548,ForeignDataWrapperNameIndexId,onpg_foreign_data_wrapperusingbtree(fdwnamename_ops));
55+
DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_data_wrapper_oid_index,112,ForeignDataWrapperOidIndexId,pg_foreign_data_wrapper,btree(oidoid_ops));
56+
DECLARE_UNIQUE_INDEX(pg_foreign_data_wrapper_name_index,548,ForeignDataWrapperNameIndexId,pg_foreign_data_wrapper,btree(fdwnamename_ops));
5757

5858
#endif/* PG_FOREIGN_DATA_WRAPPER_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp