Fix the prefix_range btree class to support sub-ranges, call it 1.1.0…

… because btree indexes will have to get rebuilt (cmp function behavior change)

.gitignore

@@ -0,0 +1,2 @@
+/prefix.so
+/prefix.sql

Makefile

@@ -1,5 +1,5 @@
 PKGNAME = prefix
-PKGVERS = 1.0.0
+PKGVERS = 1.1.0
 
 DEBDIR = /tmp/$(PKGNAME)
 EXPORT = $(DEBDIR)/export/$(PKGNAME)-$(PKGVERS)
@@ -34,20 +34,15 @@ deb:
 	rm -rf $(DEBDIR)	
 	mkdir -p $(DEBDIR)/$(PKGNAME)-$(PKGVERS)
 	mkdir -p $(EXPORT)
-	cp -a . $(EXPORT)
+	rsync -Ca . $(EXPORT)
 
 	# get rid of temp and build files
 	for n in ".#*" "*~" "build-stamp" "configure-stamp" "prefix.sql" "prefix.so"; do \
 	  find $(EXPORT) -name "$$n" -print0|xargs -0 rm -f; \
 	done
 
-	# get rid of CVS dirs
-	for n in "CVS" "CVSROOT"; do \
-	  find $(EXPORT) -type d -name "$$n" -print0|xargs -0 rm -rf; \
-	done
-
 	# prepare the .orig without the debian/ packaging stuff
-	cp -a $(EXPORT) $(DEBDIR)
+	rsync -Ca $(EXPORT) $(DEBDIR)
 	rm -rf $(DEBDIR)/$(PKGNAME)-$(PKGVERS)/debian
 	(cd $(DEBDIR) && tar czf $(ORIG) $(PKGNAME)-$(PKGVERS))
 

debian/changelog

@@ -1,3 +1,9 @@
+prefix (1.1.0-1) unstable; urgency=high
+
+  * Fix Btree opclass for supporting sub-ranges
+
+ -- Dimitri Fontaine <dim@tapoueh.org>  Mon, 30 Nov 2009 10:02:40 +0100
+
 prefix (1.0.0-1) unstable; urgency=low
 
   * Release 1.0.0

debian/rules

@@ -31,7 +31,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep 
 	dh_installdirs
 
 	mkdir -p $(TGT83) $(TGT84)

prefix.c

@@ -520,7 +520,11 @@ int pr_cmp(prefix_range *a, prefix_range *b) {
   cmp = memcmp(p, q, mlen);
 
   if( cmp == 0 )
-    return (a->first == b->first) ? (a->last - b->last) : (a->first - b->first);
+    /*
+     * we are comparing e.g. '1' and '12' (the shorter contains the
+     * smaller), so let's pretend '12' < '1' as it contains less elements.
+     */
+    return (alen == mlen) ? 1 : -1;
 
   return cmp;
 }