diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml
index 05d92eb97502073dd8a19d44f3d1e79be8928056..7c2321ec3c3aeeed2c346bf82e37788f461fda16 100644
--- a/doc/src/sgml/gin.sgml
+++ b/doc/src/sgml/gin.sgml
@@ -85,298 +85,8 @@
</thead>
<tbody>
<row>
- <entry><literal>_abstime_ops</></entry>
- <entry><type>abstime[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_bit_ops</></entry>
- <entry><type>bit[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_bool_ops</></entry>
- <entry><type>boolean[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_bpchar_ops</></entry>
- <entry><type>character[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_bytea_ops</></entry>
- <entry><type>bytea[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_char_ops</></entry>
- <entry><type>"char"[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_cidr_ops</></entry>
- <entry><type>cidr[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_date_ops</></entry>
- <entry><type>date[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_float4_ops</></entry>
- <entry><type>float4[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_float8_ops</></entry>
- <entry><type>float8[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_inet_ops</></entry>
- <entry><type>inet[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_int2_ops</></entry>
- <entry><type>smallint[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_int4_ops</></entry>
- <entry><type>integer[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_int8_ops</></entry>
- <entry><type>bigint[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_interval_ops</></entry>
- <entry><type>interval[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_macaddr_ops</></entry>
- <entry><type>macaddr[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_money_ops</></entry>
- <entry><type>money[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_name_ops</></entry>
- <entry><type>name[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_numeric_ops</></entry>
- <entry><type>numeric[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_oid_ops</></entry>
- <entry><type>oid[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_oidvector_ops</></entry>
- <entry><type>oidvector[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_reltime_ops</></entry>
- <entry><type>reltime[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_text_ops</></entry>
- <entry><type>text[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_time_ops</></entry>
- <entry><type>time[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_timestamp_ops</></entry>
- <entry><type>timestamp[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_timestamptz_ops</></entry>
- <entry><type>timestamp with time zone[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_timetz_ops</></entry>
- <entry><type>time with time zone[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_tinterval_ops</></entry>
- <entry><type>tinterval[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_varbit_ops</></entry>
- <entry><type>bit varying[]</></entry>
- <entry>
- <literal>&&</>
- <literal><@</>
- <literal>=</>
- <literal>@></>
- </entry>
- </row>
- <row>
- <entry><literal>_varchar_ops</></entry>
- <entry><type>character varying[]</></entry>
+ <entry><literal>array_ops</></entry>
+ <entry><type>anyarray</></entry>
<entry>
<literal>&&</>
<literal><@</>
@@ -441,22 +151,10 @@
</para>
<para>
- There are three methods that an operator class for
+ There are two methods that an operator class for
<acronym>GIN</acronym> must provide:
- <variablelist>
- <varlistentry>
- <term><function>int compare(Datum a, Datum b)</></term>
- <listitem>
- <para>
- Compares two keys (not indexed items!) and returns an integer less than
- zero, zero, or greater than zero, indicating whether the first key is
- less than, equal to, or greater than the second. Null keys are never
- passed to this function.
- </para>
- </listitem>
- </varlistentry>
-
+ <variablelist>
<varlistentry>
<term><function>Datum *extractValue(Datum itemValue, int32 *nkeys,
bool **nullFlags)</></term>
@@ -645,7 +343,38 @@
</listitem>
</varlistentry>
</variablelist>
+ </para>
+
+ <para>
+ In addition, GIN must have a way to sort the key values stored in the index.
+ The operator class can define the sort ordering by specifying a comparison
+ method:
+ <variablelist>
+ <varlistentry>
+ <term><function>int compare(Datum a, Datum b)</></term>
+ <listitem>
+ <para>
+ Compares two keys (not indexed items!) and returns an integer less than
+ zero, zero, or greater than zero, indicating whether the first key is
+ less than, equal to, or greater than the second. Null keys are never
+ passed to this function.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ Alternatively, if the operator class does not provide a <function>compare</>
+ method, GIN will look up the default btree operator class for the index
+ key data type, and use its comparison function. It is recommended to
+ specify the comparison function in a GIN operator class that is meant for
+ just one data type, as looking up the btree operator class costs a few
+ cycles. However, polymorphic GIN operator classes (such
+ as <literal>array_ops</>) typically cannot specify a single comparison
+ function.
+ </para>
+
+ <para>
Optionally, an operator class for <acronym>GIN</acronym> can supply the
following method:
@@ -900,11 +629,9 @@
<title>Examples</title>
<para>
- The <productname>PostgreSQL</productname> source distribution includes
- <acronym>GIN</acronym> operator classes for <type>tsvector</> and
- for one-dimensional arrays of all internal types. Prefix searching in
- <type>tsvector</> is implemented using the <acronym>GIN</> partial match
- feature.
+ The core <productname>PostgreSQL</> distribution
+ includes the <acronym>GIN</acronym> operator classes previously shown in
+ <xref linkend="gin-builtin-opclasses-table">.
The following <filename>contrib</> modules also contain
<acronym>GIN</acronym> operator classes:
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index 46f8e55ca925f864573ea226f1a9fb5105100b0e..271c1355199c4014049ab7d740888e3f51cdddf7 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -315,9 +315,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
operators with which a GIN index can be used vary depending on the
indexing strategy.
As an example, the standard distribution of
- <productname>PostgreSQL</productname> includes GIN operator classes
- for one-dimensional arrays, which support indexed
- queries using these operators:
+ <productname>PostgreSQL</productname> includes a GIN operator class
+ for arrays, which supports indexed queries using these operators:
<simplelist>
<member><literal><@</literal></member>
diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 7b9d55d38db05d96c26746a7f07cbd21b6733842..829d8f2fffb0491e409e0488a238e1907d346cf9 100644
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -235,6 +235,11 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
(currently GiST, GIN and BRIN) allow it to be different. The
<literal>STORAGE</> clause must be omitted unless the index
method allows a different type to be used.
+ If the column <replaceable class="parameter">data_type</> is specified
+ as <type>anyarray</>, the <replaceable class="parameter">storage_type</>
+ can be declared as <type>anyelement</> to indicate that the index
+ entries are members of the element type belonging to the actual array
+ type that each particular index is created for.
</para>
</listitem>
</varlistentry>
diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml
index f0b711e2cedb9ffa85fe559f70d5516c1223fb7b..333a36c4562f1876c86630df465e691ea0507480 100644
--- a/doc/src/sgml/xindex.sgml
+++ b/doc/src/sgml/xindex.sgml
@@ -288,7 +288,7 @@
have a fixed set of strategies either. Instead the support routines of
each operator class interpret the strategy numbers according to the
operator class's definition. As an example, the strategy numbers used by
- the built-in operator classes for arrays are shown in
+ the built-in operator class for arrays are shown in
<xref linkend="xindex-gin-array-strat-table">.
</para>
diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index d9146488c4450c6828fd4df1f3348f8fd024d3ed..f07eedc0fa3f594ea029e12bfba2107597452f7b 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -22,7 +22,9 @@
#include "miscadmin.h"
#include "storage/indexfsm.h"
#include "storage/lmgr.h"
+#include "utils/builtins.h"
#include "utils/index_selfuncs.h"
+#include "utils/typcache.h"
/*
@@ -105,9 +107,33 @@ initGinState(GinState *state, Relation index)
origTupdesc->attrs[i]->attcollation);
}
- fmgr_info_copy(&(state->compareFn[i]),
- index_getprocinfo(index, i + 1, GIN_COMPARE_PROC),
- CurrentMemoryContext);
+ /*
+ * If the compare proc isn't specified in the opclass definition, look
+ * up the index key type's default btree comparator.
+ */
+ if (index_getprocid(index, i + 1, GIN_COMPARE_PROC) != InvalidOid)
+ {
+ fmgr_info_copy(&(state->compareFn[i]),
+ index_getprocinfo(index, i + 1, GIN_COMPARE_PROC),
+ CurrentMemoryContext);
+ }
+ else
+ {
+ TypeCacheEntry *typentry;
+
+ typentry = lookup_type_cache(origTupdesc->attrs[i]->atttypid,
+ TYPECACHE_CMP_PROC_FINFO);
+ if (!OidIsValid(typentry->cmp_proc_finfo.fn_oid))
+ ereport(ERROR,
+ (errcode(ERRCODE_UNDEFINED_FUNCTION),
+ errmsg("could not identify a comparison function for type %s",
+ format_type_be(origTupdesc->attrs[i]->atttypid))));
+ fmgr_info_copy(&(state->compareFn[i]),
+ &(typentry->cmp_proc_finfo),
+ CurrentMemoryContext);
+ }
+
+ /* Opclass must always provide extract procs */
fmgr_info_copy(&(state->extractValueFn[i]),
index_getprocinfo(index, i + 1, GIN_EXTRACTVALUE_PROC),
CurrentMemoryContext);
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 032508387d1ac3083f89a49f9ee7ae8917eb169a..02196e0f124942e35c750e56482a45263d619b59 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -237,7 +237,7 @@ ginvalidate(Oid opclassoid)
if (opclassgroup &&
(opclassgroup->functionset & (((uint64) 1) << i)) != 0)
continue; /* got it */
- if (i == GIN_COMPARE_PARTIAL_PROC)
+ if (i == GIN_COMPARE_PROC || i == GIN_COMPARE_PARTIAL_PROC)
continue; /* optional method */
if (i == GIN_CONSISTENT_PROC || i == GIN_TRICONSISTENT_PROC)
continue; /* don't need both, see check below loop */
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index b0b43cf02d8d3281c716f874f9ed1181aa1ba481..08b646d8f33cbdedb34eebc30ad452731ca6b377 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -437,11 +437,28 @@ ConstructTupleDescriptor(Relation heapRelation,
keyType = opclassTup->opckeytype;
else
keyType = amroutine->amkeytype;
+
+ /*
+ * If keytype is specified as ANYELEMENT, and opcintype is ANYARRAY,
+ * then the attribute type must be an array (else it'd not have
+ * matched this opclass); use its element type.
+ */
+ if (keyType == ANYELEMENTOID && opclassTup->opcintype == ANYARRAYOID)
+ {
+ keyType = get_base_element_type(to->atttypid);
+ if (!OidIsValid(keyType))
+ elog(ERROR, "could not get element type of array type %u",
+ to->atttypid);
+ }
+
ReleaseSysCache(tuple);
+ /*
+ * If a key type different from the heap value is specified, update
+ * the type-related fields in the index tupdesc.
+ */
if (OidIsValid(keyType) && keyType != to->atttypid)
{
- /* index value and heap value have different types */
tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(keyType));
if (!HeapTupleIsValid(tuple))
elog(ERROR, "cache lookup failed for type %u", keyType);
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index ef691c5721f94fe28fa38ef4e566e0fdfc8634ab..3fdd0d6129580986e2b76e7a4a2c78f802f614df 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 201609131
+#define CATALOG_VERSION_NO 201609261
#endif
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index 917ed46b71ae11e6b00b08a2c25bcdb9e32ee231..15b629029fe0c604f91fc6c924f2f64649c29e8c 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -673,8 +673,7 @@ DATA(insert ( 2595 718 718 14 s 2864 783 0 ));
DATA(insert ( 2595 718 600 15 o 3291 783 1970 ));
/*
- * gin array_ops (these anyarray operators are used with all the opclasses
- * of the family)
+ * gin array_ops
*/
DATA(insert ( 2745 2277 2277 1 s 2750 2742 0 ));
DATA(insert ( 2745 2277 2277 2 s 2751 2742 0 ));
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index 0cbb416392047934f4624ac387f38d3985d5d5d1..1b654d5be48605fa9ee151632300df72be00eeab 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -255,156 +255,10 @@ DATA(insert ( 3550 869 869 9 3573 ));
/* gin */
-DATA(insert ( 2745 1007 1007 1 351 ));
-DATA(insert ( 2745 1007 1007 2 2743 ));
-DATA(insert ( 2745 1007 1007 3 2774 ));
-DATA(insert ( 2745 1007 1007 4 2744 ));
-DATA(insert ( 2745 1007 1007 6 3920 ));
-DATA(insert ( 2745 1009 1009 1 360 ));
-DATA(insert ( 2745 1009 1009 2 2743 ));
-DATA(insert ( 2745 1009 1009 3 2774 ));
-DATA(insert ( 2745 1009 1009 4 2744 ));
-DATA(insert ( 2745 1009 1009 6 3920 ));
-DATA(insert ( 2745 1015 1015 1 360 ));
-DATA(insert ( 2745 1015 1015 2 2743 ));
-DATA(insert ( 2745 1015 1015 3 2774 ));
-DATA(insert ( 2745 1015 1015 4 2744 ));
-DATA(insert ( 2745 1015 1015 6 3920 ));
-DATA(insert ( 2745 1023 1023 1 357 ));
-DATA(insert ( 2745 1023 1023 2 2743 ));
-DATA(insert ( 2745 1023 1023 3 2774 ));
-DATA(insert ( 2745 1023 1023 4 2744 ));
-DATA(insert ( 2745 1023 1023 6 3920 ));
-DATA(insert ( 2745 1561 1561 1 1596 ));
-DATA(insert ( 2745 1561 1561 2 2743 ));
-DATA(insert ( 2745 1561 1561 3 2774 ));
-DATA(insert ( 2745 1561 1561 4 2744 ));
-DATA(insert ( 2745 1561 1561 6 3920 ));
-DATA(insert ( 2745 1000 1000 1 1693 ));
-DATA(insert ( 2745 1000 1000 2 2743 ));
-DATA(insert ( 2745 1000 1000 3 2774 ));
-DATA(insert ( 2745 1000 1000 4 2744 ));
-DATA(insert ( 2745 1000 1000 6 3920 ));
-DATA(insert ( 2745 1014 1014 1 1078 ));
-DATA(insert ( 2745 1014 1014 2 2743 ));
-DATA(insert ( 2745 1014 1014 3 2774 ));
-DATA(insert ( 2745 1014 1014 4 2744 ));
-DATA(insert ( 2745 1014 1014 6 3920 ));
-DATA(insert ( 2745 1001 1001 1 1954 ));
-DATA(insert ( 2745 1001 1001 2 2743 ));
-DATA(insert ( 2745 1001 1001 3 2774 ));
-DATA(insert ( 2745 1001 1001 4 2744 ));
-DATA(insert ( 2745 1001 1001 6 3920 ));
-DATA(insert ( 2745 1002 1002 1 358 ));
-DATA(insert ( 2745 1002 1002 2 2743 ));
-DATA(insert ( 2745 1002 1002 3 2774 ));
-DATA(insert ( 2745 1002 1002 4 2744 ));
-DATA(insert ( 2745 1002 1002 6 3920 ));
-DATA(insert ( 2745 1182 1182 1 1092 ));
-DATA(insert ( 2745 1182 1182 2 2743 ));
-DATA(insert ( 2745 1182 1182 3 2774 ));
-DATA(insert ( 2745 1182 1182 4 2744 ));
-DATA(insert ( 2745 1182 1182 6 3920 ));
-DATA(insert ( 2745 1021 1021 1 354 ));
-DATA(insert ( 2745 1021 1021 2 2743 ));
-DATA(insert ( 2745 1021 1021 3 2774 ));
-DATA(insert ( 2745 1021 1021 4 2744 ));
-DATA(insert ( 2745 1021 1021 6 3920 ));
-DATA(insert ( 2745 1022 1022 1 355 ));
-DATA(insert ( 2745 1022 1022 2 2743 ));
-DATA(insert ( 2745 1022 1022 3 2774 ));
-DATA(insert ( 2745 1022 1022 4 2744 ));
-DATA(insert ( 2745 1022 1022 6 3920 ));
-DATA(insert ( 2745 1041 1041 1 926 ));
-DATA(insert ( 2745 1041 1041 2 2743 ));
-DATA(insert ( 2745 1041 1041 3 2774 ));
-DATA(insert ( 2745 1041 1041 4 2744 ));
-DATA(insert ( 2745 1041 1041 6 3920 ));
-DATA(insert ( 2745 651 651 1 926 ));
-DATA(insert ( 2745 651 651 2 2743 ));
-DATA(insert ( 2745 651 651 3 2774 ));
-DATA(insert ( 2745 651 651 4 2744 ));
-DATA(insert ( 2745 651 651 6 3920 ));
-DATA(insert ( 2745 1005 1005 1 350 ));
-DATA(insert ( 2745 1005 1005 2 2743 ));
-DATA(insert ( 2745 1005 1005 3 2774 ));
-DATA(insert ( 2745 1005 1005 4 2744 ));
-DATA(insert ( 2745 1005 1005 6 3920 ));
-DATA(insert ( 2745 1016 1016 1 842 ));
-DATA(insert ( 2745 1016 1016 2 2743 ));
-DATA(insert ( 2745 1016 1016 3 2774 ));
-DATA(insert ( 2745 1016 1016 4 2744 ));
-DATA(insert ( 2745 1016 1016 6 3920 ));
-DATA(insert ( 2745 1187 1187 1 1315 ));
-DATA(insert ( 2745 1187 1187 2 2743 ));
-DATA(insert ( 2745 1187 1187 3 2774 ));
-DATA(insert ( 2745 1187 1187 4 2744 ));
-DATA(insert ( 2745 1187 1187 6 3920 ));
-DATA(insert ( 2745 1040 1040 1 836 ));
-DATA(insert ( 2745 1040 1040 2 2743 ));
-DATA(insert ( 2745 1040 1040 3 2774 ));
-DATA(insert ( 2745 1040 1040 4 2744 ));
-DATA(insert ( 2745 1040 1040 6 3920 ));
-DATA(insert ( 2745 1003 1003 1 359 ));
-DATA(insert ( 2745 1003 1003 2 2743 ));
-DATA(insert ( 2745 1003 1003 3 2774 ));
-DATA(insert ( 2745 1003 1003 4 2744 ));
-DATA(insert ( 2745 1003 1003 6 3920 ));
-DATA(insert ( 2745 1231 1231 1 1769 ));
-DATA(insert ( 2745 1231 1231 2 2743 ));
-DATA(insert ( 2745 1231 1231 3 2774 ));
-DATA(insert ( 2745 1231 1231 4 2744 ));
-DATA(insert ( 2745 1231 1231 6 3920 ));
-DATA(insert ( 2745 1028 1028 1 356 ));
-DATA(insert ( 2745 1028 1028 2 2743 ));
-DATA(insert ( 2745 1028 1028 3 2774 ));
-DATA(insert ( 2745 1028 1028 4 2744 ));
-DATA(insert ( 2745 1028 1028 6 3920 ));
-DATA(insert ( 2745 1013 1013 1 404 ));
-DATA(insert ( 2745 1013 1013 2 2743 ));
-DATA(insert ( 2745 1013 1013 3 2774 ));
-DATA(insert ( 2745 1013 1013 4 2744 ));
-DATA(insert ( 2745 1013 1013 6 3920 ));
-DATA(insert ( 2745 1183 1183 1 1107 ));
-DATA(insert ( 2745 1183 1183 2 2743 ));
-DATA(insert ( 2745 1183 1183 3 2774 ));
-DATA(insert ( 2745 1183 1183 4 2744 ));
-DATA(insert ( 2745 1183 1183 6 3920 ));
-DATA(insert ( 2745 1185 1185 1 1314 ));
-DATA(insert ( 2745 1185 1185 2 2743 ));
-DATA(insert ( 2745 1185 1185 3 2774 ));
-DATA(insert ( 2745 1185 1185 4 2744 ));
-DATA(insert ( 2745 1185 1185 6 3920 ));
-DATA(insert ( 2745 1270 1270 1 1358 ));
-DATA(insert ( 2745 1270 1270 2 2743 ));
-DATA(insert ( 2745 1270 1270 3 2774 ));
-DATA(insert ( 2745 1270 1270 4 2744 ));
-DATA(insert ( 2745 1270 1270 6 3920 ));
-DATA(insert ( 2745 1563 1563 1 1672 ));
-DATA(insert ( 2745 1563 1563 2 2743 ));
-DATA(insert ( 2745 1563 1563 3 2774 ));
-DATA(insert ( 2745 1563 1563 4 2744 ));
-DATA(insert ( 2745 1563 1563 6 3920 ));
-DATA(insert ( 2745 1115 1115 1 2045 ));
-DATA(insert ( 2745 1115 1115 2 2743 ));
-DATA(insert ( 2745 1115 1115 3 2774 ));
-DATA(insert ( 2745 1115 1115 4 2744 ));
-DATA(insert ( 2745 1115 1115 6 3920 ));
-DATA(insert ( 2745 791 791 1 377 ));
-DATA(insert ( 2745 791 791 2 2743 ));
-DATA(insert ( 2745 791 791 3 2774 ));
-DATA(insert ( 2745 791 791 4 2744 ));
-DATA(insert ( 2745 791 791 6 3920 ));
-DATA(insert ( 2745 1024 1024 1 380 ));
-DATA(insert ( 2745 1024 1024 2 2743 ));
-DATA(insert ( 2745 1024 1024 3 2774 ));
-DATA(insert ( 2745 1024 1024 4 2744 ));
-DATA(insert ( 2745 1024 1024 6 3920 ));
-DATA(insert ( 2745 1025 1025 1 381 ));
-DATA(insert ( 2745 1025 1025 2 2743 ));
-DATA(insert ( 2745 1025 1025 3 2774 ));
-DATA(insert ( 2745 1025 1025 4 2744 ));
-DATA(insert ( 2745 1025 1025 6 3920 ));
+DATA(insert ( 2745 2277 2277 2 2743 ));
+DATA(insert ( 2745 2277 2277 3 2774 ));
+DATA(insert ( 2745 2277 2277 4 2744 ));
+DATA(insert ( 2745 2277 2277 6 3920 ));
DATA(insert ( 3659 3614 3614 1 3724 ));
DATA(insert ( 3659 3614 3614 2 3656 ));
DATA(insert ( 3659 3614 3614 3 3657 ));
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index f40b06112b158456e4e8022df56e1cc841348784..5900cdc5b0b055866ed8c2ebb56801fe488fb012 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -184,36 +184,7 @@ DATA(insert ( 783 box_ops PGNSP PGUID 2593 603 t 0 ));
DATA(insert ( 783 point_ops PGNSP PGUID 1029 600 t 603 ));
DATA(insert ( 783 poly_ops PGNSP PGUID 2594 604 t 603 ));
DATA(insert ( 783 circle_ops PGNSP PGUID 2595 718 t 603 ));
-DATA(insert ( 2742 _int4_ops PGNSP PGUID 2745 1007 t 23 ));
-DATA(insert ( 2742 _text_ops PGNSP PGUID 2745 1009 t 25 ));
-DATA(insert ( 2742 _abstime_ops PGNSP PGUID 2745 1023 t 702 ));
-DATA(insert ( 2742 _bit_ops PGNSP PGUID 2745 1561 t 1560 ));
-DATA(insert ( 2742 _bool_ops PGNSP PGUID 2745 1000 t 16 ));
-DATA(insert ( 2742 _bpchar_ops PGNSP PGUID 2745 1014 t 1042 ));
-DATA(insert ( 2742 _bytea_ops PGNSP PGUID 2745 1001 t 17 ));
-DATA(insert ( 2742 _char_ops PGNSP PGUID 2745 1002 t 18 ));
-DATA(insert ( 2742 _cidr_ops PGNSP PGUID 2745 651 t 650 ));
-DATA(insert ( 2742 _date_ops PGNSP PGUID 2745 1182 t 1082 ));
-DATA(insert ( 2742 _float4_ops PGNSP PGUID 2745 1021 t 700 ));
-DATA(insert ( 2742 _float8_ops PGNSP PGUID 2745 1022 t 701 ));
-DATA(insert ( 2742 _inet_ops PGNSP PGUID 2745 1041 t 869 ));
-DATA(insert ( 2742 _int2_ops PGNSP PGUID 2745 1005 t 21 ));
-DATA(insert ( 2742 _int8_ops PGNSP PGUID 2745 1016 t 20 ));
-DATA(insert ( 2742 _interval_ops PGNSP PGUID 2745 1187 t 1186 ));
-DATA(insert ( 2742 _macaddr_ops PGNSP PGUID 2745 1040 t 829 ));
-DATA(insert ( 2742 _name_ops PGNSP PGUID 2745 1003 t 19 ));
-DATA(insert ( 2742 _numeric_ops PGNSP PGUID 2745 1231 t 1700 ));
-DATA(insert ( 2742 _oid_ops PGNSP PGUID 2745 1028 t 26 ));
-DATA(insert ( 2742 _oidvector_ops PGNSP PGUID 2745 1013 t 30 ));
-DATA(insert ( 2742 _time_ops PGNSP PGUID 2745 1183 t 1083 ));
-DATA(insert ( 2742 _timestamptz_ops PGNSP PGUID 2745 1185 t 1184 ));
-DATA(insert ( 2742 _timetz_ops PGNSP PGUID 2745 1270 t 1266 ));
-DATA(insert ( 2742 _varbit_ops PGNSP PGUID 2745 1563 t 1562 ));
-DATA(insert ( 2742 _varchar_ops PGNSP PGUID 2745 1015 t 1043 ));
-DATA(insert ( 2742 _timestamp_ops PGNSP PGUID 2745 1115 t 1114 ));
-DATA(insert ( 2742 _money_ops PGNSP PGUID 2745 791 t 790 ));
-DATA(insert ( 2742 _reltime_ops PGNSP PGUID 2745 1024 t 703 ));
-DATA(insert ( 2742 _tinterval_ops PGNSP PGUID 2745 1025 t 704 ));
+DATA(insert ( 2742 array_ops PGNSP PGUID 2745 2277 t 2283 ));
DATA(insert ( 403 uuid_ops PGNSP PGUID 2968 2950 t 0 ));
DATA(insert ( 405 uuid_ops PGNSP PGUID 2969 2950 t 0 ));
DATA(insert ( 403 pg_lsn_ops PGNSP PGUID 3253 3220 t 0 ));