postgres.git / summary / log / commit / refs
commit 8f0b1d044ce30ae8563308d867b21fb8e27324cf
Author: Teodor Sigaev <teodor@sigaev.ru>
Date: Mon Aug 07 17:42:12 2006 +0000
First released in: 8.2.0, 7.3.16, 7.4.14, 8.0.9, 8.1.5
fix bug about modifying value in shared buffer,
what was a reason to corrupt index.
Thank to Mario Weilguni <mweilguni@sime.com> to
discover a bug.
contrib/ltree/ltree_gist.c | 52 +++++++++++-----------------------------------
1 file changed, 12 insertions(+), 40 deletions(-)
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 0b0ad959893..2f9e989729b 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -463,27 +463,13 @@ gist_isparent(ltree_gist * key, ltree * query)
static bool
gist_ischild(ltree_gist * key, ltree * query)
{
- ltree *left = LTG_GETLNODE(key);
- ltree *right = LTG_GETRNODE(key);
- int4 numlevelL = left->numlevel;
- int4 numlevelR = right->numlevel;
- bool res = true;
+ if (ltree_compare(query, LTG_GETLNODE(key)) < 0)
+ return false;
- if (numlevelL > query->numlevel)
- left->numlevel = query->numlevel;
+ if (ltree_compare(query, LTG_GETRNODE(key)) > 0)
+ return false;
- if (ltree_compare(query, left) < 0)
- res = false;
-
- if (numlevelR > query->numlevel)
- right->numlevel = query->numlevel;
-
- if (res && ltree_compare(query, right) > 0)
- res = false;
-
- left->numlevel = numlevelL;
- right->numlevel = numlevelR;
- return res;
+ return true;
}
static bool
@@ -551,36 +537,22 @@ gist_tqcmp(ltree * t, lquery * q)
ql = LQL_NEXT(ql);
}
- return t->numlevel - q->firstgood;
+ return Min(t->numlevel, q->firstgood) - q->firstgood;
}
static bool
gist_between(ltree_gist * key, lquery * query)
{
- ltree *left = LTG_GETLNODE(key);
- ltree *right = LTG_GETRNODE(key);
- int4 numlevelL = left->numlevel;
- int4 numlevelR = right->numlevel;
- bool res = true;
-
if (query->firstgood == 0)
return true;
- if (numlevelL > query->firstgood)
- left->numlevel = query->firstgood;
+ if (gist_tqcmp(LTG_GETLNODE(key), query) > 0)
+ return false;
- if (gist_tqcmp(left, query) > 0)
- res = false;
+ if (gist_tqcmp(LTG_GETRNODE(key), query) < 0)
+ return false;
- if (numlevelR > query->firstgood)
- right->numlevel = query->firstgood;
-
- if (res && gist_tqcmp(right, query) < 0)
- res = false;
-
- left->numlevel = numlevelL;
- right->numlevel = numlevelR;
- return res;
+ return true;
}
static bool
@@ -677,7 +649,7 @@ ltree_consistent(PG_FUNCTION_ARGS)
gist_isparent(key, (ltree *) query);
break;
case 11:
- query = PG_GETARG_LTREE_COPY(1);
+ query = PG_GETARG_LTREE(1);
res = (GIST_LEAF(entry)) ?
inner_isparent(LTG_NODE(key), (ltree *) query)
:
[parent: d7295afe5e38]