Commitf93281a

committed

t_bits alignment fix from Tatsuo Ishii

1 parentedd626c commitf93281aCopy full SHA for f93281a

File tree

-6

lines changed

src/backend
- access/common
  - heaptuple.c
- storage/large_object
  - inv_api.c

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.41 1998/09/01 04:26:39 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.42 1998/09/04 18:05:38 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* The old interface functions have been converted to macros`
`@@ -809,7 +809,7 @@ heap_formtuple(TupleDesc tupleDescriptor,`
`809`	`809`	`inti;`
`810`	`810`	`intnumberOfAttributes=tupleDescriptor->natts;`
`811`	`811`
`812`		`-len=sizeof*tuple-sizeoftuple->t_bits;`
	`812`	`+len=offsetof(HeapTuple->t_bits);`
`813`	`813`
`814`	`814`	`for (i=0;i<numberOfAttributes&& !hasnull;i++)`
`815`	`815`	`{`
`@@ -957,7 +957,7 @@ heap_addheader(uint32 natts,/* max domain index */`
`957`	`957`
`958`	`958`	`AssertArg(natts>0);`
`959`	`959`
`960`		`-len=sizeof(HeapTupleData)-sizeof(tup->t_bits);`
	`960`	`+len=offsetof(HeapTuple->t_bits);`
`961`	`961`
`962`	`962`	`hoff=len=DOUBLEALIGN(len);/* be conservative */`
`963`	`963`	`len+=structlen;`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.38 1998/09/01 04:31:56 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.39 1998/09/04 18:05:39 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -916,7 +916,9 @@ inv_wrold(LargeObjectDesc *obj_desc,`
`916`	`916`	`*/`
`917`	`917`	`/*`
`918`	`918`	`ntup = inv_newtuple(obj_desc, newbuf, newpage, (char *) NULL, tupbytes);`
`919`		`-dptr = ((char *) ntup) + ntup->t_hoff - sizeof(ntup->t_bits) + sizeof(int4)`
	`919`	`+dptr = ((char *) ntup) + ntup->t_hoff -`
	`920`	`+(sizeof(HeapTupleData) - offsetof(HeapTupleData.t_bits)) +`
	`921`	`+sizeof(int4)`
`920`	`922`	`+ sizeof(fsblock->vl_len);`
`921`	`923`
`922`	`924`	`if (obj_desc->offset > obj_desc->lowbyte) {`
`@@ -996,7 +998,7 @@ inv_newtuple(LargeObjectDesc *obj_desc,`
`996`	`998`	`char*attptr;`
`997`	`999`
`998`	`1000`	`/* compute tuple size -- no nulls */`
`999`		`-hoff=sizeof(HeapTupleData)-sizeof(ntup->t_bits);`
	`1001`	`+hoff=offsetof(HeapTuple->t_bits);`
`1000`	`1002`
`1001`	`1003`	`/* add in olastbyte, varlena.vl_len, varlena.vl_dat */`
`1002`	`1004`	`tupsize=hoff+ (2*sizeof(int32))+nwrite;`

Comments

(0)