aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/src/sgml/func.sgml18
-rw-r--r--doc/src/sgml/release.sgml7
-rw-r--r--src/backend/utils/adt/arrayfuncs.c24
-rw-r--r--src/include/catalog/catversion.h4
-rw-r--r--src/include/catalog/pg_proc.h4
-rw-r--r--src/include/utils/array.h3
-rw-r--r--src/test/regress/expected/arrays.out26
-rw-r--r--src/test/regress/sql/arrays.sql4
8 files changed, 7 insertions, 83 deletions
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index f42f3e93412..5c3580aec68 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.475 2009/04/07 00:31:25 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.476 2009/04/09 17:39:47 tgl Exp $ -->
<chapter id="functions">
<title>Functions and Operators</title>
@@ -9369,9 +9369,6 @@ SELECT NULLIF(value, '(none)') ...
<primary>array_upper</primary>
</indexterm>
<indexterm>
- <primary>cardinality</primary>
- </indexterm>
- <indexterm>
<primary>string_to_array</primary>
</indexterm>
<indexterm>
@@ -9506,19 +9503,6 @@ SELECT NULLIF(value, '(none)') ...
<row>
<entry>
<literal>
- <function>cardinality</function>(<type>anyarray</type>)
- </literal>
- </entry>
- <entry><type>int</type></entry>
- <entry>returns the length of the first dimension of the array
- (special case of <function>array_length</function> for SQL
- compatibility)</entry>
- <entry><literal>cardinality(array[1,2,3])</literal></entry>
- <entry><literal>3</literal></entry>
- </row>
- <row>
- <entry>
- <literal>
<function>string_to_array</function>(<type>text</type>, <type>text</type>)
</literal>
</entry>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index acd2786caad..a13828d52c9 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.624 2009/04/07 21:30:01 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.625 2009/04/09 17:39:47 tgl Exp $ -->
<!--
Typical markup:
@@ -1624,11 +1624,6 @@ do it for earlier branch release files.
of an array for the specified dimensions (Jim Nasby, Robert
Haas, Peter Eisentraut)
</para>
-
- <para>
- Also add identically-functioning <acronym>SQL</>-standard
- function <function>cardinality()</>.
- </para>
</listitem>
<listitem>
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 8b36edc42fa..bc661ae4171 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.154 2009/04/05 22:28:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.155 2009/04/09 17:39:48 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1669,28 +1669,6 @@ array_length(PG_FUNCTION_ARGS)
}
/*
- * array_cardinality :
- * SQL-spec alias for array_length(v, 1)
- */
-Datum
-array_cardinality(PG_FUNCTION_ARGS)
-{
- ArrayType *v = PG_GETARG_ARRAYTYPE_P(0);
- int *dimv;
- int result;
-
- /* Sanity check: does it look like an array at all? */
- if (ARR_NDIM(v) <= 0 || ARR_NDIM(v) > MAXDIM)
- PG_RETURN_NULL();
-
- dimv = ARR_DIMS(v);
-
- result = dimv[0];
-
- PG_RETURN_INT32(result);
-}
-
-/*
* array_ref :
* This routine takes an array pointer and a subscript array and returns
* the referenced item as a Datum. Note that for a pass-by-reference
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 64c6e08e452..bf23d146237 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.529 2009/04/07 00:31:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.530 2009/04/09 17:39:48 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,6 +53,6 @@
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 200904061
+#define CATALOG_VERSION_NO 200904091
#endif
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index fb711375a07..504bb3ebd9c 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.541 2009/04/07 00:31:26 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.542 2009/04/09 17:39:48 tgl Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -1005,8 +1005,6 @@ DATA(insert OID = 2092 ( array_upper PGNSP PGUID 12 1 0 0 f f f t f i 2 0 23
DESCR("array upper dimension");
DATA(insert OID = 2176 ( array_length PGNSP PGUID 12 1 0 0 f f f t f i 2 0 23 "2277 23" _null_ _null_ _null_ _null_ array_length _null_ _null_ _null_ ));
DESCR("array length");
-DATA(insert OID = 2179 ( cardinality PGNSP PGUID 12 1 0 0 f f f t f i 1 0 23 "2277" _null_ _null_ _null_ _null_ array_cardinality _null_ _null_ _null_ ));
-DESCR("array cardinality");
DATA(insert OID = 378 ( array_append PGNSP PGUID 12 1 0 0 f f f f f i 2 0 2277 "2277 2283" _null_ _null_ _null_ _null_ array_push _null_ _null_ _null_ ));
DESCR("append element onto end of array");
DATA(insert OID = 379 ( array_prepend PGNSP PGUID 12 1 0 0 f f f f f i 2 0 2277 "2283 2277" _null_ _null_ _null_ _null_ array_push _null_ _null_ _null_ ));
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index f2c79a62196..b2942d8f8c5 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -49,7 +49,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.75 2009/04/05 22:28:59 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.76 2009/04/09 17:39:50 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -200,7 +200,6 @@ extern Datum array_dims(PG_FUNCTION_ARGS);
extern Datum array_lower(PG_FUNCTION_ARGS);
extern Datum array_upper(PG_FUNCTION_ARGS);
extern Datum array_length(PG_FUNCTION_ARGS);
-extern Datum array_cardinality(PG_FUNCTION_ARGS);
extern Datum array_larger(PG_FUNCTION_ARGS);
extern Datum array_smaller(PG_FUNCTION_ARGS);
extern Datum generate_subscripts(PG_FUNCTION_ARGS);
diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out
index ec2fd52c7f8..c7ddc2d7aa5 100644
--- a/src/test/regress/expected/arrays.out
+++ b/src/test/regress/expected/arrays.out
@@ -1105,26 +1105,6 @@ select array_length(array[[1,2,3], [4,5,6]], 3);
(1 row)
-select cardinality(array[1,2,3]);
- cardinality
--------------
- 3
-(1 row)
-
-select cardinality(array[[1,2,3], [4,5,6]]);
- cardinality
--------------
- 2
-(1 row)
-
-select c, cardinality(c), d, cardinality(d) from arrtest;
- c | cardinality | d | cardinality
--------------------+-------------+---------------+-------------
- {} | | {} |
- {foobar,new_word} | 2 | {{elt1,elt2}} | 1
- {foo,new_word} | 2 | {bar,foo} | 2
-(3 rows)
-
select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
array_agg
--------------------------------------
@@ -1143,12 +1123,6 @@ select array_agg(nullif(ten, 4)) from (select ten from tenk1 where unique1 < 15
{0,1,2,3,NULL,5,6,7,8,9,0,1,2,3,NULL}
(1 row)
-select cardinality(array_agg(unique1)) from tenk1 where unique1 < 15;
- cardinality
--------------
- 15
-(1 row)
-
select array_agg(unique1) from tenk1 where unique1 < -15;
array_agg
-----------
diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql
index a4a91b034c9..5e4933c31d3 100644
--- a/src/test/regress/sql/arrays.sql
+++ b/src/test/regress/sql/arrays.sql
@@ -392,14 +392,10 @@ select array_length(array[[1,2,3], [4,5,6]], 0);
select array_length(array[[1,2,3], [4,5,6]], 1);
select array_length(array[[1,2,3], [4,5,6]], 2);
select array_length(array[[1,2,3], [4,5,6]], 3);
-select cardinality(array[1,2,3]);
-select cardinality(array[[1,2,3], [4,5,6]]);
-select c, cardinality(c), d, cardinality(d) from arrtest;
select array_agg(unique1) from (select unique1 from tenk1 where unique1 < 15 order by unique1) ss;
select array_agg(ten) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
select array_agg(nullif(ten, 4)) from (select ten from tenk1 where unique1 < 15 order by unique1) ss;
-select cardinality(array_agg(unique1)) from tenk1 where unique1 < 15;
select array_agg(unique1) from tenk1 where unique1 < -15;
select unnest(array[1,2,3]);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 11:00:42 +0000