From 3a0d473192b2045cbaf997df8437e7762d34f3ba Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Sun, 12 Mar 2017 19:35:34 -0400 Subject: Use wrappers of PG_DETOAST_DATUM_PACKED() more. This makes almost all core code follow the policy introduced in the previous commit. Specific decisions: - Text search support functions with char* and length arguments, such as prsstart and lexize, may receive unaligned strings. I doubt maintainers of non-core text search code will notice. - Use plain VARDATA() on values detoasted or synthesized earlier in the same function. Use VARDATA_ANY() on varlenas sourced outside the function, even if they happen to always have four-byte headers. As an exception, retain the universal practice of using VARDATA() on return values of SendFunctionCall(). - Retain PG_GETARG_BYTEA_P() in pageinspect. (Page images are too large for a one-byte header, so this misses no optimization.) Sites that do not call get_page_from_raw() typically need the four-byte alignment. - For now, do not change btree_gist. Its use of four-byte headers in memory is partly entangled with storage of 4-byte headers inside GBT_VARKEY, on disk. - For now, do not change gtrgm_consistent() or gtrgm_distance(). They incorporate the varlena header into a cache, and there are multiple credible implementation strategies to consider. --- src/backend/utils/adt/char.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/backend/utils/adt/char.c') diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index f0c4d253961..1b849e87035 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -175,7 +175,7 @@ i4tochar(PG_FUNCTION_ARGS) Datum text_char(PG_FUNCTION_ARGS) { - text *arg1 = PG_GETARG_TEXT_P(0); + text *arg1 = PG_GETARG_TEXT_PP(0); char result; /* @@ -183,8 +183,8 @@ text_char(PG_FUNCTION_ARGS) * If the input is longer than one character, the excess data is silently * discarded. */ - if (VARSIZE(arg1) > VARHDRSZ) - result = *(VARDATA(arg1)); + if (VARSIZE_ANY_EXHDR(arg1) > 0) + result = *(VARDATA_ANY(arg1)); else result = '\0'; -- cgit v1.2.3