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

Commit1cf2dba

Browse files
committed
Add try_index_open(), conditional variant of index_open()
try_index_open() is able to open an index if its relkind fits, exceptthat it would return NULL instead of generated an error if the relationdoes not exist. This new routine will be used by an upcoming patch tomake REINDEX on partitioned relations more robust when an index in apartition tree is dropped.Extracted from a larger patch by the same author.Author: Fei ChanghongDiscussion:https://postgr.es/m/tencent_6A52106095ACDE55333E3AD33F304C0C3909@qq.comBackpatch-through: 14
1 parentf374fb4 commit1cf2dba

File tree

2 files changed

+44
-6
lines changed

2 files changed

+44
-6
lines changed

‎src/backend/access/index/indexam.c

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ do { \
107107
staticIndexScanDescindex_beginscan_internal(RelationindexRelation,
108108
intnkeys,intnorderbys,Snapshotsnapshot,
109109
ParallelIndexScanDescpscan,booltemp_snap);
110+
staticinlinevoidvalidate_relation_kind(Relationr);
110111

111112

112113
/* ----------------------------------------------------------------
@@ -135,12 +136,30 @@ index_open(Oid relationId, LOCKMODE lockmode)
135136

136137
r=relation_open(relationId,lockmode);
137138

138-
if (r->rd_rel->relkind!=RELKIND_INDEX&&
139-
r->rd_rel->relkind!=RELKIND_PARTITIONED_INDEX)
140-
ereport(ERROR,
141-
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
142-
errmsg("\"%s\" is not an index",
143-
RelationGetRelationName(r))));
139+
validate_relation_kind(r);
140+
141+
returnr;
142+
}
143+
144+
/* ----------------
145+
*try_index_open - open a index relation by relation OID
146+
*
147+
*Same as index_open, except return NULL instead of failing
148+
*if the relation does not exist.
149+
* ----------------
150+
*/
151+
Relation
152+
try_index_open(OidrelationId,LOCKMODElockmode)
153+
{
154+
Relationr;
155+
156+
r=try_relation_open(relationId,lockmode);
157+
158+
/* leave if index does not exist */
159+
if (!r)
160+
returnNULL;
161+
162+
validate_relation_kind(r);
144163

145164
returnr;
146165
}
@@ -168,6 +187,24 @@ index_close(Relation relation, LOCKMODE lockmode)
168187
UnlockRelationId(&relid,lockmode);
169188
}
170189

190+
/* ----------------
191+
*validate_relation_kind - check the relation's kind
192+
*
193+
*Make sure relkind is an index or a partitioned index.
194+
* ----------------
195+
*/
196+
staticinlinevoid
197+
validate_relation_kind(Relationr)
198+
{
199+
if (r->rd_rel->relkind!=RELKIND_INDEX&&
200+
r->rd_rel->relkind!=RELKIND_PARTITIONED_INDEX)
201+
ereport(ERROR,
202+
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
203+
errmsg("\"%s\" is not an index",
204+
RelationGetRelationName(r))));
205+
}
206+
207+
171208
/* ----------------
172209
*index_insert - insert an index tuple into a relation
173210
* ----------------

‎src/include/access/genam.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ typedef struct IndexOrderByDistance
138138
#defineIndexScanIsValid(scan) PointerIsValid(scan)
139139

140140
externRelationindex_open(OidrelationId,LOCKMODElockmode);
141+
externRelationtry_index_open(OidrelationId,LOCKMODElockmode);
141142
externvoidindex_close(Relationrelation,LOCKMODElockmode);
142143

143144
externboolindex_insert(RelationindexRelation,

0 commit comments

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