pgLatLon
changeset 64:da23ebd9fd4c
Fixed wrong commutator of epoint <@ ecluster (leading to an unused shell operator of ecluster <@ epoint)
author | jbe |
---|---|
date | Tue Feb 11 02:13:28 2020 +0100 (2020-02-11) |
parents | 9771b81559c7 |
children | ce0963692318 |
files | latlon--0.12--0.14.sql latlon--0.14.sql |
line diff
1.1 --- a/latlon--0.12--0.14.sql Tue Feb 11 01:59:04 2020 +0100 1.2 +++ b/latlon--0.12--0.14.sql Tue Feb 11 02:13:28 2020 +0100 1.3 @@ -0,0 +1,67 @@ 1.4 +DROP OPERATOR CLASS epoint_ops USING gist; 1.5 +DROP OPERATOR CLASS ecluster_ops USING gist; 1.6 + 1.7 +DROP OPERATOR <@ (epoint, ecluster); 1.8 + 1.9 +CREATE OPERATOR <@ ( 1.10 + leftarg = epoint, 1.11 + rightarg = ecluster, 1.12 + procedure = epoint_ecluster_overlap_proc, 1.13 + commutator = @>, 1.14 + restrict = areasel, 1.15 + join = areajoinsel 1.16 +); 1.17 + 1.18 +CREATE OPERATOR CLASS epoint_ops 1.19 + DEFAULT FOR TYPE epoint USING gist AS 1.20 + OPERATOR 11 = , 1.21 + OPERATOR 22 && (epoint, ebox), 1.22 + OPERATOR 222 <@ (epoint, ebox), 1.23 + OPERATOR 23 && (epoint, ecircle), 1.24 + OPERATOR 24 && (epoint, ecluster), 1.25 + OPERATOR 124 &&+ (epoint, ecluster), 1.26 + OPERATOR 224 <@ (epoint, ecluster), 1.27 + OPERATOR 31 <-> (epoint, epoint) FOR ORDER BY float_ops, 1.28 + OPERATOR 32 <-> (epoint, ebox) FOR ORDER BY float_ops, 1.29 + OPERATOR 33 <-> (epoint, ecircle) FOR ORDER BY float_ops, 1.30 + OPERATOR 34 <-> (epoint, ecluster) FOR ORDER BY float_ops, 1.31 + FUNCTION 1 pgl_gist_consistent(internal, internal, smallint, oid, internal), 1.32 + FUNCTION 2 pgl_gist_union(internal, internal), 1.33 + FUNCTION 3 pgl_gist_compress_epoint(internal), 1.34 + FUNCTION 4 pgl_gist_decompress(internal), 1.35 + FUNCTION 5 pgl_gist_penalty(internal, internal, internal), 1.36 + FUNCTION 6 pgl_gist_picksplit(internal, internal), 1.37 + FUNCTION 7 pgl_gist_same(internal, internal, internal), 1.38 + FUNCTION 8 pgl_gist_distance(internal, internal, smallint, oid), 1.39 + STORAGE ekey_point; 1.40 + 1.41 +CREATE OPERATOR CLASS ecluster_ops 1.42 + DEFAULT FOR TYPE ecluster USING gist AS 1.43 + OPERATOR 21 && (ecluster, epoint), 1.44 + OPERATOR 121 &&+ (ecluster, epoint), 1.45 + OPERATOR 221 @> (ecluster, epoint), 1.46 + OPERATOR 22 && (ecluster, ebox), 1.47 + OPERATOR 122 &&+ (ecluster, ebox), 1.48 + OPERATOR 222 @> (ecluster, ebox), 1.49 + OPERATOR 322 <@ (ecluster, ebox), 1.50 + OPERATOR 23 && (ecluster, ecircle), 1.51 + OPERATOR 123 &&+ (ecluster, ecircle), 1.52 + OPERATOR 24 && (ecluster, ecluster), 1.53 + OPERATOR 124 &&+ (ecluster, ecluster), 1.54 + OPERATOR 224 @> (ecluster, ecluster), 1.55 + OPERATOR 324 <@ (ecluster, ecluster), 1.56 + OPERATOR 31 <-> (ecluster, epoint) FOR ORDER BY float_ops, 1.57 + OPERATOR 32 <-> (ecluster, ebox) FOR ORDER BY float_ops, 1.58 + OPERATOR 33 <-> (ecluster, ecircle) FOR ORDER BY float_ops, 1.59 + OPERATOR 34 <-> (ecluster, ecluster) FOR ORDER BY float_ops, 1.60 + OPERATOR 131 <=> (ecluster, epoint_with_sample_count) FOR ORDER BY float_ops, 1.61 + FUNCTION 1 pgl_gist_consistent(internal, internal, smallint, oid, internal), 1.62 + FUNCTION 2 pgl_gist_union(internal, internal), 1.63 + FUNCTION 3 pgl_gist_compress_ecluster(internal), 1.64 + FUNCTION 4 pgl_gist_decompress(internal), 1.65 + FUNCTION 5 pgl_gist_penalty(internal, internal, internal), 1.66 + FUNCTION 6 pgl_gist_picksplit(internal, internal), 1.67 + FUNCTION 7 pgl_gist_same(internal, internal, internal), 1.68 + FUNCTION 8 pgl_gist_distance(internal, internal, smallint, oid), 1.69 + STORAGE ekey_area; 1.70 +
2.1 --- a/latlon--0.14.sql Tue Feb 11 01:59:04 2020 +0100 2.2 +++ b/latlon--0.14.sql Tue Feb 11 02:13:28 2020 +0100 2.3 @@ -1136,7 +1136,7 @@ 2.4 leftarg = epoint, 2.5 rightarg = ecluster, 2.6 procedure = epoint_ecluster_overlap_proc, 2.7 - commutator = <@, 2.8 + commutator = @>, 2.9 restrict = areasel, 2.10 join = areajoinsel 2.11 );