diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2006-08-24 17:37:34 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2006-08-24 17:37:34 +0000 |
| commit | 8f91e2b6071aaeae333f668d0f5d9189c5710a7a (patch) | |
| tree | 28c6b8af7cf491c38d2c61da4d38c70ff789cc25 | |
| parent | 726ede7370b91a01432010f503e262f68370fc2b (diff) | |
| download | postgresql-8f91e2b6071aaeae333f668d0f5d9189c5710a7a.tar.gz postgresql-8f91e2b6071aaeae333f668d0f5d9189c5710a7a.zip | |
Fix compare bug for tsvector: problem was in aligment. Per Stefan Kaltenbrunner <stefan@kaltenbrunner.cc> and Phil Frost <indigo@bitglue.com>
| -rw-r--r-- | contrib/tsearch2/tsvector.c | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c index 4999b30d785..a52da49f0c9 100644 --- a/contrib/tsearch2/tsvector.c +++ b/contrib/tsearch2/tsvector.c @@ -966,17 +966,43 @@ silly_cmp_tsvector(const tsvector * a, const tsvector * b) return 1; else { - unsigned char *aptr = (unsigned char *) (a->data) + DATAHDRSIZE; - unsigned char *bptr = (unsigned char *) (b->data) + DATAHDRSIZE; + WordEntry *aptr = ARRPTR(a); + WordEntry *bptr = ARRPTR(b); + int i = 0; + int res; + + + for(i=0;i<a->size;i++) { + if ( aptr->haspos != bptr->haspos ) { + return ( aptr->haspos > bptr->haspos ) ? -1 : 1; + } else if ( aptr->pos != bptr->pos ) { + return ( aptr->pos > bptr->pos ) ? -1 : 1; + } else if ( aptr->len != bptr->len ) { + return ( aptr->len > bptr->len ) ? -1 : 1; + } else if ( (res=strncmp(STRPTR(a) + aptr->pos, STRPTR(b) + bptr->pos, b->len))!= 0 ) { + return res; + } else if ( aptr->haspos ) { + WordEntryPos *ap = POSDATAPTR(a, aptr); + WordEntryPos *bp = POSDATAPTR(b, bptr); + int j; + + if ( POSDATALEN(a, aptr) != POSDATALEN(b, bptr) ) + return ( POSDATALEN(a, aptr) > POSDATALEN(b, bptr) ) ? -1 : 1; + + for(j=0;j<POSDATALEN(a, aptr);j++) { + if ( WEP_GETPOS(*ap) != WEP_GETPOS(*bp) ) { + return ( WEP_GETPOS(*ap) > WEP_GETPOS(*bp) ) ? -1 : 1; + } else if ( WEP_GETWEIGHT(*ap) != WEP_GETWEIGHT(*bp) ) { + return ( WEP_GETWEIGHT(*ap) > WEP_GETWEIGHT(*bp) ) ? -1 : 1; + } + ap++, bp++; + } + } - while (aptr - ((unsigned char *) (a->data)) < a->len) - { - if (*aptr != *bptr) - return (*aptr < *bptr) ? -1 : 1; - aptr++; - bptr++; + aptr++; bptr++; } } + return 0; } |