diff options
author | Teodor Sigaev | 2006-08-08 15:46:31 +0000 |
---|---|---|
committer | Teodor Sigaev | 2006-08-08 15:46:31 +0000 |
commit | 137c8703eb3069f6ce2ad2760e1a5faef6f5e00a (patch) | |
tree | f0c4dbe7f18166ac39d06b21e14c6a1dc4ad7a66 | |
parent | 9e817fa333961ace720b10c5379f5e9e72a10400 (diff) |
Fix bug introduced by last patch, thanks again to Mario Weilguni <[email protected]>
-rw-r--r-- | contrib/ltree/ltree_gist.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c index 039e8f6311..11f8d0d0db 100644 --- a/contrib/ltree/ltree_gist.c +++ b/contrib/ltree/ltree_gist.c @@ -456,16 +456,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 |