Skip to content

Commit b0f5086

Browse files
bmomjianbmomjian
committed
oid is needed, it is added at the end of the struct (after the null
bitmap, if present). Per Tom Lane's suggestion the information whether a tuple has an oid or not is carried in the tuple descriptor. For debugging reasons tdhasoid is of type char, not bool. There are predefined values for WITHOID, WITHOUTOID and UNDEFOID. This patch has been generated against a cvs snapshot from last week and I don't expect it to apply cleanly to current sources. While I post it here for public review, I'm working on a new version against a current snapshot. (There's been heavy activity recently; hope to catch up some day ...) This is a long patch; if it is too hard to swallow, I can provide it in smaller pieces: Part 1: Accessor macros Part 2: tdhasoid in TupDesc Part 3: Regression test Part 4: Parameter withoid to heap_addheader Part 5: Eliminate t_oid from HeapTupleHeader Part 2 is the most hairy part because of changes in the executor and even in the parser; the other parts are straightforward. Up to part 4 the patched postmaster stays binary compatible to databases created with an unpatched version. Part 5 is small (100 lines) and finally breaks compatibility. Manfred Koizar
1 parent 38dd3ae commit b0f5086

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+414
-198
lines changed

‎contrib/dbsize/dbsize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ database_size(PG_FUNCTION_ARGS)
6565
if (!HeapTupleIsValid(tuple))
6666
elog(ERROR, "database %s does not exist", NameStr(*dbname));
6767

68-
dbid = tuple->t_data->t_oid;
68+
dbid = HeapTupleGetOid(tuple);
6969
if (dbid == InvalidOid)
7070
elog(ERROR, "invalid database id");
7171

‎contrib/fulltextindex/fti.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ fti(PG_FUNCTION_ARGS)
190190
tupdesc = rel->rd_att; /* what the tuple looks like (?) */
191191

192192
/* get oid of current tuple, needed by all, so place here */
193-
oid = rettuple->t_data->t_oid;
193+
oid = rel->rd_rel->relhasoids ? HeapTupleGetOid(rettuple) : InvalidOid;
194194
if (!OidIsValid(oid))
195195
elog(ERROR, "Full Text Indexing: Oid of current tuple is invalid");
196196

‎contrib/rserv/rserv.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ _rserv_log_()
102102

103103
if (keynum == ObjectIdAttributeNumber)
104104
{
105-
sprintf(oidbuf, "%u", tuple->t_data->t_oid);
105+
sprintf(oidbuf, "%u", rel->rd_rel->relhasoids
106+
? HeapTupleGetOid(tuple)
107+
: InvalidOid);
106108
key = oidbuf;
107109
}
108110
else

‎src/backend/access/common/heaptuple.c

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.77 2002/06/20 20:29:24 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.78 2002/07/20 05:16:56 momjian Exp $
1313
*
1414
* NOTES
1515
* The old interface functions have been converted to macros
@@ -436,7 +436,7 @@ heap_getsysattr(HeapTuple tup, int attnum, bool *isnull)
436436
result = PointerGetDatum(&(tup->t_self));
437437
break;
438438
case ObjectIdAttributeNumber:
439-
result = ObjectIdGetDatum(tup->t_data->t_oid);
439+
result = ObjectIdGetDatum(HeapTupleGetOid(tup));
440440
break;
441441
case MinTransactionIdAttributeNumber:
442442
result = TransactionIdGetDatum(HeapTupleHeaderGetXmin(tup->t_data));
@@ -581,6 +581,8 @@ heap_formtuple(TupleDesc tupleDescriptor,
581581
elog(ERROR, "heap_formtuple: numberOfAttributes %d exceeds limit %d",
582582
numberOfAttributes, MaxTupleAttributeNumber);
583583

584+
AssertTupleDescHasOidIsValid(tupleDescriptor);
585+
584586
for (i = 0; i < numberOfAttributes; i++)
585587
{
586588
if (nulls[i] != ' ')
@@ -595,6 +597,9 @@ heap_formtuple(TupleDesc tupleDescriptor,
595597
if (hasnull)
596598
len += BITMAPLEN(numberOfAttributes);
597599

600+
if (tupleDescriptor->tdhasoid == WITHOID)
601+
len += sizeof(Oid);
602+
598603
hoff = len = MAXALIGN(len); /* align user data safely */
599604

600605
len += ComputeDataSize(tupleDescriptor, value, nulls);
@@ -698,14 +703,18 @@ heap_modifytuple(HeapTuple tuple,
698703
* t_infomask
699704
*/
700705
infomask = newTuple->t_data->t_infomask;
701-
memmove((char *) &newTuple->t_data->t_oid, /* XXX */
702-
(char *) &tuple->t_data->t_oid,
703-
((char *) &tuple->t_data->t_hoff -
704-
(char *) &tuple->t_data->t_oid)); /* XXX */
706+
/*
707+
* copy t_xmin, t_cid, t_xmax, t_ctid, t_natts, t_infomask
708+
*/
709+
memmove((char *) newTuple->t_data, /* XXX */
710+
(char *) tuple->t_data,
711+
offsetof(HeapTupleHeaderData, t_hoff)); /* XXX */
705712
newTuple->t_data->t_infomask = infomask;
706713
newTuple->t_data->t_natts = numberOfAttributes;
707714
newTuple->t_self = tuple->t_self;
708715
newTuple->t_tableOid = tuple->t_tableOid;
716+
if (relation->rd_rel->relhasoids)
717+
HeapTupleSetOid(newTuple, HeapTupleGetOid(tuple));
709718

710719
return newTuple;
711720
}
@@ -738,6 +747,7 @@ heap_freetuple(HeapTuple htup)
738747
*/
739748
HeapTuple
740749
heap_addheader(int natts, /* max domain index */
750+
bool withoid, /* reserve space for oid */
741751
Size structlen, /* its length */
742752
void *structure) /* pointer to the struct */
743753
{
@@ -749,7 +759,10 @@ heap_addheader(int natts, /* max domain index */
749759
AssertArg(natts > 0);
750760

751761
/* header needs no null bitmap */
752-
hoff = MAXALIGN(offsetof(HeapTupleHeaderData, t_bits));
762+
hoff = offsetof(HeapTupleHeaderData, t_bits);
763+
if (withoid)
764+
hoff += sizeof(Oid);
765+
hoff = MAXALIGN(hoff);
753766
len = hoff + structlen;
754767

755768
tuple = (HeapTuple) palloc(HEAPTUPLESIZE + len);

‎src/backend/access/common/tupdesc.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.80 2002/06/20 20:29:24 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.81 2002/07/20 05:16:56 momjian Exp $
1212
*
1313
* NOTES
1414
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -36,7 +36,7 @@
3636
* ----------------------------------------------------------------
3737
*/
3838
TupleDesc
39-
CreateTemplateTupleDesc(int natts)
39+
CreateTemplateTupleDesc(int natts, hasoid_t withoid)
4040
{
4141
uint32 size;
4242
TupleDesc desc;
@@ -58,6 +58,7 @@ CreateTemplateTupleDesc(int natts)
5858
MemSet(desc->attrs, 0, size);
5959

6060
desc->natts = natts;
61+
desc->tdhasoid = withoid;
6162

6263
return desc;
6364
}
@@ -82,6 +83,7 @@ CreateTupleDesc(int natts, Form_pg_attribute *attrs)
8283
desc->attrs = attrs;
8384
desc->natts = natts;
8485
desc->constr = NULL;
86+
desc->tdhasoid = UNDEFOID;
8587

8688
return desc;
8789
}
@@ -116,6 +118,7 @@ CreateTupleDescCopy(TupleDesc tupdesc)
116118
desc->attrs[i]->atthasdef = false;
117119
}
118120
desc->constr = NULL;
121+
desc->tdhasoid = tupdesc->tdhasoid;
119122

120123
return desc;
121124
}
@@ -182,6 +185,7 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)
182185
else
183186
desc->constr = NULL;
184187

188+
desc->tdhasoid = tupdesc->tdhasoid;
185189
return desc;
186190
}
187191

@@ -235,6 +239,8 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)
235239

236240
if (tupdesc1->natts != tupdesc2->natts)
237241
return false;
242+
if (tupdesc1->tdhasoid != tupdesc2->tdhasoid)
243+
return false;
238244
for (i = 0; i < tupdesc1->natts; i++)
239245
{
240246
Form_pg_attribute attr1 = tupdesc1->attrs[i];
@@ -392,7 +398,7 @@ TupleDescInitEntry(TupleDesc desc,
392398
*/
393399
typeForm = (Form_pg_type) GETSTRUCT(tuple);
394400

395-
att->atttypid = tuple->t_data->t_oid;
401+
att->atttypid = HeapTupleGetOid(tuple);
396402

397403
/*
398404
* There are a couple of cases where we must override the information
@@ -479,7 +485,7 @@ BuildDescForRelation(List *schema)
479485
* allocate a new tuple descriptor
480486
*/
481487
natts = length(schema);
482-
desc = CreateTemplateTupleDesc(natts);
488+
desc = CreateTemplateTupleDesc(natts, UNDEFOID);
483489
constr->has_not_null = false;
484490

485491
attnum = 0;
@@ -646,7 +652,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
646652
/* OK, get the column alias */
647653
attname = strVal(lfirst(colaliases));
648654

649-
tupdesc = CreateTemplateTupleDesc(1);
655+
tupdesc = CreateTemplateTupleDesc(1, WITHOUTOID);
650656
TupleDescInitEntry(tupdesc,
651657
(AttrNumber) 1,
652658
attname,

‎src/backend/access/heap/heapam.c

Lines changed: 60 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.141 2002/07/02 05:48:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.142 2002/07/20 05:16:56 momjian Exp $
1212
*
1313
*
1414
* INTERFACE ROUTINES
@@ -1116,10 +1116,11 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid)
11161116
* to support a persistent object store (objects need to contain
11171117
* pointers to one another).
11181118
*/
1119-
if (!OidIsValid(tup->t_data->t_oid))
1120-
tup->t_data->t_oid = newoid();
1119+
AssertTupleDescHasOid(relation->rd_att);
1120+
if (!OidIsValid(HeapTupleGetOid(tup)))
1121+
HeapTupleSetOid(tup, newoid());
11211122
else
1122-
CheckMaxObjectId(tup->t_data->t_oid);
1123+
CheckMaxObjectId(HeapTupleGetOid(tup));
11231124
}
11241125

11251126
HeapTupleHeaderSetXmin(tup->t_data, GetCurrentTransactionId());
@@ -1166,7 +1167,13 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid)
11661167
rdata[0].len = SizeOfHeapInsert;
11671168
rdata[0].next = &(rdata[1]);
11681169

1169-
xlhdr.t_oid = tup->t_data->t_oid;
1170+
if (relation->rd_rel->relhasoids)
1171+
{
1172+
AssertTupleDescHasOid(relation->rd_att);
1173+
xlhdr.t_oid = HeapTupleGetOid(tup);
1174+
}
1175+
else
1176+
xlhdr.t_oid = InvalidOid;
11701177
xlhdr.t_natts = tup->t_data->t_natts;
11711178
xlhdr.t_hoff = tup->t_data->t_hoff;
11721179
xlhdr.mask = tup->t_data->t_infomask;
@@ -1176,6 +1183,7 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid)
11761183
rdata[1].next = &(rdata[2]);
11771184

11781185
rdata[2].buffer = buffer;
1186+
/* PG73FORMAT: write bitmap [+ padding] [+ oid] + data */
11791187
rdata[2].data = (char *) tup->t_data + offsetof(HeapTupleHeaderData, t_bits);
11801188
rdata[2].len = tup->t_len - offsetof(HeapTupleHeaderData, t_bits);
11811189
rdata[2].next = NULL;
@@ -1206,7 +1214,11 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid)
12061214
*/
12071215
CacheInvalidateHeapTuple(relation, tup);
12081216

1209-
return tup->t_data->t_oid;
1217+
if (!relation->rd_rel->relhasoids)
1218+
return InvalidOid;
1219+
1220+
AssertTupleDescHasOid(relation->rd_att);
1221+
return HeapTupleGetOid(tup);
12101222
}
12111223

12121224
/*
@@ -1499,7 +1511,11 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
14991511
}
15001512

15011513
/* Fill in OID and transaction status data for newtup */
1502-
newtup->t_data->t_oid = oldtup.t_data->t_oid;
1514+
if (relation->rd_rel->relhasoids)
1515+
{
1516+
AssertTupleDescHasOid(relation->rd_att);
1517+
HeapTupleSetOid(newtup, HeapTupleGetOid(&oldtup));
1518+
}
15031519
newtup->t_data->t_infomask &= ~(HEAP_XACT_MASK);
15041520
newtup->t_data->t_infomask |= (HEAP_XMAX_INVALID | HEAP_UPDATED);
15051521
HeapTupleHeaderSetXmin(newtup->t_data, GetCurrentTransactionId());
@@ -1972,24 +1988,28 @@ log_heap_update(Relation reln, Buffer oldbuf, ItemPointerData from,
19721988
rdata[1].len = 0;
19731989
rdata[1].next = &(rdata[2]);
19741990

1975-
xlhdr.hdr.t_oid = newtup->t_data->t_oid;
1991+
if (reln->rd_rel->relhasoids)
1992+
{
1993+
AssertTupleDescHasOid(reln->rd_att);
1994+
xlhdr.hdr.t_oid = HeapTupleGetOid(newtup);
1995+
}
1996+
else
1997+
xlhdr.hdr.t_oid = InvalidOid;
19761998
xlhdr.hdr.t_natts = newtup->t_data->t_natts;
19771999
xlhdr.hdr.t_hoff = newtup->t_data->t_hoff;
19782000
xlhdr.hdr.mask = newtup->t_data->t_infomask;
19792001
if (move) /* remember xmin & xmax */
19802002
{
1981-
TransactionId xmax;
1982-
TransactionId xmin;
2003+
TransactionId xid[2]; /* xmax, xmin */
19832004

1984-
if (newtup->t_data->t_infomask & HEAP_XMAX_INVALID ||
1985-
newtup->t_data->t_infomask & HEAP_MARKED_FOR_UPDATE)
1986-
xmax = InvalidTransactionId;
2005+
if (newtup->t_data->t_infomask & (HEAP_XMAX_INVALID |
2006+
HEAP_MARKED_FOR_UPDATE))
2007+
xid[0] = InvalidTransactionId;
19872008
else
1988-
xmax = HeapTupleHeaderGetXmax(newtup->t_data);
1989-
xmin = HeapTupleHeaderGetXmin(newtup->t_data);
1990-
memcpy((char *) &xlhdr + hsize, &xmax, sizeof(TransactionId));
1991-
memcpy((char *) &xlhdr + hsize + sizeof(TransactionId),
1992-
&xmin, sizeof(TransactionId));
2009+
xid[0] = HeapTupleHeaderGetXmax(newtup->t_data);
2010+
xid[1] = HeapTupleHeaderGetXmin(newtup->t_data);
2011+
memcpy((char *) &xlhdr + hsize,
2012+
(char *) xid, 2 * sizeof(TransactionId));
19932013
hsize += 2 * sizeof(TransactionId);
19942014
}
19952015
rdata[2].buffer = newbuf;
@@ -1998,6 +2018,7 @@ log_heap_update(Relation reln, Buffer oldbuf, ItemPointerData from,
19982018
rdata[2].next = &(rdata[3]);
19992019

20002020
rdata[3].buffer = newbuf;
2021+
/* PG73FORMAT: write bitmap [+ padding] [+ oid] + data */
20012022
rdata[3].data = (char *) newtup->t_data + offsetof(HeapTupleHeaderData, t_bits);
20022023
rdata[3].len = newtup->t_len - offsetof(HeapTupleHeaderData, t_bits);
20032024
rdata[3].next = NULL;
@@ -2193,19 +2214,25 @@ heap_xlog_insert(bool redo, XLogRecPtr lsn, XLogRecord *record)
21932214
memcpy((char *) &xlhdr,
21942215
(char *) xlrec + SizeOfHeapInsert,
21952216
SizeOfHeapHeader);
2217+
htup = &tbuf.hdr;
2218+
MemSet((char *) htup, 0, sizeof(HeapTupleHeaderData));
2219+
/* PG73FORMAT: get bitmap [+ padding] [+ oid] + data */
21962220
memcpy((char *) &tbuf + offsetof(HeapTupleHeaderData, t_bits),
21972221
(char *) xlrec + SizeOfHeapInsert + SizeOfHeapHeader,
21982222
newlen);
21992223
newlen += offsetof(HeapTupleHeaderData, t_bits);
2200-
htup = &tbuf.hdr;
2201-
htup->t_oid = xlhdr.t_oid;
22022224
htup->t_natts = xlhdr.t_natts;
22032225
htup->t_hoff = xlhdr.t_hoff;
22042226
htup->t_infomask = HEAP_XMAX_INVALID | xlhdr.mask;
22052227
HeapTupleHeaderSetXmin(htup, record->xl_xid);
22062228
HeapTupleHeaderSetCmin(htup, FirstCommandId);
22072229
HeapTupleHeaderSetXmaxInvalid(htup);
22082230
HeapTupleHeaderSetCmax(htup, FirstCommandId);
2231+
if (reln->rd_rel->relhasoids)
2232+
{
2233+
AssertTupleDescHasOid(reln->rd_att);
2234+
HeapTupleHeaderSetOid(htup, xlhdr.t_oid);
2235+
}
22092236

22102237
offnum = PageAddItem(page, (Item) htup, newlen, offnum,
22112238
LP_USED | OverwritePageMode);
@@ -2362,28 +2389,33 @@ newsame:;
23622389
memcpy((char *) &xlhdr,
23632390
(char *) xlrec + SizeOfHeapUpdate,
23642391
SizeOfHeapHeader);
2392+
htup = &tbuf.hdr;
2393+
MemSet((char *) htup, 0, sizeof(HeapTupleHeaderData));
2394+
/* PG73FORMAT: get bitmap [+ padding] [+ oid] + data */
23652395
memcpy((char *) &tbuf + offsetof(HeapTupleHeaderData, t_bits),
23662396
(char *) xlrec + hsize,
23672397
newlen);
23682398
newlen += offsetof(HeapTupleHeaderData, t_bits);
2369-
htup = &tbuf.hdr;
2370-
htup->t_oid = xlhdr.t_oid;
23712399
htup->t_natts = xlhdr.t_natts;
23722400
htup->t_hoff = xlhdr.t_hoff;
2401+
if (reln->rd_rel->relhasoids)
2402+
{
2403+
AssertTupleDescHasOid(reln->rd_att);
2404+
HeapTupleHeaderSetOid(htup, xlhdr.t_oid);
2405+
}
23732406
if (move)
23742407
{
2375-
TransactionId xmax;
2376-
TransactionId xmin;
2408+
TransactionId xid[2]; /* xmax, xmin */
23772409

23782410
hsize = SizeOfHeapUpdate + SizeOfHeapHeader;
2379-
memcpy(&xmax, (char *) xlrec + hsize, sizeof(TransactionId));
2380-
memcpy(&xmin, (char *) xlrec + hsize + sizeof(TransactionId), sizeof(TransactionId));
2411+
memcpy((char *) xid,
2412+
(char *) xlrec + hsize, 2 * sizeof(TransactionId));
23812413
htup->t_infomask = xlhdr.mask;
23822414
htup->t_infomask &= ~(HEAP_XMIN_COMMITTED |
23832415
HEAP_XMIN_INVALID | HEAP_MOVED_OFF);
23842416
htup->t_infomask |= HEAP_MOVED_IN;
2385-
HeapTupleHeaderSetXmin(htup, xmin);
2386-
HeapTupleHeaderSetXmax(htup, xmax);
2417+
HeapTupleHeaderSetXmin(htup, xid[1]);
2418+
HeapTupleHeaderSetXmax(htup, xid[0]);
23872419
HeapTupleHeaderSetXvac(htup, record->xl_xid);
23882420
}
23892421
else

0 commit comments

Comments
 (0)