Commit8fc7c02

committed

Add error message when prefix search is performed

1 parentc0e1500 commit8fc7c02Copy full SHA for 8fc7c02

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -304,3 +304,4 @@ SELECT a <=> to_tsquery('pg_catalog.english', 'w:'), `
`304`	`304`	`FROM test_rum`
`305`	`305`	`WHERE a @@ to_tsquery('pg_catalog.english', 'w:*')`
`306`	`306`	`ORDER BY a <=> to_tsquery('pg_catalog.english', 'w:*');`
	`307`	`+ERROR: Compare with prefix expressions isn't supported`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ AS`
`89`	`89`	`FUNCTION2 rum_extract_tsvector(tsvector,internal,internal,internal,internal),`
`90`	`90`	`FUNCTION3 rum_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal),`
`91`	`91`	`FUNCTION4 rum_tsquery_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),`
`92`		`- FUNCTION5 gin_cmp_prefix(text,text,smallint,internal),`
`93`	`92`	`FUNCTION6 rum_tsvector_config(internal),`
`94`	`93`	`FUNCTION7 rum_tsquery_pre_consistent(internal,smallint,tsvector,int,internal,internal,internal,internal),`
`95`	`94`	`FUNCTION8 rum_tsquery_distance(internal,smallint,tsvector,int,internal,internal,internal,internal,internal),`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,9 +207,16 @@ rumFillScanKey(RumScanOpaque so, OffsetNumber attnum,`
`207`	`207`	`/* set up normal entry using extractQueryFn's outputs */`
`208`	`208`	`queryKey=queryValues[i];`
`209`	`209`	`queryCategory=queryCategories[i];`
`210`		`-isPartialMatch=`
`211`		`-(rumstate->canPartialMatch[attnum-1]&&partial_matches)`
`212`		`-?partial_matches[i] : false;`
	`210`	`+`
	`211`	`+/*`
	`212`	`+ * check inconsistence related to impossibility to do partial match`
	`213`	`+ * and existance of prefix expression in tsquery`
	`214`	`+ */`
	`215`	`+if (partial_matches&&partial_matches[i]&&`
	`216`	`+!rumstate->canPartialMatch[attnum-1])`
	`217`	`+elog(ERROR,"Compare with prefix expressions isn't supported");`
	`218`	`+`
	`219`	`+isPartialMatch= (partial_matches) ?partial_matches[i] : false;`
`213`	`220`	`this_extra= (extra_data) ?extra_data[i] :NULL;`
`214`	`221`	`}`
`215`	`222`	`else`

Comments

(0)