Fixed very stupid but important bug: mixing calls of some founctions from

contrib/tsearch and contrib/ltree :)

Teodor Sigaev

9 files changed, 21 insertions, 19 deletions

diff --git a/contrib/ltree/README.ltree b/contrib/ltree/README.ltree
index b11a27bc30d..c552dca72d6 100644
--- a/contrib/ltree/README.ltree
+++ b/contrib/ltree/README.ltree
@@ -426,6 +426,8 @@ appreciate your input. So far, below some (rather obvious) results:
 
 CHANGES
 
+Aug 9, 2002
+   Fixed very stupid but important bug :-)
 July 31, 2002
    Now works on 64-bit platforms.
    Added function lca - lowest common ancestor
@@ -437,7 +439,7 @@ July 13, 2002
 TODO
 
   * Testing on 64-bit platforms. There are several known problems with byte
-    alignment;
+    alignment; -- RESOLVED
   * Better documentation;
   * We plan (probably) to improve regular expressions processing using
     non-deterministic automata;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 84593deb97e..8b7420e6d9e 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -45,7 +45,7 @@ hashing(BITVECP sign, ltree *t) {
 	int  hash;
 
 	while(tlen > 0) {
-		hash = crc32_sz( cur->name, cur->len );
+		hash = ltree_crc32_sz( cur->name, cur->len );
 		AHASH( sign, hash );
 		cur = LEVEL_NEXT(cur);
 		tlen--;
@@ -455,7 +455,7 @@ gist_te(ltree_gist *key, ltree* query) {
 		return true;
 
 	while( qlen>0 ) {
-		hv = crc32_sz(curq->name,curq->len);
+		hv = ltree_crc32_sz(curq->name,curq->len);
 		if ( ! GETBIT( sign, AHASHVAL(hv) ) )
 			return false; 
 		curq = LEVEL_NEXT(curq);
@@ -475,7 +475,7 @@ gist_qtxt(ltree_gist *key, ltxtquery* query) {
 	if ( LTG_ISALLTRUE(key) )
 		return true;
             
-	return execute(
+	return ltree_execute(
 		GETQUERY(query),
 		(void*)LTG_SIGN(key), false,
 		checkcondition_bit
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index 0e04bdb1b0a..5cbde4135bf 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -95,7 +95,7 @@ static const unsigned int crc32tab[256] = {
 };
 
 unsigned int
-crc32_sz(char *buf, int size)
+ltree_crc32_sz(char *buf, int size)
 {
 	unsigned int crc = ~0;
 	char	   *p;
diff --git a/contrib/ltree/crc32.h b/contrib/ltree/crc32.h
index 97254a4a909..f70722c1c5d 100644
--- a/contrib/ltree/crc32.h
+++ b/contrib/ltree/crc32.h
@@ -2,9 +2,9 @@
 #define _CRC32_H
 
 /* Returns crc32 of data block */
-extern unsigned int crc32_sz(char *buf, int size);
+extern unsigned int ltree_crc32_sz(char *buf, int size);
 
 /* Returns crc32 of null-terminated string */
-#define crc32(buf) crc32_sz((buf),strlen(buf))
+#define crc32(buf) ltree_crc32_sz((buf),strlen(buf))
 
 #endif
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index a53684370ae..0c92deeea4a 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -152,7 +152,7 @@ Datum   ltree_textadd(PG_FUNCTION_ARGS);
 /* Util function */
 Datum ltree_in(PG_FUNCTION_ARGS);
 
-bool execute(ITEM * curitem, void *checkval,
+bool ltree_execute(ITEM * curitem, void *checkval,
                 bool calcnot, bool (*chkcond) (void *checkval, ITEM * val));
 
 int ltree_compare(const ltree *a, const ltree *b);
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 024fd6acbe4..5a4c7bbf517 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -130,7 +130,7 @@ hashing(BITVECP sign, ltree *t) {
 	int  hash;
 
 	while(tlen > 0) {
-		hash = crc32_sz( cur->name, cur->len );
+		hash = ltree_crc32_sz( cur->name, cur->len );
 		HASH( sign, hash );
 		cur = LEVEL_NEXT(cur);
 		tlen--;
@@ -511,7 +511,7 @@ gist_qtxt(ltree_gist *key, ltxtquery* query) {
 	if ( LTG_ISALLTRUE(key) )
 		return true;
  
-	return execute(
+	return ltree_execute(
 		GETQUERY(query),
 		(void*)LTG_SIGN(key), false,
 		checkcondition_bit
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index 2f9e9ed3adf..6fb6d3db9e2 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -333,7 +333,7 @@ lquery_in(PG_FUNCTION_ARGS) {
 				cur->totallen += MAXALIGN(LVAR_HDRSIZE + lptr->len);
 				lrptr->len  = lptr->len;
 				lrptr->flag = lptr->flag;
-				lrptr->val = crc32_sz((uint8 *) lptr->start, lptr->len);
+				lrptr->val = ltree_crc32_sz((uint8 *) lptr->start, lptr->len);
 				memcpy( lrptr->name, lptr->start, lptr->len);
 				lptr++;
 				lrptr = LVAR_NEXT( lrptr );
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index e056b84bc0f..59bf0776eeb 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -154,7 +154,7 @@ pushval_asis(QPRS_STATE * state, int type, char *strval, int lenval, uint16 flag
 	if (lenval > 0xffff)
 		elog(ERROR, "Word is too long");
 
-	pushquery(state, type, crc32_sz((uint8 *) strval, lenval),
+	pushquery(state, type, ltree_crc32_sz((uint8 *) strval, lenval),
 			  state->curop - state->op, lenval, flag);
 
 	while (state->curop - state->op + lenval + 1 >= state->lenop)
diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c
index d5674427e6e..925385f7e37 100644
--- a/contrib/ltree/ltxtquery_op.c
+++ b/contrib/ltree/ltxtquery_op.c
@@ -13,23 +13,23 @@ PG_FUNCTION_INFO_V1(ltxtq_rexec);
  * check for boolean condition
  */
 bool 
-execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM * val)) {
+ltree_execute(ITEM * curitem, void *checkval, bool calcnot, bool (*chkcond) (void *checkval, ITEM * val)) {
 	if (curitem->type == VAL)
 		return (*chkcond) (checkval, curitem);
 	else if (curitem->val == (int4) '!') {
 		return (calcnot) ?
-			((execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
+			((ltree_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
 			: true;
 	} else if (curitem->val == (int4) '&') {
-		if (execute(curitem + curitem->left, checkval, calcnot, chkcond))   
-			return execute(curitem + 1, checkval, calcnot, chkcond);
+		if (ltree_execute(curitem + curitem->left, checkval, calcnot, chkcond))   
+			return ltree_execute(curitem + 1, checkval, calcnot, chkcond);
 		else
 			return false;
 	} else   {						       /* |-operator */
-		if (execute(curitem + curitem->left, checkval, calcnot, chkcond))
+		if (ltree_execute(curitem + curitem->left, checkval, calcnot, chkcond))
 			return true;
 		else
-			return execute(curitem + 1, checkval, calcnot, chkcond);
+			return ltree_execute(curitem + 1, checkval, calcnot, chkcond);
 	}
 	return false;
 }
@@ -76,7 +76,7 @@ ltxtq_exec(PG_FUNCTION_ARGS) {
 	chkval.node = val;
 	chkval.operand = GETOPERAND(query);
 
-	result = execute(
+	result = ltree_execute(
 		GETQUERY(query),
 		&chkval,
 		true,