Commit0ed7445

committed

Allow spgist's text_ops to handle pattern-matching operators.

This was presumably intended to work this way all along, but a few keybits of indxpath.c didn't get the memo.Robert Haas and Tom Lane

1 parentb4e0741 commit0ed7445Copy full SHA for 0ed7445

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2847,7 +2847,7 @@ match_special_index_operator(Expr *clause, Oid opfamily, Oid idxcollation,`
`2847`	`2847`	`/*`
`2848`	`2848`	`* Must also check that index's opfamily supports the operators we will`
`2849`	`2849`	`* want to apply. (A hash index, for example, will not support ">=".)`
`2850`		`- * Currently, only btreesupports the operators we need.`
	`2850`	`+ * Currently, only btreeand spgist support the operators we need.`
`2851`	`2851`	`*`
`2852`	`2852`	`* Note: actually, in the Pattern_Prefix_Exact case, we only need "=" so a`
`2853`	`2853`	`* hash index would work. Currently it doesn't seem worth checking for`
`@@ -2871,6 +2871,7 @@ match_special_index_operator(Expr *clause, Oid opfamily, Oid idxcollation,`
`2871`	`2871`	`caseOID_TEXT_ICREGEXEQ_OP:`
`2872`	`2872`	`isIndexable=`
`2873`	`2873`	`(opfamily==TEXT_PATTERN_BTREE_FAM_OID)\|\|`
	`2874`	`+(opfamily==TEXT_SPGIST_FAM_OID)\|\|`
`2874`	`2875`	`(opfamily==TEXT_BTREE_FAM_OID&&`
`2875`	`2876`	`(pstatus==Pattern_Prefix_Exact\|\|`
`2876`	`2877`	`lc_collate_is_c(idxcollation)));`
`@@ -3454,6 +3455,7 @@ prefix_quals(Node *leftop, Oid opfamily, Oid collation,`
`3454`	`3455`	`{`
`3455`	`3456`	`caseTEXT_BTREE_FAM_OID:`
`3456`	`3457`	`caseTEXT_PATTERN_BTREE_FAM_OID:`
	`3458`	`+caseTEXT_SPGIST_FAM_OID:`
`3457`	`3459`	`datatype=TEXTOID;`
`3458`	`3460`	`break;`
`3459`	`3461`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,5 +145,6 @@ DATA(insert OID = 3919 (783range_opsPGNSP PGUID ));`
`145`	`145`	`DATA(insertOID=4015 (4000quad_point_opsPGNSPPGUID ));`
`146`	`146`	`DATA(insertOID=4016 (4000kd_point_opsPGNSPPGUID ));`
`147`	`147`	`DATA(insertOID=4017 (4000text_opsPGNSPPGUID ));`
	`148`	`+#defineTEXT_SPGIST_FAM_OID 4017`
`148`	`149`
`149`	`150`	`#endif/* PG_OPFAMILY_H */`

Comments

(0)