X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=2683029e8b15161a181a09d972c17e78ab3dcd41;hb=392b67432545d96cb2f9b3264a9427582fc1934f;hp=e8b004733acc4f40a7c5c3efa380170272cbe5fd;hpb=5d20c4e9f612a012313370c82dc8481b9f19d5df;p=idzebra-moved-to-github.git diff --git a/rset/rsm_or.c b/rset/rsm_or.c index e8b0047..2683029 100644 --- a/rset/rsm_or.c +++ b/rset/rsm_or.c @@ -1,35 +1,56 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rsm_or.c,v $ - * Revision 1.1 1996-12-20 11:07:21 adam + * Revision 1.7 1998-09-22 10:03:46 adam + * Changed result sets to be persistent in the sense that they can + * be re-searched if needed. + * Fixed memory leak in rsm_or. + * + * Revision 1.6 1998/03/05 08:36:28 adam + * New result set model. + * + * Revision 1.5 1997/12/18 10:54:25 adam + * New method result set method rs_hits that returns the number of + * hits in result-set (if known). The ranked result set returns real + * number of hits but only when not combined with other operands. + * + * Revision 1.4 1997/10/31 12:37:55 adam + * Code calls xfree() instead of free(). + * + * Revision 1.3 1997/09/09 13:38:16 adam + * Partial port to WIN95/NT. + * + * Revision 1.2 1996/12/23 15:30:49 adam + * Work on truncation. + * + * Revision 1.1 1996/12/20 11:07:21 adam * Implemented Multi-or result set. * */ +#include #include #include -#include +#include #include #include #include #include -static void *r_create(const struct rset_control *sel, void *parms, - int *flags); +static void *r_create(RSET ct, const struct rset_control *sel, void *parms); static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); static void r_delete (RSET ct); static void r_rewind (RSFD rfd); static int r_count (RSET ct); -static int r_read (RSFD rfd, void *buf); +static int r_read (RSFD rfd, void *buf, int *term_index); static int r_write (RSFD rfd, const void *buf); -static int r_score (RSFD rfd, int *score); -static const rset_control control = +static const struct rset_control control = { "multi-or", r_create, @@ -40,10 +61,9 @@ static const rset_control control = r_count, r_read, r_write, - r_score }; -const rset_control *rset_kind_m_or = &control; +const struct rset_control *rset_kind_m_or = &control; struct rset_mor_info { int key_size; @@ -53,6 +73,7 @@ struct rset_mor_info { ISAM_P *isam_positions; int no_isam_positions; + int no_save_positions; struct rset_mor_rfd *rfd_list; }; @@ -70,6 +91,8 @@ struct trunc_info { struct rset_mor_rfd { int flag; + int position; + int position_max; ISAMC_PP *ispt; struct rset_mor_rfd *next; struct rset_mor_info *info; @@ -159,18 +182,18 @@ static void heap_close (struct trunc_info *ti) xfree (ti); } - -static void *r_create (const struct rset_control *sel, void *parms, - int *flags) +static void *r_create (RSET ct, const struct rset_control *sel, void *parms) { rset_m_or_parms *r_parms = parms; struct rset_mor_info *info; - *flags |= RSET_FLAG_VOLATILE; + ct->flags |= RSET_FLAG_VOLATILE; info = xmalloc (sizeof(*info)); info->key_size = r_parms->key_size; assert (info->key_size > 1); info->cmp = r_parms->cmp; + + info->no_save_positions = r_parms->no_save_positions; info->isc = r_parms->isc; info->no_isam_positions = r_parms->no_isam_positions; @@ -180,6 +203,9 @@ static void *r_create (const struct rset_control *sel, void *parms, sizeof(*info->isam_positions) * info->no_isam_positions); info->rfd_list = NULL; + ct->no_rset_terms = 1; + ct->rset_terms = xmalloc (sizeof(*ct->rset_terms)); + ct->rset_terms[0] = r_parms->rset_term; return info; } @@ -204,9 +230,13 @@ static RSFD r_open (RSET ct, int flag) rfd->ti = heap_init (info->no_isam_positions, info->key_size, info->cmp); + ct->rset_terms[0]->nn = 0; for (i = 0; ino_isam_positions; i++) { rfd->ispt[i] = isc_pp_open (info->isc, info->isam_positions[i]); + + ct->rset_terms[0]->nn += isc_pp_num (rfd->ispt[i]); + if (isc_pp_read (rfd->ispt[i], rfd->ti->tmpbuf)) heap_insert (rfd->ti, rfd->ti->tmpbuf, i); else @@ -215,6 +245,7 @@ static RSFD r_open (RSET ct, int flag) rfd->ispt[i] = NULL; } } + rfd->position = info->no_save_positions; r_rewind (rfd); return rfd; } @@ -234,8 +265,8 @@ static void r_close (RSFD rfd) for (i = 0; ino_isam_positions; i++) if (((struct rset_mor_rfd *) rfd)->ispt[i]) isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[i]); - free (((struct rset_mor_rfd *)rfd)->ispt); - free (rfd); + xfree (((struct rset_mor_rfd *)rfd)->ispt); + xfree (rfd); return; } logf (LOG_FATAL, "r_close but no rfd match!"); @@ -245,9 +276,15 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { struct rset_mor_info *info = ct->buf; + int i; assert (info->rfd_list == NULL); xfree (info->isam_positions); + + for (i = 0; ino_rset_terms; i++) + rset_term_destroy (ct->rset_terms[i]); + xfree (ct->rset_terms); + xfree (info); } @@ -260,31 +297,45 @@ static int r_count (RSET ct) return 0; } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, int *term_index) { struct trunc_info *ti = ((struct rset_mor_rfd *) rfd)->ti; int n = ti->indx[ti->ptr[1]]; if (!ti->heapnum) return 0; + *term_index = 0; memcpy (buf, ti->heap[ti->ptr[1]], ti->keysize); - heap_delete (ti); - if (isc_pp_read (((struct rset_mor_rfd *) rfd)->ispt[n], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, n); - else + if (((struct rset_mor_rfd *) rfd)->position) { - isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[n]); - ((struct rset_mor_rfd*) rfd)->ispt[n] = NULL; + if (isc_pp_read (((struct rset_mor_rfd *) rfd)->ispt[n], ti->tmpbuf)) + { + heap_delete (ti); + if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) + ((struct rset_mor_rfd *) rfd)->position--; + heap_insert (ti, ti->tmpbuf, n); + } + else + heap_delete (ti); + return 1; + } + while (1) + { + if (!isc_pp_read (((struct rset_mor_rfd *) rfd)->ispt[n], ti->tmpbuf)) + { + heap_delete (ti); + break; + } + if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) + { + heap_delete (ti); + heap_insert (ti, ti->tmpbuf, n); + break; + } } return 1; } -static int r_score (RSFD rfd, int *score) -{ - *score = -1; - return -1; -} - static int r_write (RSFD rfd, const void *buf) { logf (LOG_FATAL, "mor set type is read-only");