From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 5 Apr 2009 00:40:35 +0000 (+0000)
Subject: Remove contrib/intarray's definitions of the <@ and @> operators, so that they
X-Git-Tag: REL8_4_BETA1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65e758a4d3d961f9fe936177405906a52574f70b;p=postgresql
Remove contrib/intarray's definitions of the <@ and @> operators, so that they
don't cause confusion with the built-in anyarray versions of those operators.
Adjust the module's index opclasses to support the built-in operators in place
of the private ones.
The private implementations are still available under their historical
names @ and ~, so no functionality is lost. Some quick testing suggests
that they offer no real benefit over the core operators, however.
Per a complaint from Rusty Conover.
---
diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in
index 9f91a65eec..93930b559d 100644
--- a/contrib/intarray/_int.sql.in
+++ b/contrib/intarray/_int.sql.in
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.29 2009/03/25 22:19:01 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.30 2009/04/05 00:40:35 tgl Exp $ */
-- Adjust this setting to control where the objects get created.
SET search_path = public;
@@ -152,23 +152,23 @@ CREATE OPERATOR && (
-- JOIN = neqjoinsel
--);
-CREATE OPERATOR @> (
- LEFTARG = _int4,
- RIGHTARG = _int4,
- PROCEDURE = _int_contains,
- COMMUTATOR = '<@',
- RESTRICT = contsel,
- JOIN = contjoinsel
-);
+--CREATE OPERATOR @> (
+-- LEFTARG = _int4,
+-- RIGHTARG = _int4,
+-- PROCEDURE = _int_contains,
+-- COMMUTATOR = '<@',
+-- RESTRICT = contsel,
+-- JOIN = contjoinsel
+--);
-CREATE OPERATOR <@ (
- LEFTARG = _int4,
- RIGHTARG = _int4,
- PROCEDURE = _int_contained,
- COMMUTATOR = '@>',
- RESTRICT = contsel,
- JOIN = contjoinsel
-);
+--CREATE OPERATOR <@ (
+-- LEFTARG = _int4,
+-- RIGHTARG = _int4,
+-- PROCEDURE = _int_contained,
+-- COMMUTATOR = '@>',
+-- RESTRICT = contsel,
+-- JOIN = contjoinsel
+--);
-- obsolete:
CREATE OPERATOR @ (
@@ -365,8 +365,8 @@ CREATE OPERATOR CLASS gist__int_ops
DEFAULT FOR TYPE _int4 USING gist AS
OPERATOR 3 &&,
OPERATOR 6 = (anyarray, anyarray),
- OPERATOR 7 @>,
- OPERATOR 8 <@,
+ OPERATOR 7 @> (anyarray, anyarray),
+ OPERATOR 8 <@ (anyarray, anyarray),
OPERATOR 13 @,
OPERATOR 14 ~,
OPERATOR 20 @@ (_int4, query_int),
@@ -442,8 +442,8 @@ FOR TYPE _int4 USING gist
AS
OPERATOR 3 &&,
OPERATOR 6 = (anyarray, anyarray),
- OPERATOR 7 @>,
- OPERATOR 8 <@,
+ OPERATOR 7 @> (anyarray, anyarray),
+ OPERATOR 8 <@ (anyarray, anyarray),
OPERATOR 13 @,
OPERATOR 14 ~,
OPERATOR 20 @@ (_int4, query_int),
@@ -473,8 +473,8 @@ FOR TYPE _int4 USING gin
AS
OPERATOR 3 &&,
OPERATOR 6 = (anyarray, anyarray),
- OPERATOR 7 @>,
- OPERATOR 8 <@,
+ OPERATOR 7 @> (anyarray, anyarray),
+ OPERATOR 8 <@ (anyarray, anyarray),
OPERATOR 13 @,
OPERATOR 14 ~,
OPERATOR 20 @@ (_int4, query_int),
diff --git a/contrib/intarray/uninstall__int.sql b/contrib/intarray/uninstall__int.sql
index 5346bddc75..42721ed2fb 100644
--- a/contrib/intarray/uninstall__int.sql
+++ b/contrib/intarray/uninstall__int.sql
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/contrib/intarray/uninstall__int.sql,v 1.10 2009/03/25 22:19:01 tgl Exp $ */
+/* $PostgreSQL: pgsql/contrib/intarray/uninstall__int.sql,v 1.11 2009/04/05 00:40:35 tgl Exp $ */
-- Adjust this setting to control where the objects get created.
SET search_path = public;
@@ -91,10 +91,6 @@ DROP FUNCTION icount(_int4);
DROP FUNCTION intset(int4);
-DROP OPERATOR <@ (_int4, _int4);
-
-DROP OPERATOR @> (_int4, _int4);
-
DROP OPERATOR ~ (_int4, _int4);
DROP OPERATOR @ (_int4, _int4);
diff --git a/doc/src/sgml/intarray.sgml b/doc/src/sgml/intarray.sgml
index ddf7421899..2e77b57de3 100644
--- a/doc/src/sgml/intarray.sgml
+++ b/doc/src/sgml/intarray.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/intarray.sgml,v 1.6 2009/03/18 20:18:18 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/intarray.sgml,v 1.7 2009/04/05 00:40:35 tgl Exp $ -->
<sect1 id="intarray">
<title>intarray</title>
@@ -134,12 +134,12 @@
<entry>overlap — <literal>true</> if arrays have at least one common element</entry>
</row>
<row>
- <entry><literal>int[] @> int[]</literal></entry>
+ <entry><literal>int[] @ int[]</literal></entry>
<entry><type>boolean</type></entry>
<entry>contains — <literal>true</> if left array contains right array</entry>
</row>
<row>
- <entry><literal>int[] <@ int[]</literal></entry>
+ <entry><literal>int[] ~ int[]</literal></entry>
<entry><type>boolean</type></entry>
<entry>contained — <literal>true</> if left array is contained in right array</entry>
</row>
@@ -203,11 +203,13 @@
</table>
<para>
- (Before PostgreSQL 8.2, the containment operators @> and <@ were
- respectively called @ and ~. These names are still available, but are
- deprecated and will eventually be retired. Notice that the old names
- are reversed from the convention formerly followed by the core geometric
- datatypes!)
+ The containment operators <literal>@</> and <literal>~</> are functionally
+ equivalent to <productname>PostgreSQL</>'s built-in operators
+ <literal>@></> and <literal><@</>, respectively, except that
+ <literal>@</> and <literal>~</> work only on integer arrays. These
+ operator names are deprecated and will eventually be retired. (Notice that
+ these names are reversed from the convention formerly followed by the core
+ geometric datatypes!)
</para>
<para>
@@ -228,10 +230,10 @@
<para>
<filename>intarray</> provides index support for the
- <literal>&&</>, <literal>@></>, <literal><@</>,
- and <literal>@@</> operators, as well as regular array equality.
- The implementation uses an RD-tree data structure with
- built-in lossy compression.
+ <literal>&&</>, <literal>@</>, <literal>~</>,
+ and <literal>@@</> operators, as well as regular array equality
+ and the built-in <literal>@></> and <literal><@</> operators
+ (when used on integer arrays).
</para>
<para>
@@ -241,11 +243,13 @@
<literal>gist__intbig_ops</> uses a larger signature and is more
suitable for indexing large data sets (i.e., columns containing
a large number of distinct array values).
+ The implementation uses an RD-tree data structure with
+ built-in lossy compression.
</para>
<para>
There is also a non-default GIN operator class
- <literal>gin__int_ops</>.
+ <literal>gin__int_ops</> supporting the same operators.
</para>
<para>
@@ -304,7 +308,7 @@ SELECT message.mid FROM message WHERE message.sections @@ '1&2'::query_int;
<title>Authors</title>
<para>
- All work was done by Teodor Sigaev (<email>teodor@stack.net</email>) and
+ All work was done by Teodor Sigaev (<email>teodor@sigaev.ru</email>) and
Oleg Bartunov (<email>oleg@sai.msu.su</email>). See
<ulink url="http://www.sai.msu.su/~megera/postgres/gist"></ulink> for
additional information. Andrey Oktyabrski did a great work on adding new