Skip to content

Commit 2193a85

Browse files
tglsfdctglsfdc
committed
Simplify initdb-time assignment of OIDs as I proposed yesterday, and
avoid encroaching on the 'user' range of OIDs by allowing automatic OID assignment to use values below 16k until we reach normal operation. initdb not forced since this doesn't make any incompatible change; however a lot of stuff will have different OIDs after your next initdb.
1 parent 2fdf9e0 commit 2193a85

File tree

10 files changed

+68
-93
lines changed

10 files changed

+68
-93
lines changed

‎doc/src/sgml/bki.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.14 2005/03/29 19:44:22 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.15 2005/04/13 18:54:55 tgl Exp $
33
-->
44

55
<chapter id="bki">
@@ -167,8 +167,8 @@ $PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.14 2005/03/29 19:44:22 tgl Exp $
167167
values and <replaceable
168168
class="parameter">oid_value</replaceable> for its OID. If
169169
<replaceable class="parameter">oid_value</replaceable> is zero
170-
(0) or the clause is omitted, then the next available OID is
171-
used.
170+
(0) or the clause is omitted, and the table has OIDs, then the
171+
next available OID is assigned.
172172
</para>
173173

174174
<para>

‎src/backend/access/transam/varsup.c

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.62 2005/02/20 21:46:48 tgl Exp $
9+
* $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.63 2005/04/13 18:54:56 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -265,14 +265,36 @@ GetNewObjectId(void)
265265
/*
266266
* Check for wraparound of the OID counter. We *must* not return 0
267267
* (InvalidOid); and as long as we have to check that, it seems a good
268-
* idea to skip over everything below BootstrapObjectIdData too. (This
268+
* idea to skip over everything below FirstNormalObjectId too. (This
269269
* basically just reduces the odds of OID collision right after a wrap
270270
* occurs.) Note we are relying on unsigned comparison here.
271+
*
272+
* During initdb, we start the OID generator at FirstBootstrapObjectId,
273+
* so we only enforce wrapping to that point when in bootstrap or
274+
* standalone mode. The first time through this routine after normal
275+
* postmaster start, the counter will be forced up to FirstNormalObjectId.
276+
* This mechanism leaves the OIDs between FirstBootstrapObjectId and
277+
* FirstNormalObjectId available for automatic assignment during initdb,
278+
* while ensuring they will never conflict with user-assigned OIDs.
271279
*/
272-
if (ShmemVariableCache->nextOid < ((Oid) BootstrapObjectIdData))
280+
if (ShmemVariableCache->nextOid < ((Oid) FirstNormalObjectId))
273281
{
274-
ShmemVariableCache->nextOid = BootstrapObjectIdData;
275-
ShmemVariableCache->oidCount = 0;
282+
if (IsPostmasterEnvironment)
283+
{
284+
/* wraparound in normal environment */
285+
ShmemVariableCache->nextOid = FirstNormalObjectId;
286+
ShmemVariableCache->oidCount = 0;
287+
}
288+
else
289+
{
290+
/* we may be bootstrapping, so don't enforce the full range */
291+
if (ShmemVariableCache->nextOid < ((Oid) FirstBootstrapObjectId))
292+
{
293+
/* wraparound in standalone environment? */
294+
ShmemVariableCache->nextOid = FirstBootstrapObjectId;
295+
ShmemVariableCache->oidCount = 0;
296+
}
297+
}
276298
}
277299

278300
/* If we run out of logged for use oids then we must log more */

‎src/backend/access/transam/xlog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.183 2005/03/29 03:01:30 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.184 2005/04/13 18:54:56 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -3505,7 +3505,7 @@ BootStrapXLOG(void)
35053505
checkPoint.undo = checkPoint.redo;
35063506
checkPoint.ThisTimeLineID = ThisTimeLineID;
35073507
checkPoint.nextXid = FirstNormalTransactionId;
3508-
checkPoint.nextOid = BootstrapObjectIdData;
3508+
checkPoint.nextOid = FirstBootstrapObjectId;
35093509
checkPoint.time = time(NULL);
35103510

35113511
ShmemVariableCache->nextXid = checkPoint.nextXid;

‎src/backend/catalog/genbki.sh

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
#
1212
# IDENTIFICATION
13-
# $PostgreSQL: pgsql/src/backend/catalog/genbki.sh,v 1.33 2005/03/29 00:16:55 tgl Exp $
13+
# $PostgreSQL: pgsql/src/backend/catalog/genbki.sh,v 1.34 2005/04/13 18:54:56 tgl Exp $
1414
#
1515
# NOTES
1616
# non-essential whitespace is removed from the generated file.
@@ -121,15 +121,6 @@ for dir in $INCLUDE_DIRS; do
121121
fi
122122
done
123123

124-
# Get FirstGenBKIObjectId from access/transam.h
125-
for dir in $INCLUDE_DIRS; do
126-
if [ -f "$dir/access/transam.h" ]; then
127-
BKIOBJECTID=`grep '^#define[ ]*FirstGenBKIObjectId' $dir/access/transam.h | $AWK '{ print $3 }'`
128-
break
129-
fi
130-
done
131-
export BKIOBJECTID
132-
133124
touch ${OUTPUT_PREFIX}.description.$$
134125

135126
# ----------------
@@ -173,8 +164,7 @@ sed -e "s/;[ ]*$//g" \
173164
# contents of a catalog definition.
174165
# reln_open is a flag indicating when we are processing DATA lines.
175166
# (i.e. have a relation open and need to close it)
176-
# nextbkioid is the next OID available for automatic assignment.
177-
# oid is the most recently seen or assigned oid.
167+
# oid is the most recently seen oid, or 0 if none in the last DATA line.
178168
# ----------------
179169
BEGIN {
180170
inside = 0;
@@ -184,7 +174,6 @@ BEGIN {
184174
nc = 0;
185175
reln_open = 0;
186176
comment_level = 0;
187-
nextbkioid = ENVIRON["BKIOBJECTID"];
188177
oid = 0;
189178
}
190179
@@ -202,9 +191,8 @@ comment_level > 0 { next; }
202191
203192
# ----------------
204193
# DATA() statements are basically passed right through after
205-
# stripping off the DATA( and the ) on the end. However,
206-
# if we see "OID = 0" then we should assign an oid from nextbkioid.
207-
# Remember any explicit or assigned OID for use by DESCR().
194+
# stripping off the DATA( and the ) on the end.
195+
# Remember any explicit OID for use by DESCR().
208196
# ----------------
209197
/^DATA\(/ {
210198
data = substr($0, 6, length($0) - 6);
@@ -213,12 +201,6 @@ comment_level > 0 { next; }
213201
if (nf >= 4 && datafields[1] == "insert" && datafields[2] == "OID" && datafields[3] == "=")
214202
{
215203
oid = datafields[4];
216-
if (oid == 0)
217-
{
218-
oid = nextbkioid;
219-
nextbkioid++;
220-
sub("OID *= *0", "OID = " oid, data);
221-
}
222204
}
223205
print data;
224206
next;

‎src/backend/storage/lmgr/lock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.148 2005/03/11 03:52:06 neilc Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.149 2005/04/13 18:54:56 tgl Exp $
1212
*
1313
* NOTES
1414
* Outside modules can create a lock table and acquire/release
@@ -97,7 +97,7 @@ static const char *const lock_mode_names[] =
9797
* --------
9898
*/
9999

100-
int Trace_lock_oidmin = BootstrapObjectIdData;
100+
int Trace_lock_oidmin = FirstNormalObjectId;
101101
bool Trace_locks = false;
102102
bool Trace_userlocks = false;
103103
int Trace_lock_table = 0;

‎src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.258 2005/04/08 00:59:59 neilc Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.259 2005/04/13 18:54:56 tgl Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1090,7 +1090,7 @@ static struct config_int ConfigureNamesInt[] =
10901090
GUC_NOT_IN_SAMPLE
10911091
},
10921092
&Trace_lock_oidmin,
1093-
BootstrapObjectIdData, 0, INT_MAX, NULL, NULL
1093+
FirstNormalObjectId, 0, INT_MAX, NULL, NULL
10941094
},
10951095
{
10961096
{"trace_lock_table", PGC_SUSET, DEVELOPER_OPTIONS,

‎src/bin/pg_resetxlog/pg_resetxlog.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
2424
* Portions Copyright (c) 1994, Regents of the University of California
2525
*
26-
* $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.30 2005/03/29 03:01:32 tgl Exp $
26+
* $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.31 2005/04/13 18:54:56 tgl Exp $
2727
*
2828
*-------------------------------------------------------------------------
2929
*/
@@ -404,7 +404,7 @@ GuessControlValues(void)
404404
ControlFile.checkPointCopy.undo = ControlFile.checkPointCopy.redo;
405405
ControlFile.checkPointCopy.ThisTimeLineID = 1;
406406
ControlFile.checkPointCopy.nextXid = (TransactionId) 514; /* XXX */
407-
ControlFile.checkPointCopy.nextOid = BootstrapObjectIdData;
407+
ControlFile.checkPointCopy.nextOid = FirstBootstrapObjectId;
408408
ControlFile.checkPointCopy.time = time(NULL);
409409

410410
ControlFile.state = DB_SHUTDOWNED;

‎src/include/access/transam.h

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/access/transam.h,v 1.53 2005/02/20 21:46:50 tgl Exp $
10+
* $PostgreSQL: pgsql/src/include/access/transam.h,v 1.54 2005/04/13 18:54:57 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -55,23 +55,24 @@
5555
* OIDs 1-9999 are reserved for manual assignment (see the files
5656
* in src/include/catalog/).
5757
*
58-
* OIDS 10000-16383 are reserved for assignment by genbki.sh.
58+
* OIDS 10000-16383 are reserved for assignment during initdb
59+
* using the OID generator. (We start the generator at 10000.)
5960
*
60-
* OIDs beginning at 16384 are assigned at runtime from the OID
61-
* generator. (The first few of these will be assigned during initdb,
62-
* to objects created after the initial BKI script processing.)
61+
* OIDs beginning at 16384 are assigned from the OID generator
62+
* during normal multiuser operation. (We force the generator up to
63+
* 16384 as soon as we are in normal operation.)
6364
*
6465
* The choices of 10000 and 16384 are completely arbitrary, and can be moved
6566
* if we run low on OIDs in either category. Changing the macros below
6667
* should be sufficient to do this.
6768
*
68-
* NOTE: if the OID generator wraps around, we should skip over OIDs 0-16383
69+
* NOTE: if the OID generator wraps around, we skip over OIDs 0-16383
6970
* and resume with 16384. This minimizes the odds of OID conflict, by not
7071
* reassigning OIDs that might have been assigned during initdb.
7172
* ----------
7273
*/
73-
#define FirstGenBKIObjectId 10000
74-
#define BootstrapObjectIdData 16384
74+
#define FirstBootstrapObjectId 10000
75+
#define FirstNormalObjectId 16384
7576

7677
/*
7778
* VariableCache is placed in shmem and used by

‎src/include/catalog/duplicate_oids

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,18 @@
22
#
33
# duplicate_oids
44
#
5-
# finds oids that are duplicated in the system tables.
5+
# $PostgreSQL: pgsql/src/include/catalog/duplicate_oids,v 1.6 2005/04/13 18:54:57 tgl Exp $
66
#
7-
8-
FILES=`ls pg_*.h`
9-
7+
# finds manually-assigned oids that are duplicated in the system tables.
108
#
11-
# The previous version did not use the -d option on uniq
12-
# so check here that it is supported.
13-
# Otherwise, use the old algorithm
9+
# run this script in src/include/catalog.
1410
#
1511

16-
if [ `uniq -d < /dev/null > /dev/null 2>&1` ]; then
17-
echo "uniq -d is not supported on your platform."
18-
echo "Please report this to pgsql-hackers@postgresql.org"
19-
20-
egrep '^DATA' $FILES | \
21-
sed -e 's/^.*OID[^=]*=[^0-9]*//' -e 's/[^0-9].*$//' | \
22-
sort -n >/tmp/alloids.$$
23-
uniq /tmp/alloids.$$ >/tmp/uniqoids.$$
24-
25-
diff -u /tmp/alloids.$$ /tmp/uniqoids.$$ | \
26-
grep -v '/tmp/' | \
27-
grep '^-' | \
28-
sed -e 's/^-//' | \
29-
grep -v '^0$' | \
30-
uniq
31-
rm /tmp/alloids.$$
32-
rm /tmp/uniqoids.$$
33-
34-
else
35-
36-
# echo "uniq -d is supported on this platform."
37-
# echo "Will omit the use of temporary files."
12+
FILES=`ls pg_*.h`
3813

3914
egrep '^DATA' $FILES | \
4015
sed -e 's/^.*OID[^=]*=[^0-9]*//' -e 's/[^0-9].*$//' | \
4116
sort -n | uniq -d | \
42-
egrep -v '^[0]*$'
43-
44-
fi
17+
egrep -v '^0*$'
4518

46-
exit
19+
exit 0

‎src/include/catalog/unused_oids

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
#!/bin/sh
2+
#
23
# unused_oids
34
#
4-
# $PostgreSQL: pgsql/src/include/catalog/unused_oids,v 1.5 2003/11/29 19:52:08 pgsql Exp $
5+
# $PostgreSQL: pgsql/src/include/catalog/unused_oids,v 1.6 2005/04/13 18:54:57 tgl Exp $
56
#
6-
# finds blocks of oids that have not already been claimed by
7-
# post_hackers for internal purposes. primarily useful for
8-
# finding valid oids for new internal function oids. the numbers
9-
# printed are inclusive ranges of valid (unused) oids.
7+
# finds blocks of manually-assignable oids that have not already been
8+
# claimed by post_hackers. primarily useful for finding available
9+
# oids for new internal functions. the numbers printed are inclusive
10+
# ranges of unused oids.
1011
#
1112
# before using a large empty block, make sure you aren't about
1213
# to take over what was intended as expansion space for something
13-
# else. also, before using a number, do a "grepsrc" to make sure
14-
# that someone isn't using a literal numeric constant somewhere..
15-
#
16-
# non-berkeley post_hackers should probably not try to use oids
17-
# less than the highest one that comes with the distributed source.
14+
# else.
1815
#
1916
# run this script in src/include/catalog.
2017
#
2118

2219

2320
AWK="awk"
2421

25-
# Get FirstGenBKIObjectId from access/transam.h
26-
BKIOBJECTID=`grep '#define[ ]*FirstGenBKIObjectId' ../access/transam.h | $AWK '{ print $3 }'`
27-
export BKIOBJECTID
22+
# Get FirstBootstrapObjectId from access/transam.h
23+
FIRSTOBJECTID=`grep '#define[ ]*FirstBootstrapObjectId' ../access/transam.h | $AWK '{ print $3 }'`
24+
export FIRSTOBJECTID
2825

2926
egrep '^DATA' pg_*.h | \
3027
sed -e 's/^.*OID[^=]*=[^0-9]*//' -e 's/[^0-9].*$//' | \
@@ -45,5 +42,5 @@ BEGIN {
4542
last = $1;
4643
}
4744
END {
48-
print last + 1, "-", ENVIRON["BKIOBJECTID"]-1;
45+
print last + 1, "-", ENVIRON["FIRSTOBJECTID"]-1;
4946
}'

0 commit comments

Comments
 (0)