Commit1420f3a

committed

Fix ts_rank_cd() to ignore stripped lexemes

Previously, stripped lexemes got a default location and could beconsidered if mixed with non-stripped lexemes.BACKWARD INCOMPATIBILITY CHANGE

1 parentbb42e21 commit1420f3aCopy full SHA for 1420f3a

File tree

+30

-5

lines changed

+30

-5

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -889,9 +889,13 @@ SELECT plainto_tsquery('english', 'The Fat & Rats:C');`
`889`	`889`	`</para>`
`890`	`890`
`891`	`891`	`<para>`
`892`		`- This function requires positional information in its input.`
`893`		`- Therefore it will not work on <quote>stripped</> <type>tsvector</>`
`894`		`- values — it will always return zero.`
	`892`	`+ This function requires lexeme positional information to perform`
	`893`	`+ its calculation. Therefore, it ignores any <quote>stripped</>`
	`894`	`+ lexemes in the <type>tsvector</>. If there are no unstripped`
	`895`	`+ lexemes in the input, the result will be zero. (See <xref`
	`896`	`+ linkend="textsearch-manipulate-tsvector"> for more information`
	`897`	`+ about the <function>strip</> function and positional information`
	`898`	`+ in <type>tsvector</>s.)`
`895`	`899`	`</para>`
`896`	`900`	`</listitem>`
`897`	`901`	`</varlistentry>`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -658,8 +658,9 @@ get_docrep(TSVector txt, QueryRepresentation qr, int doclen)`
`658`	`658`	`}`
`659`	`659`	`else`
`660`	`660`	`{`
`661`		`-dimt=POSNULL.npos;`
`662`		`-post=POSNULL.pos;`
	`661`	`+/* ignore words without positions */`
	`662`	`+entry++;`
	`663`	`+continue;`
`663`	`664`	`}`
`664`	`665`
`665`	`666`	`while (cur+dimt >=len)`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -596,6 +596,20 @@ S. T. Coleridge (1772-1834)`
`596`	`596`	`0.1`
`597`	`597`	`(1 row)`
`598`	`598`
	`599`	`+SELECT ts_rank_cd(strip(to_tsvector('both stripped')),`
	`600`	`+ to_tsquery('both & stripped'));`
	`601`	`+ ts_rank_cd`
	`602`	`+------------`
	`603`	`+ 0`
	`604`	`+(1 row)`
	`605`	`+`
	`606`	`+SELECT ts_rank_cd(to_tsvector('unstripped') \|\| strip(to_tsvector('stripped')),`
	`607`	`+ to_tsquery('unstripped & stripped'));`
	`608`	`+ ts_rank_cd`
	`609`	`+------------`
	`610`	`+ 0`
	`611`	`+(1 row)`
	`612`	`+`
`599`	`613`	`--headline tests`
`600`	`614`	`SELECT ts_headline('english', '`
`601`	`615`	`Day after day, day after day,`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,12 @@ Water, water, every where,`
`165`	`165`	`S. T. Coleridge (1772-1834)`
`166`	`166`	`'), to_tsquery('english','ocean'));`
`167`	`167`
	`168`	`+SELECT ts_rank_cd(strip(to_tsvector('both stripped')),`
	`169`	`+ to_tsquery('both & stripped'));`
	`170`	`+`
	`171`	`+SELECT ts_rank_cd(to_tsvector('unstripped')\|\| strip(to_tsvector('stripped')),`
	`172`	`+ to_tsquery('unstripped & stripped'));`
	`173`	`+`
`168`	`174`	`--headline tests`
`169`	`175`	`SELECT ts_headline('english','`
`170`	`176`	`Day after day, day after day,`

Comments

(0)