mirror of
https://github.com/postgres/postgres.git
synced 2025-11-21 00:42:43 +03:00
Replace TS_execute's TS_EXEC_CALC_NOT flag with TS_EXEC_SKIP_NOT.
It's fairly silly that ignoring NOT subexpressions is TS_execute's default behavior. It's wrong on its face and it encourages errors of omission. Moreover, the only two remaining callers that aren't specifying CALC_NOT are in ts_headline calculations, and it's very arguable that those are bugs: if you've specified "!foo" in your query, why would you want to get a headline that includes "foo"? Hence, rip that out and change the default behavior to be to calculate NOT accurately. As a concession to the slim chance that there is still somebody somewhere who needs the incorrect behavior, provide a new SKIP_NOT flag to explicitly request that. Back-patch into v13, mainly because it seems better to change this at the same time as the previous commit's rejiggering of TS_execute related APIs. Any outside callers affected by this change are probably also affected by that one. Discussion: https://postgr.es/m/CALT9ZEE-aLotzBg-pOp2GFTesGWVYzXA3=mZKzRDa_OKnLF7Mg@mail.gmail.com
This commit is contained in:
@@ -248,7 +248,7 @@ gin_tsquery_consistent(PG_FUNCTION_ARGS)
|
||||
|
||||
res = TS_execute(GETQUERY(query),
|
||||
&gcv,
|
||||
TS_EXEC_CALC_NOT | TS_EXEC_PHRASE_NO_POS,
|
||||
TS_EXEC_PHRASE_NO_POS,
|
||||
checkcondition_gin);
|
||||
}
|
||||
|
||||
@@ -286,7 +286,7 @@ gin_tsquery_triconsistent(PG_FUNCTION_ARGS)
|
||||
|
||||
if (TS_execute(GETQUERY(query),
|
||||
&gcv,
|
||||
TS_EXEC_CALC_NOT | TS_EXEC_PHRASE_NO_POS,
|
||||
TS_EXEC_PHRASE_NO_POS,
|
||||
checkcondition_gin))
|
||||
res = recheck ? GIN_MAYBE : GIN_TRUE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user