Commite38b1eb

committed

Use FLEXIBLE_ARRAY_MEMBER in struct varlena.

This forces some minor coding adjustments in tuptoaster.c and inv_api.c,but the new coding there is cleaner anyway.Michael Paquier

1 parent8902f79 commite38b1ebCopy full SHA for e38b1eb

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1365,11 +1365,13 @@ toast_save_datum(Relation rel, Datum value,`
`1365`	`1365`	`CommandIdmycid=GetCurrentCommandId(true);`
`1366`	`1366`	`structvarlena*result;`
`1367`	`1367`	`structvaratt_externaltoast_pointer;`
`1368`		`-struct`
	`1368`	`+union`
`1369`	`1369`	`{`
`1370`	`1370`	`structvarlenahdr;`
`1371`		`-chardata[TOAST_MAX_CHUNK_SIZE];/* make struct big enough */`
`1372`		`-int32align_it;/* ensure struct is aligned well enough */`
	`1371`	`+/* this is to make the union big enough for a chunk: */`
	`1372`	`+chardata[TOAST_MAX_CHUNK_SIZE+VARHDRSZ];`
	`1373`	`+/* ensure union is aligned well enough: */`
	`1374`	`+int32align_it;`
`1373`	`1375`	`}chunk_data;`
`1374`	`1376`	`int32chunk_size;`
`1375`	`1377`	`int32chunk_seq=0;`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -562,11 +562,13 @@ inv_write(LargeObjectDesc obj_desc, const char buf, int nbytes)`
`562`	`562`	`boolneednextpage;`
`563`	`563`	`bytea*datafield;`
`564`	`564`	`boolpfreeit;`
`565`		`-struct`
	`565`	`+union`
`566`	`566`	`{`
`567`	`567`	`byteahdr;`
`568`		`-chardata[LOBLKSIZE];/* make struct big enough */`
`569`		`-int32align_it;/* ensure struct is aligned well enough */`
	`568`	`+/* this is to make the union big enough for a LO data chunk: */`
	`569`	`+chardata[LOBLKSIZE+VARHDRSZ];`
	`570`	`+/* ensure union is aligned well enough: */`
	`571`	`+int32align_it;`
`570`	`572`	`}workbuf;`
`571`	`573`	`char*workb=VARDATA(&workbuf.hdr);`
`572`	`574`	`HeapTuplenewtup;`
`@@ -748,11 +750,13 @@ inv_truncate(LargeObjectDesc *obj_desc, int64 len)`
`748`	`750`	`SysScanDescsd;`
`749`	`751`	`HeapTupleoldtuple;`
`750`	`752`	`Form_pg_largeobjectolddata;`
`751`		`-struct`
	`753`	`+union`
`752`	`754`	`{`
`753`	`755`	`byteahdr;`
`754`		`-chardata[LOBLKSIZE];/* make struct big enough */`
`755`		`-int32align_it;/* ensure struct is aligned well enough */`
	`756`	`+/* this is to make the union big enough for a LO data chunk: */`
	`757`	`+chardata[LOBLKSIZE+VARHDRSZ];`
	`758`	`+/* ensure union is aligned well enough: */`
	`759`	`+int32align_it;`
`756`	`760`	`}workbuf;`
`757`	`761`	`char*workb=VARDATA(&workbuf.hdr);`
`758`	`762`	`HeapTuplenewtup;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ typedef struct`
`391`	`391`	`structvarlena`
`392`	`392`	`{`
`393`	`393`	`charvl_len_[4];/* Do not touch this field directly! */`
`394`		`-charvl_dat[1];`
	`394`	`+charvl_dat[FLEXIBLE_ARRAY_MEMBER];/* Data content is here */`
`395`	`395`	`};`
`396`	`396`
`397`	`397`	`#defineVARHDRSZ((int32) sizeof(int32))`

Comments

(0)