NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit412229d

committed

Deduplicate code in LargeObjectExists and myLargeObjectExists.

myLargeObjectExists() and LargeObjectExists() had nearly identical code,except for handling snapshots. This commit renames myLargeObjectExists()to LargeObjectExistsWithSnapshot() and refactors LargeObjectExists()to call it internally, reducing duplication.Author: Yugo NagataReviewed-by: Fujii MasaoDiscussion:https://postgr.es/m/20240702163444.ab586f6075e502eb84f11b1a@sranhm.sraoss.co.jp

1 parent23d0b48 commit412229dCopy full SHA for 412229d

File tree

3 files changed

+13

-42

lines changed

src
- backend
  - catalog
    - pg_largeobject.c
  - storage/large_object
    - inv_api.c
- include/catalog
  - pg_largeobject.h

3 files changed

+13

-42

lines changed

`‎src/backend/catalog/pg_largeobject.c`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@`
`14`	`14`	`*/`
`15`	`15`	`#include"postgres.h"`
`16`	`16`
`17`		`-#include"access/genam.h"`
`18`		`-#include"access/htup_details.h"`
`19`	`17`	`#include"access/table.h"`
`20`	`18`	`#include"catalog/catalog.h"`
`21`	`19`	`#include"catalog/indexing.h"`
`@@ -153,6 +151,15 @@ LargeObjectDrop(Oid loid)`
`153`	`151`	`*/`
`154`	`152`	`bool`
`155`	`153`	`LargeObjectExists(Oidloid)`
	`154`	`+{`
	`155`	`+returnLargeObjectExistsWithSnapshot(loid,NULL);`
	`156`	`+}`
	`157`	`+`
	`158`	`+/*`
	`159`	`+ * Same as LargeObjectExists(), except snapshot to read with can be specified.`
	`160`	`+ */`
	`161`	`+bool`
	`162`	`+LargeObjectExistsWithSnapshot(Oidloid,Snapshotsnapshot)`
`156`	`163`	`{`
`157`	`164`	`Relationpg_lo_meta;`
`158`	`165`	`ScanKeyDataskey[1];`
`@@ -170,7 +177,7 @@ LargeObjectExists(Oid loid)`
`170`	`177`
`171`	`178`	`sd=systable_beginscan(pg_lo_meta,`
`172`	`179`	`LargeObjectMetadataOidIndexId, true,`
`173`		`-NULL,1,skey);`
	`180`	`+snapshot,1,skey);`
`174`	`181`
`175`	`182`	`tuple=systable_getnext(sd);`
`176`	`183`	`if (HeapTupleIsValid(tuple))`

`‎src/backend/storage/large_object/inv_api.c`

Lines changed: 1 addition & 39 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@`
`41`	`41`	`#include"catalog/indexing.h"`
`42`	`42`	`#include"catalog/objectaccess.h"`
`43`	`43`	`#include"catalog/pg_largeobject.h"`
`44`		`-#include"catalog/pg_largeobject_metadata.h"`
`45`	`44`	`#include"libpq/libpq-fs.h"`
`46`	`45`	`#include"miscadmin.h"`
`47`	`46`	`#include"storage/large_object.h"`
`@@ -123,43 +122,6 @@ close_lo_relation(bool isCommit)`
`123`	`122`	`}`
`124`	`123`
`125`	`124`
`126`		`-/*`
`127`		`- * Same as pg_largeobject.c's LargeObjectExists(), except snapshot to`
`128`		`- * read with can be specified.`
`129`		`- */`
`130`		`-staticbool`
`131`		`-myLargeObjectExists(Oidloid,Snapshotsnapshot)`
`132`		`-{`
`133`		`-Relationpg_lo_meta;`
`134`		`-ScanKeyDataskey[1];`
`135`		`-SysScanDescsd;`
`136`		`-HeapTupletuple;`
`137`		`-boolretval= false;`
`138`		`-`
`139`		`-ScanKeyInit(&skey[0],`
`140`		`-Anum_pg_largeobject_metadata_oid,`
`141`		`-BTEqualStrategyNumber,F_OIDEQ,`
`142`		`-ObjectIdGetDatum(loid));`
`143`		`-`
`144`		`-pg_lo_meta=table_open(LargeObjectMetadataRelationId,`
`145`		`-AccessShareLock);`
`146`		`-`
`147`		`-sd=systable_beginscan(pg_lo_meta,`
`148`		`-LargeObjectMetadataOidIndexId, true,`
`149`		`-snapshot,1,skey);`
`150`		`-`
`151`		`-tuple=systable_getnext(sd);`
`152`		`-if (HeapTupleIsValid(tuple))`
`153`		`-retval= true;`
`154`		`-`
`155`		`-systable_endscan(sd);`
`156`		`-`
`157`		`-table_close(pg_lo_meta,AccessShareLock);`
`158`		`-`
`159`		`-returnretval;`
`160`		`-}`
`161`		`-`
`162`		`-`
`163`	`125`	`/*`
`164`	`126`	`* Extract data field from a pg_largeobject tuple, detoasting if needed`
`165`	`127`	`* and verifying that the length is sane. Returns data pointer (a bytea *),`
`@@ -279,7 +241,7 @@ inv_open(Oid lobjId, int flags, MemoryContext mcxt)`
`279`	`241`	`snapshot=GetActiveSnapshot();`
`280`	`242`
`281`	`243`	`/* Can't use LargeObjectExists here because we need to specify snapshot */`
`282`		`-if (!myLargeObjectExists(lobjId,snapshot))`
	`244`	`+if (!LargeObjectExistsWithSnapshot(lobjId,snapshot))`
`283`	`245`	`ereport(ERROR,`
`284`	`246`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`285`	`247`	`errmsg("large object %u does not exist",lobjId)));`

`‎src/include/catalog/pg_largeobject.h`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`#include"catalog/genbki.h"`
`22`	`22`	`#include"catalog/pg_largeobject_d.h"`
	`23`	`+#include"utils/snapshot.h"`
`23`	`24`
`24`	`25`	`/* ----------------`
`25`	`26`	`*pg_largeobject definition. cpp turns this into`
`@@ -49,5 +50,6 @@ DECLARE_UNIQUE_INDEX_PKEY(pg_largeobject_loid_pn_index, 2683, LargeObjectLOidPNI`
`49`	`50`	`externOidLargeObjectCreate(Oidloid);`
`50`	`51`	`externvoidLargeObjectDrop(Oidloid);`
`51`	`52`	`externboolLargeObjectExists(Oidloid);`
	`53`	`+externboolLargeObjectExistsWithSnapshot(Oidloid,Snapshotsnapshot);`
`52`	`54`
`53`	`55`	`#endif/* PG_LARGEOBJECT_H */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit412229d

File tree

3 files changed

3 files changed

`‎src/backend/catalog/pg_largeobject.c`

`‎src/backend/storage/large_object/inv_api.c`

`‎src/include/catalog/pg_largeobject.h`

0 commit comments