diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-10-01 16:25:56 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-10-01 16:25:56 +0000 |
| commit | b526462f9e654149f9ee197a8b2d801c5a80e30e (patch) | |
| tree | 3094d311bc02ed9b1f833d44ba6a874a26fed369 /src/include/postgres.h | |
| parent | b8ce3d34941c3801d4224c826db1953d34dc3385 (diff) | |
| download | postgresql-b526462f9e654149f9ee197a8b2d801c5a80e30e.tar.gz postgresql-b526462f9e654149f9ee197a8b2d801c5a80e30e.zip | |
Avoid assuming that struct varattrib_pointer doesn't get padded by the
compiler --- at least on ARM, it does. I suspect that the varvarlena patch
has been creating larger-than-intended toast pointers all along on ARM,
but it wasn't exposed until the latest tweak added some Asserts that
calculated the expected size in a different way. We could probably have
fixed this by adding __attribute__((packed)) as is done for ItemPointerData,
but struct varattrib_pointer isn't really all that useful anyway, so it
seems cleanest to just get rid of it and have only struct varattrib_1b_e.
Per results from buildfarm member quagga.
Diffstat (limited to 'src/include/postgres.h')
| -rw-r--r-- | src/include/postgres.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/include/postgres.h b/src/include/postgres.h index d7516c33036..2a6def8bc92 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres.h,v 1.84 2007/09/30 19:54:58 tgl Exp $ + * $PostgreSQL: pgsql/src/include/postgres.h,v 1.85 2007/10/01 16:25:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -110,13 +110,6 @@ typedef struct char va_data[1]; /* Data (for now always a TOAST pointer) */ } varattrib_1b_e; -typedef struct -{ - uint8 va_header; /* Always 0x80 or 0x01 */ - uint8 va_len_1be; /* Physical length of datum */ - char va_data[sizeof(struct varatt_external)]; -} varattrib_pointer; - /* * Bit layouts for varlena headers on big-endian machines: * @@ -225,6 +218,8 @@ typedef struct #define VARATT_CONVERTED_SHORT_SIZE(PTR) \ (VARSIZE(PTR) - VARHDRSZ + VARHDRSZ_SHORT) +#define VARHDRSZ_EXTERNAL 2 + #define VARDATA_4B(PTR) (((varattrib_4b *) (PTR))->va_4byte.va_data) #define VARDATA_4B_C(PTR) (((varattrib_4b *) (PTR))->va_compressed.va_data) #define VARDATA_1B(PTR) (((varattrib_1b *) (PTR))->va_data) @@ -276,9 +271,9 @@ typedef struct VARSIZE_4B(PTR))) #define VARSIZE_ANY_EXHDR(PTR) \ - (VARATT_IS_1B_E(PTR) ? VARSIZE_1B_E(PTR)-2 : \ - (VARATT_IS_1B(PTR) ? VARSIZE_1B(PTR)-1 : \ - VARSIZE_4B(PTR)-4)) + (VARATT_IS_1B_E(PTR) ? VARSIZE_1B_E(PTR)-VARHDRSZ_EXTERNAL : \ + (VARATT_IS_1B(PTR) ? VARSIZE_1B(PTR)-VARHDRSZ_SHORT : \ + VARSIZE_4B(PTR)-VARHDRSZ)) /* caution: this will not work on an external or compressed-in-line Datum */ /* caution: this will return a possibly unaligned pointer */ |