rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-pgindent tsvector_op.c. 

Messed up by recent commits --- this is annoying me while trying to fix
some bugs here.
This commit is contained in:
Tom Lane 2016-08-05 14:58:13 -04:00
parent 5ebad9a580
commit 33fe7360af
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/utils/adt/tsvector_op.c
View File

@ -1389,9 +1389,9 @@ TS_phrase_execute(QueryItem *curitem,
return false; return false;
/* /*
* if at least one of the operands has no position information, * if at least one of the operands has no position information, then
* then return false. But if TS_EXEC_PHRASE_AS_AND flag is set then * return false. But if TS_EXEC_PHRASE_AS_AND flag is set then we
* we return true as it is a AND operation * return true as it is a AND operation
*/ */
if (Ldata.npos == 0 || Rdata.npos == 0) if (Ldata.npos == 0 || Rdata.npos == 0)
return (flags & TS_EXEC_PHRASE_AS_AND) ? true : false; return (flags & TS_EXEC_PHRASE_AS_AND) ? true : false;
@ -1428,8 +1428,8 @@ TS_phrase_execute(QueryItem *curitem,
while (Rpos < Rdata.pos + Rdata.npos) while (Rpos < Rdata.pos + Rdata.npos)
{ {
/* /*
* We need to check all possible distances, so reset Lpos * We need to check all possible distances, so reset Lpos to
* to guranteed not yet satisfied position. * guaranteed not yet satisfied position.
*/ */
Lpos = LposStart; Lpos = LposStart;
while (Lpos < Ldata.pos + Ldata.npos) while (Lpos < Ldata.pos + Ldata.npos)
@ -1445,8 +1445,8 @@ TS_phrase_execute(QueryItem *curitem,
pos_iter++; pos_iter++;
/* /*
* Set left start position to next, because current one * Set left start position to next, because current
* could not satisfy distance for any other right * one could not satisfy distance for any other right
* position * position
*/ */
LposStart = Lpos + 1; LposStart = Lpos + 1;
@ -1455,8 +1455,8 @@ TS_phrase_execute(QueryItem *curitem,
else else
{ {
/* /*
* We are in the root of the phrase tree and hence * We are in the root of the phrase tree and hence we
* we don't have to store the resulting positions * don't have to store the resulting positions
*/ */
return true; return true;
} }
@ -1534,9 +1534,10 @@ TS_execute(QueryItem *curitem, void *checkval, uint32 flags,
return TS_execute(curitem + 1, checkval, flags, chkcond); return TS_execute(curitem + 1, checkval, flags, chkcond);
case OP_PHRASE: case OP_PHRASE:
/* /*
* do not check TS_EXEC_PHRASE_AS_AND here because chkcond() * do not check TS_EXEC_PHRASE_AS_AND here because chkcond() could
* could do something more if it's called from TS_phrase_execute() * do something more if it's called from TS_phrase_execute()
*/ */
return TS_phrase_execute(curitem, checkval, flags, NULL, chkcond); return TS_phrase_execute(curitem, checkval, flags, NULL, chkcond);