Commit12f25e7

committed

Fix two-argument form of ts_rewrite() so it actually works for cases where

a later rewrite rule should change a subtree modified by an earlier one.Per my gripe of a few days ago.

1 parentbb36c51 commit12f25e7Copy full SHA for 12f25e7

File tree

+30

-4

lines changed

+30

-4

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.4 2007/09/07 16:03:40 teodor Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.5 2007/10/23 01:44:39 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -467,6 +467,13 @@ tsquery_rewrite(PG_FUNCTION_ARGS)`
`467`	`467`	`QTNFree(qsubs);`
`468`	`468`	`if (qtsubs!= (TSQuery)DatumGetPointer(sdata))`
`469`	`469`	`pfree(qtsubs);`
	`470`	`+`
	`471`	`+if (tree)`
	`472`	`+{`
	`473`	`+/* ready the tree for another pass */`
	`474`	`+QTNClearFlags(tree,QTN_NOCHANGE);`
	`475`	`+QTNSort(tree);`
	`476`	`+}`
`470`	`477`	`}`
`471`	`478`	`}`
`472`	`479`

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.4 2007/09/07 16:03:40 teodor Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.5 2007/10/23 01:44:39 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -381,3 +381,20 @@ QTNCopy(QTNode *in)`
`381`	`381`
`382`	`382`	`returnout;`
`383`	`383`	`}`
	`384`	`+`
	`385`	`+void`
	`386`	`+QTNClearFlags(QTNode*in,uint32flags)`
	`387`	`+{`
	`388`	`+/* since this function recurses, it could be driven to stack overflow. */`
	`389`	`+check_stack_depth();`
	`390`	`+`
	`391`	`+in->flags &= ~flags;`
	`392`	`+`
	`393`	`+if (in->valnode->type!=QI_VAL)`
	`394`	`+{`
	`395`	`+inti;`
	`396`	`+`
	`397`	`+for (i=0;i<in->nchild;i++)`
	`398`	`+QTNClearFlags(in->child[i],flags);`
	`399`	`+}`
	`400`	`+}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 1998-2007, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`		`- * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.6 2007/10/21 22:29:56 tgl Exp $`
	`8`	`+ * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.7 2007/10/23 01:44:39 tgl Exp $`
`9`	`9`	`*`
`10`	`10`	`*-------------------------------------------------------------------------`
`11`	`11`	`*/`
`@@ -172,6 +172,7 @@ typedef struct QTNode`
`172`	`172`	`structQTNode**child;`
`173`	`173`	`}QTNode;`
`174`	`174`
	`175`	`+/* bits in QTNode.flags */`
`175`	`176`	`#defineQTN_NEEDFREE0x01`
`176`	`177`	`#defineQTN_NOCHANGE0x02`
`177`	`178`	`#defineQTN_WORDFREE0x04`
`@@ -189,6 +190,7 @@ extern void QTNTernary(QTNode * in);`
`189`	`190`	`externvoidQTNBinary(QTNode*in);`
`190`	`191`	`externintQTNodeCompare(QTNodean,QTNodebn);`
`191`	`192`	`externQTNodeQTNCopy(QTNodein);`
	`193`	`+externvoidQTNClearFlags(QTNode*in,uint32flags);`
`192`	`194`	`externboolQTNEq(QTNodea,QTNodeb);`
`193`	`195`	`externTSQuerySignmakeTSQuerySign(TSQuerya);`
`194`	`196`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ SELECT ts_rewrite('moscow', 'SELECT keyword, sample FROM test_tsquery'::text );`
`673`	`673`	`SELECT ts_rewrite('moscow & hotel', 'SELECT keyword, sample FROM test_tsquery'::text );`
`674`	`674`	`ts_rewrite`
`675`	`675`	`-----------------------------------`
`676`		`- ( 'moskva' \| 'moscow' ) & 'hotel'`
	`676`	`+'hotel' &( 'moskva' \| 'moscow' )`
`677`	`677`	`(1 row)`
`678`	`678`
`679`	`679`	`SELECT ts_rewrite('bar & new & qq & foo & york', 'SELECT keyword, sample FROM test_tsquery'::text );`

Comments

(0)