Skip to content

Commit b572c27

Browse files
committed
[#27467] YSQL: remove a todo in pg_shdepend.c
Summary: YB 20281bd imported upstream PG commit ebfe2dbd6b624e2a428e14b7ee9322cc096f63f7 introducing recordDependencyOnTablespace. That code is practically unchanged up to REL_15_12. YB PG 15.2 initial merge 55782d5 doesn't investigate this thoroughly enough and introduces a bad duplicate recordDependencyOnTablespace reminiscent of older outdated YB f701d7e. Simply remove the YB_TODO as there are no issues. Jira: DB-17008 Test Plan: jenkins Close: #27467 Reviewers: smishra Reviewed By: smishra Subscribers: yql Differential Revision: https://phorge.dev.yugabyte.com/D44384
1 parent 4a53797 commit b572c27

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

src/postgres/src/backend/catalog/pg_shdepend.c

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -188,41 +188,6 @@ recordDependencyOnOwner(Oid classId, Oid objectId, Oid owner)
188188
recordSharedDependencyOn(&myself, &referenced, SHARED_DEPENDENCY_OWNER);
189189
}
190190

191-
#ifdef YB_TODO
192-
/* Postgres 13 has its own definition */
193-
/*
194-
* recordDependencyOnTablespace
195-
*
196-
* A convenient wrapper of recordSharedDependencyOn -- mark that an object is
197-
* associated with a tablespace.
198-
*
199-
* Note: it's the caller's responsibility to ensure that there isn't a
200-
* tablespace entry for the object already.
201-
*/
202-
void
203-
recordDependencyOnTablespace(Oid classId, Oid objectId, Oid tablespaceOid)
204-
{
205-
if (tablespaceOid == InvalidOid)
206-
{
207-
/* Nothing to do */
208-
return;
209-
}
210-
ObjectAddress myself,
211-
referenced;
212-
213-
myself.classId = classId;
214-
myself.objectId = objectId;
215-
myself.objectSubId = 0;
216-
217-
referenced.classId = TableSpaceRelationId;
218-
referenced.objectId = tablespaceOid;
219-
referenced.objectSubId = 0;
220-
221-
recordSharedDependencyOn(&myself, &referenced,
222-
SHARED_DEPENDENCY_TABLESPACE);
223-
}
224-
#endif
225-
226191
/*
227192
* shdepChangeDep
228193
*

0 commit comments

Comments
 (0)