X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsprox.c;h=8276e83f2d3a6e5bc1d99097e75baa90a833aa08;hb=fcd23b68a84ac461cbea22271f91b7989a767201;hp=0932c9d85989e238b7fc430b64ce810a59235634;hpb=863d336f803da454e03f39ee2225719fed05021e;p=idzebra-moved-to-github.git diff --git a/rset/rsprox.c b/rset/rsprox.c index 0932c9d..8276e83 100644 --- a/rset/rsprox.c +++ b/rset/rsprox.c @@ -1,4 +1,4 @@ -/* $Id: rsprox.c,v 1.9 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsprox.c,v 1.12 2004-08-26 11:11:59 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -32,7 +32,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define RSET_DEBUG 0 #endif -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); @@ -44,10 +43,9 @@ static int r_read (RSFD rfd, void *buf); static int r_write (RSFD rfd, const void *buf); static void r_pos (RSFD rfd, double *current, double *total); -static const struct rset_control control_prox = +static const struct rset_control control = { "prox", - r_create, r_open, r_close, r_delete, @@ -58,12 +56,21 @@ static const struct rset_control control_prox = r_write, }; -const struct rset_control *rset_kind_prox = &control_prox; +const struct rset_control *rset_kind_prox = &control; struct rset_prox_info { - struct rset_prox_parms p; - +/* struct rset_prox_parms p; */ + RSET *rset; + int rset_no; + int ordered; + int exclusion; + int relation; + int distance; + int key_size; + int (*cmp)(const void *p1, const void *p2); + int (*getseq)(const void *p); struct rset_prox_rfd *rfd_list; + struct rset_prox_rfd *free_list; }; struct rset_prox_rfd { @@ -75,61 +82,49 @@ struct rset_prox_rfd { zint hits; }; -static void *r_create (RSET ct, const struct rset_control *sel, void *parms) + +RSET rsprox_create( NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + int (*getseq)(const void *p), + int rset_no, RSET *rset, + int ordered, int exclusion, + int relation, int distance) { - rset_prox_parms *prox_parms = (rset_prox_parms *) parms; + RSET rnew=rset_create_base(&control, nmem); struct rset_prox_info *info; - int i; - /* - char prox_term[512]; - int length_prox_term = 0; - zint min_nn = 10000000; - const char *flags = NULL; - int term_type = 0; -*/ - - info = (struct rset_prox_info *) xmalloc (sizeof(*info)); - memcpy(&info->p, prox_parms, sizeof(struct rset_prox_parms)); - assert(info->p.rset_no >= 2); - info->p.rset = xmalloc(info->p.rset_no * sizeof(*info->p.rset)); - memcpy(info->p.rset, prox_parms->rset, - info->p.rset_no * sizeof(*info->p.rset)); + info = (struct rset_prox_info *) nmem_malloc(rnew->nmem,sizeof(*info)); + info->key_size = key_size; + info->cmp = cmp; + info->getseq=getseq; /* FIXME - what about multi-level stuff ?? */ + info->rset = nmem_malloc(rnew->nmem,rset_no * sizeof(*info->rset)); + memcpy(info->rset, rset, + rset_no * sizeof(*info->rset)); + info->rset_no=rset_no; + info->ordered=ordered; + info->exclusion=exclusion; + info->relation=relation; + info->distance=distance; info->rfd_list = NULL; + info->free_list = NULL; + rnew->priv=info; + return rnew; +} - for (i = 0; ip.rset_no; i++) - if (rset_is_volatile(info->p.rset[i])) - ct->flags |= RSET_FLAG_VOLATILE; -#if 0 /* This should all be about terms! */ - *prox_term = '\0'; - for (i = 0; ip.rset_no; i++) - { - int j; - for (j = 0; j < info->p.rset[i]->no_rset_terms; j++) - { - const char *nflags = info->p.rset[i]->rset_terms[j]->flags; - char *term = info->p.rset[i]->rset_terms[j]->name; - int lterm = strlen(term); - if (lterm + length_prox_term < sizeof(prox_term)-1) - { - if (length_prox_term) - prox_term[length_prox_term++] = ' '; - strcpy (prox_term + length_prox_term, term); - length_prox_term += lterm; - } - if (min_nn > info->p.rset[i]->rset_terms[j]->nn) - min_nn = info->p.rset[i]->rset_terms[j]->nn; - flags = nflags; - term_type = info->p.rset[i]->rset_terms[j]->type; - } - } -#endif - return info; +static void r_delete (RSET ct) +{ + struct rset_prox_info *info = (struct rset_prox_info *) ct->priv; + int i; + + assert (info->rfd_list == NULL); + for (i = 0; irset_no; i++) + rset_delete (info->rset[i]); } + static RSFD r_open (RSET ct, int flag) { - struct rset_prox_info *info = (struct rset_prox_info *) ct->buf; + struct rset_prox_info *info = (struct rset_prox_info *) ct->priv; struct rset_prox_rfd *rfd; int i; @@ -138,25 +133,28 @@ static RSFD r_open (RSET ct, int flag) logf (LOG_FATAL, "prox set type is read-only"); return NULL; } - rfd = (struct rset_prox_rfd *) xmalloc (sizeof(*rfd)); + rfd = info->free_list; + if (rfd) + info->free_list=rfd->next; + else { + rfd = (struct rset_prox_rfd *) xmalloc (sizeof(*rfd)); + rfd->more = nmem_malloc (ct->nmem,sizeof(*rfd->more) * info->rset_no); + rfd->buf = nmem_malloc(ct->nmem,sizeof(*rfd->buf) * info->rset_no); + for (i = 0; i < info->rset_no; i++) + rfd->buf[i] = nmem_malloc(ct->nmem,info->key_size); + rfd->rfd = nmem_malloc(ct->nmem,sizeof(*rfd->rfd) * info->rset_no); + } logf(LOG_DEBUG,"rsprox (%s) open [%p]", ct->control->desc, rfd); rfd->next = info->rfd_list; info->rfd_list = rfd; rfd->info = info; - rfd->more = xmalloc (sizeof(*rfd->more) * info->p.rset_no); - - rfd->buf = xmalloc(sizeof(*rfd->buf) * info->p.rset_no); - for (i = 0; i < info->p.rset_no; i++) - rfd->buf[i] = xmalloc (info->p.key_size); - rfd->rfd = xmalloc(sizeof(*rfd->rfd) * info->p.rset_no); - for (i = 0; i < info->p.rset_no; i++) - rfd->rfd[i] = rset_open (info->p.rset[i], RSETF_READ); - - for (i = 0; i < info->p.rset_no; i++) - rfd->more[i] = rset_read (info->p.rset[i], rfd->rfd[i], + for (i = 0; i < info->rset_no; i++) { + rfd->rfd[i] = rset_open (info->rset[i], RSETF_READ); + rfd->more[i] = rset_read (info->rset[i], rfd->rfd[i], rfd->buf[i]); + } rfd->hits=0; return rfd; } @@ -170,35 +168,18 @@ static void r_close (RSFD rfd) if (*rfdp == rfd) { int i; - for (i = 0; ip.rset_no; i++) - xfree ((*rfdp)->buf[i]); - xfree ((*rfdp)->buf); - xfree ((*rfdp)->more); - - for (i = 0; ip.rset_no; i++) - rset_close (info->p.rset[i], (*rfdp)->rfd[i]); - xfree ((*rfdp)->rfd); - + struct rset_prox_rfd *rfd_tmp=*rfdp; + for (i = 0; irset_no; i++) + rset_close (info->rset[i], (*rfdp)->rfd[i]); *rfdp = (*rfdp)->next; - xfree (rfd); + rfd_tmp->next=info->free_list; + info->free_list=rfd_tmp; return; } logf (LOG_FATAL, "r_close but no rfd match!"); assert (0); } -static void r_delete (RSET ct) -{ - struct rset_prox_info *info = (struct rset_prox_info *) ct->buf; - int i; - - assert (info->rfd_list == NULL); - for (i = 0; ip.rset_no; i++) - rset_delete (info->p.rset[i]); - xfree (info->p.rset); - xfree (info); -} - static void r_rewind (RSFD rfd) { struct rset_prox_info *info = ((struct rset_prox_rfd*)rfd)->info; @@ -207,10 +188,10 @@ static void r_rewind (RSFD rfd) logf (LOG_DEBUG, "rsprox_rewind"); - for (i = 0; i < info->p.rset_no; i++) + for (i = 0; i < info->rset_no; i++) { - rset_rewind (info->p.rset[i], p->rfd[i]); - p->more[i] = rset_read (info->p.rset[i], p->rfd[i], p->buf[i]); + rset_rewind (info->rset[i], p->rfd[i]); + p->more[i] = rset_read (info->rset[i], p->rfd[i], p->buf[i]); } p->hits=0; } @@ -230,126 +211,126 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, /* it's enough to forward first one. Other will follow automatically */ if ( p->more[0] && ((cmpfunc)(untilbuf, p->buf[0]) >= 2) ) - p->more[0] = rset_forward(info->p.rset[0], p->rfd[0], - p->buf[0], info->p.cmp, + p->more[0] = rset_forward(info->rset[0], p->rfd[0], + p->buf[0], info->cmp, untilbuf); } - if (info->p.ordered && info->p.relation == 3 && info->p.exclusion == 0 - && info->p.distance == 1) + if (info->ordered && info->relation == 3 && info->exclusion == 0 + && info->distance == 1) { while (p->more[0]) { - for (i = 1; i < info->p.rset_no; i++) + for (i = 1; i < info->rset_no; i++) { if (!p->more[i]) { p->more[0] = 0; /* saves us a goto out of while loop. */ break; } - cmp = (*info->p.cmp) (p->buf[i], p->buf[i-1]); + cmp = (*info->cmp) (p->buf[i], p->buf[i-1]); if (cmp > 1) { - p->more[i-1] = rset_forward (info->p.rset[i-1], + p->more[i-1] = rset_forward (info->rset[i-1], p->rfd[i-1], p->buf[i-1], - info->p.cmp, + info->cmp, p->buf[i]); break; } else if (cmp == 1) { - if ((*info->p.getseq)(p->buf[i-1]) +1 != - (*info->p.getseq)(p->buf[i])) + if ((*info->getseq)(p->buf[i-1]) +1 != + (*info->getseq)(p->buf[i])) { - p->more[i-1] = rset_read ( info->p.rset[i-1], + p->more[i-1] = rset_read ( info->rset[i-1], p->rfd[i-1], p->buf[i-1]); break; } } else { - p->more[i] = rset_forward (info->p.rset[i], p->rfd[i], - p->buf[i], info->p.cmp, + p->more[i] = rset_forward (info->rset[i], p->rfd[i], + p->buf[i], info->cmp, p->buf[i-1]); break; } } - if (i == p->info->p.rset_no) + if (i == p->info->rset_no) { - memcpy (buf, p->buf[0], info->p.key_size); - p->more[0] = rset_read (info->p.rset[0], p->rfd[0], p->buf[0]); + memcpy (buf, p->buf[0], info->key_size); + p->more[0] = rset_read (info->rset[0], p->rfd[0], p->buf[0]); p->hits++; return 1; } } } - else if (info->p.rset_no == 2) + else if (info->rset_no == 2) { while (p->more[0] && p->more[1]) { - int cmp = (*info->p.cmp)(p->buf[0], p->buf[1]); + int cmp = (*info->cmp)(p->buf[0], p->buf[1]); if (cmp < -1) - p->more[0] = rset_forward (info->p.rset[0], p->rfd[0], - p->buf[0], info->p.cmp, p->buf[0]); + p->more[0] = rset_forward (info->rset[0], p->rfd[0], + p->buf[0], info->cmp, p->buf[0]); else if (cmp > 1) - p->more[1] = rset_forward (info->p.rset[1], p->rfd[1], - p->buf[1], info->p.cmp, p->buf[1]); + p->more[1] = rset_forward (info->rset[1], p->rfd[1], + p->buf[1], info->cmp, p->buf[1]); else { int seqno[500]; int n = 0; - seqno[n++] = (*info->p.getseq)(p->buf[0]); - while ((p->more[0] = rset_read (info->p.rset[0], p->rfd[0], + seqno[n++] = (*info->getseq)(p->buf[0]); + while ((p->more[0] = rset_read (info->rset[0], p->rfd[0], p->buf[0])) >= -1 && p->more[0] <= -1) if (n < 500) - seqno[n++] = (*info->p.getseq)(p->buf[0]); + seqno[n++] = (*info->getseq)(p->buf[0]); for (i = 0; ip.getseq)(p->buf[1]) - seqno[i]; - int excl = info->p.exclusion; - if (!info->p.ordered && diff < 0) + int diff = (*info->getseq)(p->buf[1]) - seqno[i]; + int excl = info->exclusion; + if (!info->ordered && diff < 0) diff = -diff; - switch (info->p.relation) + switch (info->relation) { case 1: /* < */ - if (diff < info->p.distance && diff >= 0) + if (diff < info->distance && diff >= 0) excl = !excl; break; case 2: /* <= */ - if (diff <= info->p.distance && diff >= 0) + if (diff <= info->distance && diff >= 0) excl = !excl; break; case 3: /* == */ - if (diff == info->p.distance && diff >= 0) + if (diff == info->distance && diff >= 0) excl = !excl; break; case 4: /* >= */ - if (diff >= info->p.distance && diff >= 0) + if (diff >= info->distance && diff >= 0) excl = !excl; break; case 5: /* > */ - if (diff > info->p.distance && diff >= 0) + if (diff > info->distance && diff >= 0) excl = !excl; break; case 6: /* != */ - if (diff != info->p.distance && diff >= 0) + if (diff != info->distance && diff >= 0) excl = !excl; break; } if (excl) { - memcpy (buf, p->buf[1], info->p.key_size); + memcpy (buf, p->buf[1], info->key_size); - p->more[1] = rset_read (info->p.rset[1], + p->more[1] = rset_read (info->rset[1], p->rfd[1], p->buf[1]); p->hits++; return 1; } } - p->more[1] = rset_read (info->p.rset[1], p->rfd[1], + p->more[1] = rset_read (info->rset[1], p->rfd[1], p->buf[1]); } } @@ -381,9 +362,9 @@ static void r_pos (RSFD rfd, double *current, double *total) logf (LOG_DEBUG, "rsprox_pos"); - for (i = 0; i < info->p.rset_no; i++) + for (i = 0; i < info->rset_no; i++) { - rset_pos(info->p.rset[i], p->rfd[i], &cur, &tot); + rset_pos(info->rset[i], p->rfd[i], &cur, &tot); if (tot>0) { scur += cur; stot += tot;