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

Commit82a4a77

Browse files
committed
Consolidate DROP handling for some object types.
This gets rid of a significant amount of duplicative code.KaiGai Kohei, reviewed in earlier versions by Dimitri Fontaine, withfurther review and cleanup by me.
1 parent3301c83 commit82a4a77

File tree

17 files changed

+300
-726
lines changed

17 files changed

+300
-726
lines changed

‎src/backend/catalog/objectaddress.c‎

Lines changed: 137 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,6 @@
6666
#include"utils/syscache.h"
6767
#include"utils/tqual.h"
6868

69-
staticObjectAddressget_object_address_unqualified(ObjectTypeobjtype,
70-
List*qualname,boolmissing_ok);
71-
staticObjectAddressget_relation_by_qualified_name(ObjectTypeobjtype,
72-
List*objname,Relation*relp,
73-
LOCKMODElockmode,boolmissing_ok);
74-
staticObjectAddressget_object_address_relobject(ObjectTypeobjtype,
75-
List*objname,Relation*relp,boolmissing_ok);
76-
staticObjectAddressget_object_address_attribute(ObjectTypeobjtype,
77-
List*objname,Relation*relp,
78-
LOCKMODElockmode,boolmissing_ok);
79-
staticObjectAddressget_object_address_type(ObjectTypeobjtype,
80-
List*objname,boolmissing_ok);
81-
staticObjectAddressget_object_address_opcf(ObjectTypeobjtype,List*objname,
82-
List*objargs,boolmissing_ok);
83-
staticboolobject_exists(ObjectAddressaddress);
84-
8569
/*
8670
* ObjectProperty
8771
*
@@ -93,137 +77,180 @@ typedef struct
9377
Oidclass_oid;/* oid of catalog */
9478
Oidoid_index_oid;/* oid of index on system oid column */
9579
intoid_catcache_id;/* id of catcache on system oid column */
80+
AttrNumberattnum_namespace;/* attnum of namespace field */
9681
}ObjectPropertyType;
9782

9883
staticObjectPropertyTypeObjectProperty[]=
9984
{
10085
{
10186
CastRelationId,
10287
CastOidIndexId,
103-
-1
88+
-1,
89+
InvalidAttrNumber
10490
},
10591
{
10692
CollationRelationId,
10793
CollationOidIndexId,
108-
COLLOID
94+
COLLOID,
95+
Anum_pg_collation_collnamespace
10996
},
11097
{
11198
ConstraintRelationId,
11299
ConstraintOidIndexId,
113-
CONSTROID
100+
CONSTROID,
101+
Anum_pg_constraint_connamespace
114102
},
115103
{
116104
ConversionRelationId,
117105
ConversionOidIndexId,
118-
CONVOID
106+
CONVOID,
107+
Anum_pg_conversion_connamespace
119108
},
120109
{
121110
DatabaseRelationId,
122111
DatabaseOidIndexId,
123-
DATABASEOID
112+
DATABASEOID,
113+
InvalidAttrNumber
124114
},
125115
{
126116
ExtensionRelationId,
127117
ExtensionOidIndexId,
128-
-1
118+
-1,
119+
Anum_pg_extension_extnamespace
129120
},
130121
{
131122
ForeignDataWrapperRelationId,
132123
ForeignDataWrapperOidIndexId,
133-
FOREIGNDATAWRAPPEROID
124+
FOREIGNDATAWRAPPEROID,
125+
InvalidAttrNumber
134126
},
135127
{
136128
ForeignServerRelationId,
137129
ForeignServerOidIndexId,
138-
FOREIGNSERVEROID
130+
FOREIGNSERVEROID,
131+
InvalidAttrNumber
139132
},
140133
{
141134
ProcedureRelationId,
142135
ProcedureOidIndexId,
143-
PROCOID
136+
PROCOID,
137+
Anum_pg_proc_pronamespace
144138
},
145139
{
146140
LanguageRelationId,
147141
LanguageOidIndexId,
148-
LANGOID
142+
LANGOID,
143+
InvalidAttrNumber,
149144
},
150145
{
151146
LargeObjectMetadataRelationId,
152147
LargeObjectMetadataOidIndexId,
153-
-1
148+
-1,
149+
InvalidAttrNumber
154150
},
155151
{
156152
OperatorClassRelationId,
157153
OpclassOidIndexId,
158-
CLAOID
154+
CLAOID,
155+
Anum_pg_opclass_opcnamespace,
159156
},
160157
{
161158
OperatorRelationId,
162159
OperatorOidIndexId,
163-
OPEROID
160+
OPEROID,
161+
Anum_pg_operator_oprnamespace
164162
},
165163
{
166164
OperatorFamilyRelationId,
167165
OpfamilyOidIndexId,
168-
OPFAMILYOID
166+
OPFAMILYOID,
167+
Anum_pg_opfamily_opfnamespace
169168
},
170169
{
171170
AuthIdRelationId,
172171
AuthIdOidIndexId,
173-
AUTHOID
172+
AUTHOID,
173+
InvalidAttrNumber
174174
},
175175
{
176176
RewriteRelationId,
177177
RewriteOidIndexId,
178-
-1
178+
-1,
179+
InvalidAttrNumber
179180
},
180181
{
181182
NamespaceRelationId,
182183
NamespaceOidIndexId,
183-
NAMESPACEOID
184+
NAMESPACEOID,
185+
InvalidAttrNumber
184186
},
185187
{
186188
RelationRelationId,
187189
ClassOidIndexId,
188-
RELOID
190+
RELOID,
191+
Anum_pg_class_relnamespace
189192
},
190193
{
191194
TableSpaceRelationId,
192195
TablespaceOidIndexId,
193196
TABLESPACEOID,
197+
InvalidAttrNumber
194198
},
195199
{
196200
TriggerRelationId,
197201
TriggerOidIndexId,
198-
-1
202+
-1,
203+
InvalidAttrNumber
199204
},
200205
{
201206
TSConfigRelationId,
202207
TSConfigOidIndexId,
203-
TSCONFIGOID
208+
TSCONFIGOID,
209+
Anum_pg_ts_config_cfgnamespace
204210
},
205211
{
206212
TSDictionaryRelationId,
207213
TSDictionaryOidIndexId,
208-
TSDICTOID
214+
TSDICTOID,
215+
Anum_pg_ts_dict_dictnamespace
209216
},
210217
{
211218
TSParserRelationId,
212219
TSParserOidIndexId,
213-
TSPARSEROID
220+
TSPARSEROID,
221+
Anum_pg_ts_parser_prsnamespace
214222
},
215223
{
216224
TSTemplateRelationId,
217225
TSTemplateOidIndexId,
218-
TSTEMPLATEOID
226+
TSTEMPLATEOID,
227+
Anum_pg_ts_template_tmplnamespace,
219228
},
220229
{
221230
TypeRelationId,
222231
TypeOidIndexId,
223-
TYPEOID
232+
TYPEOID,
233+
Anum_pg_type_typnamespace
224234
}
225235
};
226236

237+
staticObjectAddressget_object_address_unqualified(ObjectTypeobjtype,
238+
List*qualname,boolmissing_ok);
239+
staticObjectAddressget_relation_by_qualified_name(ObjectTypeobjtype,
240+
List*objname,Relation*relp,
241+
LOCKMODElockmode,boolmissing_ok);
242+
staticObjectAddressget_object_address_relobject(ObjectTypeobjtype,
243+
List*objname,Relation*relp,boolmissing_ok);
244+
staticObjectAddressget_object_address_attribute(ObjectTypeobjtype,
245+
List*objname,Relation*relp,
246+
LOCKMODElockmode,boolmissing_ok);
247+
staticObjectAddressget_object_address_type(ObjectTypeobjtype,
248+
List*objname,boolmissing_ok);
249+
staticObjectAddressget_object_address_opcf(ObjectTypeobjtype,List*objname,
250+
List*objargs,boolmissing_ok);
251+
staticboolobject_exists(ObjectAddressaddress);
252+
staticObjectPropertyType*get_object_property_data(Oidclass_id);
253+
227254
/*
228255
* Translate an object name and arguments (as passed by the parser) to an
229256
* ObjectAddress.
@@ -828,6 +855,7 @@ object_exists(ObjectAddress address)
828855
ScanKeyDataskey[1];
829856
SysScanDescsd;
830857
boolfound;
858+
ObjectPropertyType*property;
831859

832860
/* Sub-objects require special treatment. */
833861
if (address.objectSubId!=0)
@@ -847,35 +875,22 @@ object_exists(ObjectAddress address)
847875
}
848876
returnfound;
849877
}
850-
else
851-
{
852-
intindex;
853878

854-
/*
855-
* Weird backward compatibility hack: ObjectAddress notation uses
856-
* LargeObjectRelationId for large objects, but since PostgreSQL
857-
* 9.0, the relevant catalog is actually LargeObjectMetadataRelationId.
858-
*/
859-
if (address.classId==LargeObjectRelationId)
860-
address.classId=LargeObjectMetadataRelationId;
879+
/*
880+
* Weird backward compatibility hack: ObjectAddress notation uses
881+
* LargeObjectRelationId for large objects, but since PostgreSQL
882+
* 9.0, the relevant catalog is actually LargeObjectMetadataRelationId.
883+
*/
884+
if (address.classId==LargeObjectRelationId)
885+
address.classId=LargeObjectMetadataRelationId;
861886

862-
/*
863-
* For object types that have a relevant syscache, we use it; for
864-
* everything else, we'll have to do an index-scan. Search the
865-
* ObjectProperty array to find out which it is.
866-
*/
867-
for (index=0;index<lengthof(ObjectProperty);index++)
868-
{
869-
if (ObjectProperty[index].class_oid==address.classId)
870-
{
871-
cache=ObjectProperty[index].oid_catcache_id;
872-
indexoid=ObjectProperty[index].oid_index_oid;
873-
break;
874-
}
875-
}
876-
if (index==lengthof(ObjectProperty))
877-
elog(ERROR,"unrecognized classid: %u",address.classId);
878-
}
887+
/*
888+
* For object types that have a relevant syscache, we use it; for
889+
* everything else, we'll have to do an index-scan.
890+
*/
891+
property=get_object_property_data(address.classId);
892+
cache=property->oid_catcache_id;
893+
indexoid=property->oid_index_oid;
879894

880895
/* Found a syscache? */
881896
if (cache!=-1)
@@ -895,7 +910,6 @@ object_exists(ObjectAddress address)
895910
returnfound;
896911
}
897912

898-
899913
/*
900914
* Check ownership of an object previously identified by get_object_address.
901915
*/
@@ -1060,3 +1074,58 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
10601074
(int)objtype);
10611075
}
10621076
}
1077+
1078+
/*
1079+
* get_object_namespace
1080+
*
1081+
* Find the schema containing the specified object. For non-schema objects,
1082+
* this function returns InvalidOid.
1083+
*/
1084+
Oid
1085+
get_object_namespace(constObjectAddress*address)
1086+
{
1087+
intcache;
1088+
HeapTupletuple;
1089+
boolisnull;
1090+
Oidoid;
1091+
ObjectPropertyType*property;
1092+
1093+
/* If not owned by a namespace, just return InvalidOid. */
1094+
property=get_object_property_data(address->classId);
1095+
if (property->attnum_namespace==InvalidAttrNumber)
1096+
returnInvalidOid;
1097+
1098+
/* Currently, we can only handle object types with system caches. */
1099+
cache=property->oid_catcache_id;
1100+
Assert(cache!=-1);
1101+
1102+
/* Fetch tuple from syscache and extract namespace attribute. */
1103+
tuple=SearchSysCache1(cache,ObjectIdGetDatum(address->objectId));
1104+
if (!HeapTupleIsValid(tuple))
1105+
elog(ERROR,"cache lookup failed for cache %d oid %u",
1106+
cache,address->objectId);
1107+
oid=DatumGetObjectId(SysCacheGetAttr(cache,
1108+
tuple,
1109+
property->attnum_namespace,
1110+
&isnull));
1111+
Assert(!isnull);
1112+
ReleaseSysCache(tuple);
1113+
1114+
returnoid;
1115+
}
1116+
1117+
/*
1118+
* Find ObjectProperty structure by class_id.
1119+
*/
1120+
staticObjectPropertyType*
1121+
get_object_property_data(Oidclass_id)
1122+
{
1123+
intindex;
1124+
1125+
for (index=0;index<lengthof(ObjectProperty);index++)
1126+
if (ObjectProperty[index].class_oid==class_id)
1127+
return&ObjectProperty[index];
1128+
1129+
elog(ERROR,"unrecognized class id: %u",class_id);
1130+
returnNULL;/* not reached */
1131+
}

‎src/backend/commands/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
1414

1515
OBJS = aggregatecmds.o alter.o analyze.o async.o cluster.o comment.o\
1616
collationcmds.o constraint.o conversioncmds.o copy.o\
17-
dbcommands.o define.o discard.o explain.o extension.o\
17+
dbcommands.o define.o discard.odropcmds.oexplain.o extension.o\
1818
foreigncmds.o functioncmds.o\
1919
indexcmds.o lockcmds.o operatorcmds.o opclasscmds.o\
2020
portalcmds.o prepare.o proclang.o\

0 commit comments

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