Preventing intersection of ranges during page split. Changes are only

optimization, so don't backpatch.

1 files changed, 11 insertions, 6 deletions

diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index f3c29f60513..12a2c476a4d 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.8 2009/06/11 14:48:50 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.9 2009/12/02 13:13:24 teodor Exp $
  */
 #include "btree_gist.h"
 #include "btree_utils_num.h"
@@ -57,13 +57,18 @@ gbt_int4lt(const void *a, const void *b)
 static int
 gbt_int4key_cmp(const void *a, const void *b)
 {
+	int32KEY	*ia = (int32KEY*)(((Nsrt *) a)->t);
+	int32KEY	*ib = (int32KEY*)(((Nsrt *) b)->t);
 
-	if (*(int32 *) &(((Nsrt *) a)->t[0]) > *(int32 *) &(((Nsrt *) b)->t[0]))
-		return 1;
-	else if (*(int32 *) &(((Nsrt *) a)->t[0]) < *(int32 *) &(((Nsrt *) b)->t[0]))
-		return -1;
-	return 0;
+	if (ia->lower == ib->lower)
+	{
+		if (ia->upper == ib->upper)
+			return 0;
 
+		return (ia->upper > ib->upper) ? 1 : -1;
+	}
+
+	return (ia->lower > ib->lower) ? 1 : -1;
 }