diff options
| -rw-r--r-- | src/backend/utils/adt/tid.c | 4 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_operator.h | 3 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 4 | ||||
| -rw-r--r-- | src/include/utils/builtins.h | 3 | ||||
| -rw-r--r-- | src/test/regress/expected/transactions.out | 25 | ||||
| -rw-r--r-- | src/test/regress/sql/transactions.sql | 6 |
7 files changed, 41 insertions, 8 deletions
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index ba33ce50ee5..0fbc569a0df 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.49 2005/05/27 00:57:49 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.50 2006/02/26 18:36:21 neilc Exp $ * * NOTES * input routine largely stolen from boxin(). @@ -174,7 +174,6 @@ tideq(PG_FUNCTION_ARGS) arg1->ip_posid == arg2->ip_posid); } -#ifdef NOT_USED Datum tidne(PG_FUNCTION_ARGS) { @@ -185,7 +184,6 @@ tidne(PG_FUNCTION_ARGS) BlockIdGetBlockNumber(&(arg2->ip_blkid)) || arg1->ip_posid != arg2->ip_posid); } -#endif /* * Functions to get latest tid of a specified tuple. diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 1c2ac77ea1f..1a391bad3f3 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.315 2006/02/12 03:22:19 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.316 2006/02/26 18:36:21 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200602112 +#define CATALOG_VERSION_NO 200602251 #endif diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 72625937c32..a746bff2711 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.139 2006/02/11 03:32:39 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.140 2006/02/26 18:36:21 neilc Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -130,6 +130,7 @@ DATA(insert OID = 385 ( "=" PGNSP PGUID b t 29 29 16 385 0 0 0 0 0 cide DATA(insert OID = 386 ( "=" PGNSP PGUID b t 22 22 16 386 0 0 0 0 0 int2vectoreq eqsel eqjoinsel )); DATA(insert OID = 387 ( "=" PGNSP PGUID b f 27 27 16 387 0 0 0 0 0 tideq eqsel eqjoinsel )); #define TIDEqualOperator 387 +DATA(insert OID = 402 ( "<>" PGNSP PGUID b f 27 27 16 402 0 0 0 0 0 tidne neqsel neqjoinsel )); DATA(insert OID = 410 ( "=" PGNSP PGUID b t 20 20 16 410 411 412 412 412 413 int8eq eqsel eqjoinsel )); DATA(insert OID = 411 ( "<>" PGNSP PGUID b f 20 20 16 411 410 0 0 0 0 int8ne neqsel neqjoinsel )); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index d8700b8759e..ec43235eef3 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.397 2006/02/12 03:22:19 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.398 2006/02/26 18:36:21 neilc Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -1598,6 +1598,8 @@ DATA(insert OID = 1293 ( currtid PGNSP PGUID 12 f f t f v 2 27 "26 27" _null DESCR("latest tid of a tuple"); DATA(insert OID = 1294 ( currtid2 PGNSP PGUID 12 f f t f v 2 27 "25 27" _null_ _null_ _null_ currtid_byrelname - _null_ )); DESCR("latest tid of a tuple"); +DATA(insert OID = 2398 ( tidne PGNSP PGUID 12 f f t f i 2 16 "27 27" _null_ _null_ _null_ tidne - _null_ )); +DESCR("not equal"); DATA(insert OID = 2168 ( pg_database_size PGNSP PGUID 12 f f t f v 1 20 "19" _null_ _null_ _null_ pg_database_size_name - _null_ )); DESCR("Calculate total disk space usage for the specified database"); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index d79749a8a4f..28a70d11ce7 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.273 2006/02/11 03:32:41 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.274 2006/02/26 18:36:22 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -531,6 +531,7 @@ extern Datum tidout(PG_FUNCTION_ARGS); extern Datum tidrecv(PG_FUNCTION_ARGS); extern Datum tidsend(PG_FUNCTION_ARGS); extern Datum tideq(PG_FUNCTION_ARGS); +extern Datum tidne(PG_FUNCTION_ARGS); extern Datum currtid_byreloid(PG_FUNCTION_ARGS); extern Datum currtid_byrelname(PG_FUNCTION_ARGS); diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out index 06a8a8f47c5..047bba8f70a 100644 --- a/src/test/regress/expected/transactions.out +++ b/src/test/regress/expected/transactions.out @@ -517,3 +517,28 @@ fetch from foo; (1 row) abort; +-- tests for the "tid" type +SELECT '(3, 3)'::tid = '(3, 4)'::tid; + ?column? +---------- + f +(1 row) + +SELECT '(3, 3)'::tid = '(3, 3)'::tid; + ?column? +---------- + t +(1 row) + +SELECT '(3, 3)'::tid <> '(3, 3)'::tid; + ?column? +---------- + f +(1 row) + +SELECT '(3, 3)'::tid <> '(3, 4)'::tid; + ?column? +---------- + t +(1 row) + diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql index 247d6facb8e..76b22cd99cc 100644 --- a/src/test/regress/sql/transactions.sql +++ b/src/test/regress/sql/transactions.sql @@ -325,3 +325,9 @@ rollback to x; fetch from foo; abort; + +-- tests for the "tid" type +SELECT '(3, 3)'::tid = '(3, 4)'::tid; +SELECT '(3, 3)'::tid = '(3, 3)'::tid; +SELECT '(3, 3)'::tid <> '(3, 3)'::tid; +SELECT '(3, 3)'::tid <> '(3, 4)'::tid; |