diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/common/heaptuple.c | 22 | ||||
| -rw-r--r-- | src/backend/access/heap/tuptoaster.c | 32 |
2 files changed, 20 insertions, 34 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 5b005b3163c..daad2bd5370 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.74 2001/10/25 05:49:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.75 2002/05/27 19:53:33 tgl Exp $ * * NOTES * The old interface functions have been converted to macros @@ -571,18 +571,15 @@ heap_formtuple(TupleDesc tupleDescriptor, { HeapTuple tuple; /* return tuple */ HeapTupleHeader td; /* tuple data */ - int bitmaplen; unsigned long len; int hoff; bool hasnull = false; int i; int numberOfAttributes = tupleDescriptor->natts; - if (numberOfAttributes > MaxHeapAttributeNumber) - elog(ERROR, "heap_formtuple: numberOfAttributes of %d > %d", - numberOfAttributes, MaxHeapAttributeNumber); - - len = offsetof(HeapTupleHeaderData, t_bits); + if (numberOfAttributes > MaxTupleAttributeNumber) + elog(ERROR, "heap_formtuple: numberOfAttributes %d exceeds limit %d", + numberOfAttributes, MaxTupleAttributeNumber); for (i = 0; i < numberOfAttributes; i++) { @@ -593,13 +590,12 @@ heap_formtuple(TupleDesc tupleDescriptor, } } + len = offsetof(HeapTupleHeaderData, t_bits); + if (hasnull) - { - bitmaplen = BITMAPLEN(numberOfAttributes); - len += bitmaplen; - } + len += BITMAPLEN(numberOfAttributes); - hoff = len = MAXALIGN(len); /* be conservative here */ + hoff = len = MAXALIGN(len); /* align user data safely */ len += ComputeDataSize(tupleDescriptor, value, nulls); @@ -615,7 +611,7 @@ heap_formtuple(TupleDesc tupleDescriptor, td->t_natts = numberOfAttributes; td->t_hoff = hoff; - DataFill((char *) td + td->t_hoff, + DataFill((char *) td + hoff, tupleDescriptor, value, nulls, diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index ab5e96f8cc9..3c66aed1db1 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.31 2002/05/24 18:57:55 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/tuptoaster.c,v 1.32 2002/05/27 19:53:33 tgl Exp $ * * * INTERFACE ROUTINES @@ -715,39 +715,34 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup) */ if (need_change) { + HeapTupleHeader olddata = newtup->t_data; char *new_data; int32 new_len; - MemoryContext oldcxt; - HeapTupleHeader olddata; /* - * Calculate the new size of the tuple + * Calculate the new size of the tuple. Header size should not + * change, but data size might. */ new_len = offsetof(HeapTupleHeaderData, t_bits); if (has_nulls) new_len += BITMAPLEN(numAttrs); new_len = MAXALIGN(new_len); + Assert(new_len == olddata->t_hoff); new_len += ComputeDataSize(tupleDesc, toast_values, toast_nulls); /* - * Remember the old memory location of the tuple (for below), - * switch to the memory context of the HeapTuple structure and - * allocate the new tuple. + * Allocate new tuple in same context as old one. */ - olddata = newtup->t_data; - oldcxt = MemoryContextSwitchTo(newtup->t_datamcxt); - new_data = palloc(new_len); + new_data = (char *) MemoryContextAlloc(newtup->t_datamcxt, new_len); + newtup->t_data = (HeapTupleHeader) new_data; + newtup->t_len = new_len; /* * Put the tuple header and the changed values into place */ - memcpy(new_data, newtup->t_data, newtup->t_data->t_hoff); - newtup->t_data = (HeapTupleHeader) new_data; - newtup->t_len = new_len; + memcpy(new_data, olddata, olddata->t_hoff); - DataFill((char *) (MAXALIGN((long) new_data + - offsetof(HeapTupleHeaderData, t_bits) + - ((has_nulls) ? BITMAPLEN(numAttrs) : 0))), + DataFill((char *) new_data + olddata->t_hoff, tupleDesc, toast_values, toast_nulls, @@ -760,11 +755,6 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup) */ if ((char *) olddata != ((char *) newtup + HEAPTUPLESIZE)) pfree(olddata); - - /* - * Switch back to the old memory context - */ - MemoryContextSwitchTo(oldcxt); } /* |