diff options
author | Noah Misch <noah@leadboat.com> | 2017-03-12 19:35:34 -0400 |
---|---|---|
committer | Noah Misch <noah@leadboat.com> | 2017-03-12 19:35:34 -0400 |
commit | 3a0d473192b2045cbaf997df8437e7762d34f3ba (patch) | |
tree | 8bdf7e5e8f6a69041ff3fd4b2114cb9e8cbd69d4 /src/backend/commands | |
parent | 9d7726c2ba06b932f791f2d0cc5acf73cc0b4dca (diff) | |
download | postgresql-3a0d473192b2045cbaf997df8437e7762d34f3ba.tar.gz |
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.
Diffstat (limited to 'src/backend/commands')
-rw-r--r-- | src/backend/commands/extension.c | 2 | ||||
-rw-r--r-- | src/backend/commands/sequence.c | 2 | ||||
-rw-r--r-- | src/backend/commands/trigger.c | 8 | ||||
-rw-r--r-- | src/backend/commands/tsearchcmds.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 585fcce98e..86a84ee234 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -2317,7 +2317,7 @@ Datum pg_extension_config_dump(PG_FUNCTION_ARGS) { Oid tableoid = PG_GETARG_OID(0); - text *wherecond = PG_GETARG_TEXT_P(1); + text *wherecond = PG_GETARG_TEXT_PP(1); char *tablename; Relation extRel; ScanKeyData key[1]; diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 5820fee5a3..d547db714e 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -538,7 +538,7 @@ DeleteSequenceTuple(Oid relid) Datum nextval(PG_FUNCTION_ARGS) { - text *seqin = PG_GETARG_TEXT_P(0); + text *seqin = PG_GETARG_TEXT_PP(0); RangeVar *sequence; Oid relid; diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index d80bff671c..a1bb3e958c 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -1673,13 +1673,13 @@ RelationBuildTriggers(Relation relation) bytea *val; char *p; - val = DatumGetByteaP(fastgetattr(htup, - Anum_pg_trigger_tgargs, - tgrel->rd_att, &isnull)); + val = DatumGetByteaPP(fastgetattr(htup, + Anum_pg_trigger_tgargs, + tgrel->rd_att, &isnull)); if (isnull) elog(ERROR, "tgargs is null in trigger for relation \"%s\"", RelationGetRelationName(relation)); - p = (char *) VARDATA(val); + p = (char *) VARDATA_ANY(val); build->tgargs = (char **) palloc(build->tgnargs * sizeof(char *)); for (i = 0; i < build->tgnargs; i++) { diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index 49668be0d7..b58d60c855 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -1561,9 +1561,9 @@ serialize_deflist(List *deflist) List * deserialize_deflist(Datum txt) { - text *in = DatumGetTextP(txt); /* in case it's toasted */ + text *in = DatumGetTextPP(txt); /* in case it's toasted */ List *result = NIL; - int len = VARSIZE(in) - VARHDRSZ; + int len = VARSIZE_ANY_EXHDR(in); char *ptr, *endptr, *workspace, @@ -1583,7 +1583,7 @@ deserialize_deflist(Datum txt) ds_state state = CS_WAITKEY; workspace = (char *) palloc(len + 1); /* certainly enough room */ - ptr = VARDATA(in); + ptr = VARDATA_ANY(in); endptr = ptr + len; for (; ptr < endptr; ptr++) { |