Commitf9c50e9

committed

Fix triconsistent method support for phrase search

1 parent6967b76 commitf9c50e9Copy full SHA for f9c50e9

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ checkcondition_gin(void checkval, QueryOperand val, ExecPhraseData *data)`
`207`	`207`	`*/`
`208`	`208`	`staticGinTernaryValue`
`209`	`209`	`TS_execute_ternary(QueryItemcuritem,voidcheckval,`
`210`		`-GinTernaryValue (chkcond) (voidcheckval,QueryOperand*val))`
	`210`	`+GinTernaryValue (chkcond) (void,QueryOperand,ExecPhraseData))`
`211`	`211`	`{`
`212`	`212`	`GinTernaryValueval1,`
`213`	`213`	`val2,`
`@@ -217,7 +217,8 @@ TS_execute_ternary(QueryItem curitem, void checkval,`
`217`	`217`	`check_stack_depth();`
`218`	`218`
`219`	`219`	`if (curitem->type==QI_VAL)`
`220`		`-returnchkcond(checkval, (QueryOperand*)curitem);`
	`220`	`+returnchkcond(checkval, (QueryOperand*)curitem,`
	`221`	`+NULL/* we don't need a position infos */);`
`221`	`222`
`222`	`223`	`switch (curitem->qoperator.oper)`
`223`	`224`	`{`
`@@ -227,6 +228,13 @@ TS_execute_ternary(QueryItem curitem, void checkval,`
`227`	`228`	`returnresult;`
`228`	`229`	`return !result;`
`229`	`230`
	`231`	`+caseOP_PHRASE:`
	`232`	`+/*`
	`233`	`+ * GIN doesn't contain any information about postions,`
	`234`	`+ * treat OP_PHRASE as OP_AND with recheck requirement`
	`235`	`+ */`
	`236`	`+((GinChkVal)checkval)->need_recheck= true;`
	`237`	`+`
`230`	`238`	`caseOP_AND:`
`231`	`239`	`val1=TS_execute_ternary(curitem+curitem->qoperator.left,`
`232`	`240`	`checkval,chkcond);`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ checkcondition_str(void checkval, QueryOperand val, ExecPhraseData *data)`
`795`	`795`	`*/`
`796`	`796`	`staticbool`
`797`	`797`	`TS_phrase_execute(QueryItemcuritem,voidcheckval,boolcalcnot,ExecPhraseData*data,`
`798`		`-bool (chkcond) (voidcheckval,QueryOperandval,ExecPhraseDatadata))`
	`798`	`+bool (chkcond) (void,QueryOperand,ExecPhraseData))`
`799`	`799`	`{`
`800`	`800`	`/* since this function recurses, it could be driven to stack overflow */`
`801`	`801`	`check_stack_depth();`
`@@ -806,8 +806,8 @@ TS_phrase_execute(QueryItem curitem, void checkval, bool calcnot, ExecPhraseDa`
`806`	`806`	`}`
`807`	`807`	`else`
`808`	`808`	`{`
`809`		`-ExecPhraseDataLdata= {0,NULL, false},`
`810`		`-Rdata= {0,NULL, false};`
	`809`	`+ExecPhraseDataLdata= {0,false,NULL},`
	`810`	`+Rdata= {0,false,NULL};`
`811`	`811`	`WordEntryPos*Lpos,`
`812`	`812`	`*Rpos,`
`813`	`813`	`*pos=NULL;`
`@@ -933,7 +933,7 @@ TS_execute(QueryItem curitem, void checkval, bool calcnot,`
`933`	`933`	`check_stack_depth();`
`934`	`934`
`935`	`935`	`if (curitem->type==QI_VAL)`
`936`		`-returnchkcond(checkval, (QueryOperand*)curitem,`
	`936`	`+returnchkcond(checkval, (QueryOperand*)curitem,`
`937`	`937`	`NULL/* we don't need a position infos */);`
`938`	`938`
`939`	`939`	`switch (curitem->qoperator.oper)`

Comments

(0)