varstr_cmp and any comparison function that piggybacks on it can return

hlinnaka · hlinnaka · commit 283939a321bc · 2009-04-23T07:19:09.000Z
any negative or positive number, not just -1 or 1. Fix comment on
varstr_cmp and citext test case accordingly.

As pointed out by Zdenek Kotala, and buildfarm member gothic moth.
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out
@@ -213,10 +213,10 @@ SELECT citext_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
     0
 (1 row)
 
-SELECT citext_cmp('B'::citext, 'a'::citext) AS one;
- one 
------
-   1
+SELECT citext_cmp('B'::citext, 'a'::citext) > 0 AS true;
+ true 
+------
+    t
 (1 row)
 
 -- Do some tests using a table and index.
diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out
@@ -213,10 +213,10 @@ SELECT citext_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
     0
 (1 row)
 
-SELECT citext_cmp('B'::citext, 'a'::citext) AS one;
- one 
------
-   1
+SELECT citext_cmp('B'::citext, 'a'::citext) > 0 AS true;
+ true 
+------
+    t
 (1 row)
 
 -- Do some tests using a table and index.
diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql
@@ -90,7 +90,7 @@ SELECT 'aardvark'::citext = 'aardVark'::citext AS t;
 SELECT citext_cmp('aardvark'::citext, 'aardvark'::citext) AS zero;
 SELECT citext_cmp('aardvark'::citext, 'aardVark'::citext) AS zero;
 SELECT citext_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
-SELECT citext_cmp('B'::citext, 'a'::citext) AS one;
+SELECT citext_cmp('B'::citext, 'a'::citext) > 0 AS true;
 
 -- Do some tests using a table and index.
 
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.169 2009/01/01 17:23:50 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.170 2009/04/23 07:19:09 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1138,7 +1138,8 @@ text_position_cleanup(TextPositionState *state)
  * Comparison function for text strings with given lengths.
  * Includes locale support, but must copy strings to temporary memory
  *	to allow null-termination for inputs to strcoll().
- * Returns -1, 0 or 1
+ * Returns an integer less than, equal to, or greater than zero, indicating
+ * whether arg1 is less than, equal to, or greater than arg2.
  */
 int
 varstr_cmp(char *arg1, int len1, char *arg2, int len2)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.169 2009/01/01 17:23:50 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.170 2009/04/23 07:19:09 heikki Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1138,7 +1138,8 @@ text_position_cleanup(TextPositionState *state)`
`1138`	`1138`	`* Comparison function for text strings with given lengths.`
`1139`	`1139`	`* Includes locale support, but must copy strings to temporary memory`
`1140`	`1140`	`* to allow null-termination for inputs to strcoll().`
`1141`		`- * Returns -1, 0 or 1`
	`1141`	`+ * Returns an integer less than, equal to, or greater than zero, indicating`
	`1142`	`+ * whether arg1 is less than, equal to, or greater than arg2.`
`1142`	`1143`	`*/`
`1143`	`1144`	`int`
`1144`	`1145`	`varstr_cmp(char arg1, int len1, char arg2, int len2)`