summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeodor Sigaev2006-08-08 15:46:31 +0000
committerTeodor Sigaev2006-08-08 15:46:31 +0000
commit2b3d2717c4c3bc8e8a6656fbb614dde82f6265fd (patch)
treedc0765cd5147555986831e471ff43e6ad5282ace
parent3da93a0a3bac0085534825e115772804b4ad098c (diff)
Fix bug introduced by last patch, thanks again to Mario Weilguni <[email protected]>
-rw-r--r--contrib/ltree/ltree_gist.c30
1 files changed, 25 insertions, 5 deletions
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 1914d8a49b4..f33b74ad33a 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -454,16 +454,36 @@ gist_isparent(ltree_gist * key, ltree * query)
return false;
}
+static ltree *
+copy_ltree( ltree *src ) {
+ ltree *dst = (ltree*)palloc(src->len);
+ memcpy(dst, src, src->len);
+ return dst;
+}
+
static bool
gist_ischild(ltree_gist * key, ltree * query)
{
- if (ltree_compare(query, LTG_GETLNODE(key)) < 0)
- return false;
+ ltree *left = copy_ltree(LTG_GETLNODE(key));
+ ltree *right = copy_ltree(LTG_GETRNODE(key));
+ bool res = true;
- if (ltree_compare(query, LTG_GETRNODE(key)) > 0)
- return false;
+ if (left->numlevel > query->numlevel)
+ left->numlevel = query->numlevel;
- return true;
+ if (ltree_compare(query, left) < 0)
+ res = false;
+
+ if (right->numlevel > query->numlevel)
+ right->numlevel = query->numlevel;
+
+ if (res && ltree_compare(query, right) > 0)
+ res = false;
+
+ pfree(left);
+ pfree(right);
+
+ return res;
}
static bool