mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +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:
@ -878,14 +878,14 @@ trgm2int(trgm *ptr)
|
||||
Datum
|
||||
show_trgm(PG_FUNCTION_ARGS)
|
||||
{
|
||||
text *in = PG_GETARG_TEXT_P(0);
|
||||
text *in = PG_GETARG_TEXT_PP(0);
|
||||
TRGM *trg;
|
||||
Datum *d;
|
||||
ArrayType *a;
|
||||
trgm *ptr;
|
||||
int i;
|
||||
|
||||
trg = generate_trgm(VARDATA(in), VARSIZE(in) - VARHDRSZ);
|
||||
trg = generate_trgm(VARDATA_ANY(in), VARSIZE_ANY_EXHDR(in));
|
||||
d = (Datum *) palloc(sizeof(Datum) * (1 + ARRNELEM(trg)));
|
||||
|
||||
for (i = 0, ptr = GETARR(trg); i < ARRNELEM(trg); i++, ptr++)
|
||||
@ -1053,14 +1053,14 @@ trgm_presence_map(TRGM *query, TRGM *key)
|
||||
Datum
|
||||
similarity(PG_FUNCTION_ARGS)
|
||||
{
|
||||
text *in1 = PG_GETARG_TEXT_P(0);
|
||||
text *in2 = PG_GETARG_TEXT_P(1);
|
||||
text *in1 = PG_GETARG_TEXT_PP(0);
|
||||
text *in2 = PG_GETARG_TEXT_PP(1);
|
||||
TRGM *trg1,
|
||||
*trg2;
|
||||
float4 res;
|
||||
|
||||
trg1 = generate_trgm(VARDATA(in1), VARSIZE(in1) - VARHDRSZ);
|
||||
trg2 = generate_trgm(VARDATA(in2), VARSIZE(in2) - VARHDRSZ);
|
||||
trg1 = generate_trgm(VARDATA_ANY(in1), VARSIZE_ANY_EXHDR(in1));
|
||||
trg2 = generate_trgm(VARDATA_ANY(in2), VARSIZE_ANY_EXHDR(in2));
|
||||
|
||||
res = cnt_sml(trg1, trg2, false);
|
||||
|
||||
|
Reference in New Issue
Block a user