|
1 | 1 | /* |
2 | 2 | * GiST support for ltree |
3 | 3 | * Teodor Sigaev <teodor@stack.net> |
4 | | - * $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.16 2006/07/11 16:00:44 teodor Exp $ |
| 4 | + * $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.17 2006/08/07 17:39:04 teodor Exp $ |
5 | 5 | */ |
6 | 6 |
|
7 | 7 | #include"ltree.h" |
@@ -459,27 +459,13 @@ gist_isparent(ltree_gist * key, ltree * query) |
459 | 459 | staticbool |
460 | 460 | gist_ischild(ltree_gist*key,ltree*query) |
461 | 461 | { |
462 | | -ltree*left=LTG_GETLNODE(key); |
463 | | -ltree*right=LTG_GETRNODE(key); |
464 | | -int4numlevelL=left->numlevel; |
465 | | -int4numlevelR=right->numlevel; |
466 | | -boolres= true; |
| 462 | +if (ltree_compare(query,LTG_GETLNODE(key))<0) |
| 463 | +return false; |
467 | 464 |
|
468 | | -if (numlevelL>query->numlevel) |
469 | | -left->numlevel=query->numlevel; |
| 465 | +if (ltree_compare(query,LTG_GETRNODE(key))>0) |
| 466 | +return false; |
470 | 467 |
|
471 | | -if (ltree_compare(query,left)<0) |
472 | | -res= false; |
473 | | - |
474 | | -if (numlevelR>query->numlevel) |
475 | | -right->numlevel=query->numlevel; |
476 | | - |
477 | | -if (res&<ree_compare(query,right)>0) |
478 | | -res= false; |
479 | | - |
480 | | -left->numlevel=numlevelL; |
481 | | -right->numlevel=numlevelR; |
482 | | -returnres; |
| 468 | +return true; |
483 | 469 | } |
484 | 470 |
|
485 | 471 | staticbool |
@@ -547,36 +533,22 @@ gist_tqcmp(ltree * t, lquery * q) |
547 | 533 | ql=LQL_NEXT(ql); |
548 | 534 | } |
549 | 535 |
|
550 | | -returnt->numlevel-q->firstgood; |
| 536 | +returnMin(t->numlevel,q->firstgood)-q->firstgood; |
551 | 537 | } |
552 | 538 |
|
553 | 539 | staticbool |
554 | 540 | gist_between(ltree_gist*key,lquery*query) |
555 | 541 | { |
556 | | -ltree*left=LTG_GETLNODE(key); |
557 | | -ltree*right=LTG_GETRNODE(key); |
558 | | -int4numlevelL=left->numlevel; |
559 | | -int4numlevelR=right->numlevel; |
560 | | -boolres= true; |
561 | | - |
562 | 542 | if (query->firstgood==0) |
563 | 543 | return true; |
564 | 544 |
|
565 | | -if (numlevelL>query->firstgood) |
566 | | -left->numlevel=query->firstgood; |
| 545 | +if (gist_tqcmp(LTG_GETLNODE(key),query)>0) |
| 546 | +return false; |
567 | 547 |
|
568 | | -if (gist_tqcmp(left,query)>0) |
569 | | -res= false; |
| 548 | +if (gist_tqcmp(LTG_GETRNODE(key),query)<0) |
| 549 | +return false; |
570 | 550 |
|
571 | | -if (numlevelR>query->firstgood) |
572 | | -right->numlevel=query->firstgood; |
573 | | - |
574 | | -if (res&&gist_tqcmp(right,query)<0) |
575 | | -res= false; |
576 | | - |
577 | | -left->numlevel=numlevelL; |
578 | | -right->numlevel=numlevelR; |
579 | | -returnres; |
| 551 | +return true; |
580 | 552 | } |
581 | 553 |
|
582 | 554 | staticbool |
@@ -675,7 +647,7 @@ ltree_consistent(PG_FUNCTION_ARGS) |
675 | 647 | gist_isparent(key, (ltree*)query); |
676 | 648 | break; |
677 | 649 | case11: |
678 | | -query=PG_GETARG_LTREE_COPY(1); |
| 650 | +query=PG_GETARG_LTREE(1); |
679 | 651 | res= (GIST_LEAF(entry)) ? |
680 | 652 | inner_isparent(LTG_NODE(key), (ltree*)query) |
681 | 653 | : |
|