# HG changeset patch # User jbe # Date 1581383608 -3600 # Node ID da23ebd9fd4cf21db3acb741163c2561edfa816d # Parent 9771b81559c798e819e08d3f2fb5711cc27e9fb9 Fixed wrong commutator of epoint <@ ecluster (leading to an unused shell operator of ecluster <@ epoint) diff -r 9771b81559c7 -r da23ebd9fd4c latlon--0.12--0.14.sql --- a/latlon--0.12--0.14.sql Tue Feb 11 01:59:04 2020 +0100 +++ b/latlon--0.12--0.14.sql Tue Feb 11 02:13:28 2020 +0100 @@ -0,0 +1,67 @@ +DROP OPERATOR CLASS epoint_ops USING gist; +DROP OPERATOR CLASS ecluster_ops USING gist; + +DROP OPERATOR <@ (epoint, ecluster); + +CREATE OPERATOR <@ ( + leftarg = epoint, + rightarg = ecluster, + procedure = epoint_ecluster_overlap_proc, + commutator = @>, + restrict = areasel, + join = areajoinsel +); + +CREATE OPERATOR CLASS epoint_ops + DEFAULT FOR TYPE epoint USING gist AS + OPERATOR 11 = , + OPERATOR 22 && (epoint, ebox), + OPERATOR 222 <@ (epoint, ebox), + OPERATOR 23 && (epoint, ecircle), + OPERATOR 24 && (epoint, ecluster), + OPERATOR 124 &&+ (epoint, ecluster), + OPERATOR 224 <@ (epoint, ecluster), + OPERATOR 31 <-> (epoint, epoint) FOR ORDER BY float_ops, + OPERATOR 32 <-> (epoint, ebox) FOR ORDER BY float_ops, + OPERATOR 33 <-> (epoint, ecircle) FOR ORDER BY float_ops, + OPERATOR 34 <-> (epoint, ecluster) FOR ORDER BY float_ops, + FUNCTION 1 pgl_gist_consistent(internal, internal, smallint, oid, internal), + FUNCTION 2 pgl_gist_union(internal, internal), + FUNCTION 3 pgl_gist_compress_epoint(internal), + FUNCTION 4 pgl_gist_decompress(internal), + FUNCTION 5 pgl_gist_penalty(internal, internal, internal), + FUNCTION 6 pgl_gist_picksplit(internal, internal), + FUNCTION 7 pgl_gist_same(internal, internal, internal), + FUNCTION 8 pgl_gist_distance(internal, internal, smallint, oid), + STORAGE ekey_point; + +CREATE OPERATOR CLASS ecluster_ops + DEFAULT FOR TYPE ecluster USING gist AS + OPERATOR 21 && (ecluster, epoint), + OPERATOR 121 &&+ (ecluster, epoint), + OPERATOR 221 @> (ecluster, epoint), + OPERATOR 22 && (ecluster, ebox), + OPERATOR 122 &&+ (ecluster, ebox), + OPERATOR 222 @> (ecluster, ebox), + OPERATOR 322 <@ (ecluster, ebox), + OPERATOR 23 && (ecluster, ecircle), + OPERATOR 123 &&+ (ecluster, ecircle), + OPERATOR 24 && (ecluster, ecluster), + OPERATOR 124 &&+ (ecluster, ecluster), + OPERATOR 224 @> (ecluster, ecluster), + OPERATOR 324 <@ (ecluster, ecluster), + OPERATOR 31 <-> (ecluster, epoint) FOR ORDER BY float_ops, + OPERATOR 32 <-> (ecluster, ebox) FOR ORDER BY float_ops, + OPERATOR 33 <-> (ecluster, ecircle) FOR ORDER BY float_ops, + OPERATOR 34 <-> (ecluster, ecluster) FOR ORDER BY float_ops, + OPERATOR 131 <=> (ecluster, epoint_with_sample_count) FOR ORDER BY float_ops, + FUNCTION 1 pgl_gist_consistent(internal, internal, smallint, oid, internal), + FUNCTION 2 pgl_gist_union(internal, internal), + FUNCTION 3 pgl_gist_compress_ecluster(internal), + FUNCTION 4 pgl_gist_decompress(internal), + FUNCTION 5 pgl_gist_penalty(internal, internal, internal), + FUNCTION 6 pgl_gist_picksplit(internal, internal), + FUNCTION 7 pgl_gist_same(internal, internal, internal), + FUNCTION 8 pgl_gist_distance(internal, internal, smallint, oid), + STORAGE ekey_area; + diff -r 9771b81559c7 -r da23ebd9fd4c latlon--0.14.sql --- a/latlon--0.14.sql Tue Feb 11 01:59:04 2020 +0100 +++ b/latlon--0.14.sql Tue Feb 11 02:13:28 2020 +0100 @@ -1136,7 +1136,7 @@ leftarg = epoint, rightarg = ecluster, procedure = epoint_ecluster_overlap_proc, - commutator = <@, + commutator = @>, restrict = areasel, join = areajoinsel );