mirror of
https://github.com/postgres/postgres.git
synced 2025-07-15 19:21:59 +03:00
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.
This commit is contained in:
@ -175,14 +175,14 @@ Generic_Text_IC_like(text *str, text *pat, Oid collation)
|
||||
if (pg_database_encoding_max_length() > 1)
|
||||
{
|
||||
/* lower's result is never packed, so OK to use old macros here */
|
||||
pat = DatumGetTextP(DirectFunctionCall1Coll(lower, collation,
|
||||
PointerGetDatum(pat)));
|
||||
p = VARDATA(pat);
|
||||
plen = (VARSIZE(pat) - VARHDRSZ);
|
||||
str = DatumGetTextP(DirectFunctionCall1Coll(lower, collation,
|
||||
PointerGetDatum(str)));
|
||||
s = VARDATA(str);
|
||||
slen = (VARSIZE(str) - VARHDRSZ);
|
||||
pat = DatumGetTextPP(DirectFunctionCall1Coll(lower, collation,
|
||||
PointerGetDatum(pat)));
|
||||
p = VARDATA_ANY(pat);
|
||||
plen = VARSIZE_ANY_EXHDR(pat);
|
||||
str = DatumGetTextPP(DirectFunctionCall1Coll(lower, collation,
|
||||
PointerGetDatum(str)));
|
||||
s = VARDATA_ANY(str);
|
||||
slen = VARSIZE_ANY_EXHDR(str);
|
||||
if (GetDatabaseEncoding() == PG_UTF8)
|
||||
return UTF8_MatchText(s, slen, p, plen, 0, true);
|
||||
else
|
||||
@ -365,8 +365,8 @@ nameiclike(PG_FUNCTION_ARGS)
|
||||
bool result;
|
||||
text *strtext;
|
||||
|
||||
strtext = DatumGetTextP(DirectFunctionCall1(name_text,
|
||||
NameGetDatum(str)));
|
||||
strtext = DatumGetTextPP(DirectFunctionCall1(name_text,
|
||||
NameGetDatum(str)));
|
||||
result = (Generic_Text_IC_like(strtext, pat, PG_GET_COLLATION()) == LIKE_TRUE);
|
||||
|
||||
PG_RETURN_BOOL(result);
|
||||
@ -380,8 +380,8 @@ nameicnlike(PG_FUNCTION_ARGS)
|
||||
bool result;
|
||||
text *strtext;
|
||||
|
||||
strtext = DatumGetTextP(DirectFunctionCall1(name_text,
|
||||
NameGetDatum(str)));
|
||||
strtext = DatumGetTextPP(DirectFunctionCall1(name_text,
|
||||
NameGetDatum(str)));
|
||||
result = (Generic_Text_IC_like(strtext, pat, PG_GET_COLLATION()) != LIKE_TRUE);
|
||||
|
||||
PG_RETURN_BOOL(result);
|
||||
|
Reference in New Issue
Block a user