Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ef6ccb0

Browse files
committed
Cleanup some minor oversights in optional-OIDs stuff.
1 parent bf56f07 commit ef6ccb0

File tree

5 files changed

+11
-16
lines changed

5 files changed

+11
-16
lines changed

doc/src/sgml/ref/create_table.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.43 2001/08/10 18:57:32 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_table.sgml,v 1.44 2001/08/10 20:52:24 tgl Exp $
33
Postgres documentation
44
-->
55

@@ -2155,7 +2155,7 @@ ALTER DOMAIN cities
21552155
</para>
21562156
</refsect3>
21572157

2158-
<refsect3 id="R3-SQL-INHERITANCE-1">
2158+
<refsect3 id="R3-SQL-OBJECTIDS-1">
21592159
<title>
21602160
Object IDs
21612161
</title>

src/backend/catalog/pg_largeobject.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_largeobject.c,v 1.9 2001/06/22 19:16:21 wieck Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_largeobject.c,v 1.10 2001/08/10 20:52:24 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -30,13 +30,10 @@
3030
* We do this by inserting an empty first page, so that the object will
3131
* appear to exist with size 0. Note that the unique index will reject
3232
* an attempt to create a duplicate page.
33-
*
34-
* Return value is OID assigned to the page tuple (any use in it?)
3533
*/
36-
Oid
34+
void
3735
LargeObjectCreate(Oid loid)
3836
{
39-
Oid retval;
4037
Relation pg_largeobject;
4138
HeapTuple ntup;
4239
Relation idescs[Num_pg_largeobject_indices];
@@ -66,7 +63,7 @@ LargeObjectCreate(Oid loid)
6663
/*
6764
* Insert it
6865
*/
69-
retval = heap_insert(pg_largeobject, ntup);
66+
heap_insert(pg_largeobject, ntup);
7067

7168
/*
7269
* Update indices
@@ -81,8 +78,6 @@ LargeObjectCreate(Oid loid)
8178
heap_close(pg_largeobject, RowExclusiveLock);
8279

8380
heap_freetuple(ntup);
84-
85-
return retval;
8681
}
8782

8883
void

src/backend/storage/large_object/inv_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.88 2001/06/22 19:16:23 wieck Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.89 2001/08/10 20:52:24 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -78,7 +78,7 @@ inv_create(int flags)
7878
* Create the LO by writing an empty first page for it in
7979
* pg_largeobject
8080
*/
81-
(void) LargeObjectCreate(file_oid);
81+
LargeObjectCreate(file_oid);
8282

8383
/*
8484
* Advance command counter so that new tuple will be seen by later

src/include/catalog/pg_largeobject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
99
* Portions Copyright (c) 1994, Regents of the University of California
1010
*
11-
* $Id: pg_largeobject.h,v 1.8 2001/08/10 18:57:40 tgl Exp $
11+
* $Id: pg_largeobject.h,v 1.9 2001/08/10 20:52:25 tgl Exp $
1212
*
1313
* NOTES
1414
* the genbki.sh script reads this file and generates .bki
@@ -55,7 +55,7 @@ typedef FormData_pg_largeobject *Form_pg_largeobject;
5555
#define Anum_pg_largeobject_pageno 2
5656
#define Anum_pg_largeobject_data 3
5757

58-
extern Oid LargeObjectCreate(Oid loid);
58+
extern void LargeObjectCreate(Oid loid);
5959
extern void LargeObjectDrop(Oid loid);
6060
extern bool LargeObjectExists(Oid loid);
6161

src/include/catalog/pg_proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_proc.h,v 1.201 2001/08/10 18:57:40 tgl Exp $
10+
* $Id: pg_proc.h,v 1.202 2001/08/10 20:52:25 tgl Exp $
1111
*
1212
* NOTES
1313
* The script catalog/genbki.sh reads this file and generates .bki
@@ -1483,7 +1483,7 @@ DESCR("convert int4 to reltime");
14831483

14841484
DATA(insert OID = 1215 ( obj_description PGUID 14 f t f t 2 f 25 "26 19" 100 0 0 100 "select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = $2) and objsubid = 0" - ));
14851485
DESCR("get description for object id and catalog name");
1486-
DATA(insert OID = 1216 ( col_description PGUID 14 f t f t 2 f 25 "26 23" 100 0 0 100 "select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = 'pg_class') and objsubid = $2" - ));
1486+
DATA(insert OID = 1216 ( col_description PGUID 14 f t f t 2 f 25 "26 23" 100 0 0 100 "select description from pg_description where objoid = $1 and classoid = (select oid from pg_class where relname = \'pg_class\') and objsubid = $2" - ));
14871487
DESCR("get description for table column");
14881488

14891489
DATA(insert OID = 1217 ( date_trunc PGUID 12 f t f t 2 f 1184 "25 1184" 100 0 0 100 timestamp_trunc - ));

0 commit comments

Comments
 (0)