X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbool.c;h=59eec018bf8884fae38739ccce45045577c76524;hb=eb1d9cf5bea42ce04747d852d21dde853574fa3f;hp=a20c452e4250ed64c241316ca65a90427759874f;hpb=9d7f0678da8e15bfc9b04a21aad15656b8cc65f2;p=idzebra-moved-to-github.git diff --git a/rset/rsbool.c b/rset/rsbool.c index a20c452..59eec01 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,148 +1,216 @@ -/* - * Copyright (C) 1994-1995, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsbool.c,v $ - * Revision 1.4 1995-09-08 08:54:04 adam - * More efficient and operation. - * - * Revision 1.3 1995/09/07 13:58:43 adam - * New parameter: result-set file descriptor (RSFD) to support multiple - * positions within the same result-set. - * Boolean operators: and, or, not implemented. - * - * Revision 1.2 1995/09/06 16:11:55 adam - * More work on boolean sets. - * - * Revision 1.1 1995/09/06 13:27:15 adam - * New set type: bool. Not finished yet. - * - */ +/* $Id: rsbool.c,v 1.41 2004-08-24 15:00:16 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ #include +#include +#include #include +#include +#include #include -#include -static rset_control *r_create(const struct rset_control *sel, void *parms); -static RSFD r_open (rset_control *ct, int wflag); +#ifndef RSET_DEBUG +#define RSET_DEBUG 0 +#endif + +static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); -static void r_delete (rset_control *ct); +static void r_delete (RSET ct); static void r_rewind (RSFD rfd); -static int r_count (rset_control *ct); +static int r_forward(RSET ct, RSFD rfd, void *buf, + int (*cmpfunc)(const void *p1, const void *p2), + const void *untilbuf); +static void r_pos (RSFD rfd, double *current, double *total); static int r_read_and (RSFD rfd, void *buf); static int r_read_or (RSFD rfd, void *buf); static int r_read_not (RSFD rfd, void *buf); static int r_write (RSFD rfd, const void *buf); -static const rset_control control_and = +static const struct rset_control control_and = { - "AND set type", - 0, - r_create, + "and", r_open, r_close, r_delete, r_rewind, - r_count, + r_forward, + r_pos, r_read_and, - r_write + r_write, }; -static const rset_control control_or = +static const struct rset_control control_or = { - "OR set type", - 0, - r_create, + "or", r_open, r_close, r_delete, r_rewind, - r_count, + r_forward, + r_pos, r_read_or, - r_write + r_write, }; -static const rset_control control_not = +static const struct rset_control control_not = { - "NOT set type", - 0, - r_create, + "not", r_open, r_close, r_delete, r_rewind, - r_count, + r_forward, + r_pos, r_read_not, - r_write + r_write, }; -const rset_control *rset_kind_and = &control_and; -const rset_control *rset_kind_or = &control_or; -const rset_control *rset_kind_not = &control_not; +const struct rset_control *rset_kind_and = &control_and; +const struct rset_control *rset_kind_or = &control_or; +const struct rset_control *rset_kind_not = &control_not; struct rset_bool_info { int key_size; RSET rset_l; RSET rset_r; int (*cmp)(const void *p1, const void *p2); + void (*log_item)(int logmask, const void *p, const char *txt); struct rset_bool_rfd *rfd_list; }; struct rset_bool_rfd { + zint hits; RSFD rfd_l; RSFD rfd_r; int more_l; int more_r; void *buf_l; void *buf_r; + int tail; struct rset_bool_rfd *next; struct rset_bool_info *info; }; -static rset_control *r_create (const struct rset_control *sel, void *parms) +static RSET rsbool_create_base( const struct rset_control *ctrl, + NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + RSET rset_l, RSET rset_r, + void (*log_item)(int logmask, const void *p, const char *txt) ) { - rset_control *newct; - rset_bool_parms *bool_parms = parms; + RSET rnew=rset_create_base(ctrl, nmem); struct rset_bool_info *info; + info = (struct rset_bool_info *) nmem_malloc(rnew->nmem,sizeof(*info)); + info->key_size = key_size; + info->rset_l = rset_l; + info->rset_r = rset_r; + info->cmp = cmp; + info->log_item = log_item; + info->rfd_list = NULL; + + rnew->priv=info; + return rnew; +} + + +RSET rsbool_create_and( NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + RSET rset_l, RSET rset_r, + void (*log_item)(int logmask, const void *p, const char *txt) ) +{ + return rsbool_create_base(rset_kind_and, nmem, key_size, cmp, + rset_l, rset_r, log_item); +} + +RSET rsbool_create_or( NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + RSET rset_l, RSET rset_r, + void (*log_item)(int logmask, const void *p, const char *txt) ) +{ + return rsbool_create_base(rset_kind_or, nmem, key_size, cmp, + rset_l, rset_r, log_item); +} + +RSET rsbool_create_not( NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + RSET rset_l, RSET rset_r, + void (*log_item)(int logmask, const void *p, const char *txt) ) +{ + return rsbool_create_base(rset_kind_not, nmem, key_size, cmp, + rset_l, rset_r, log_item); +} - logf (LOG_DEBUG, "rsbool_create(%s)", sel->desc); - newct = xmalloc(sizeof(*newct)); - memcpy (newct, sel, sizeof(*sel)); - newct->buf = xmalloc (sizeof(struct rset_bool_info)); - info = (struct rset_bool_info*) newct->buf; +static void r_delete (RSET ct) +{ + struct rset_bool_info *info = (struct rset_bool_info *) ct->priv; + + assert (info->rfd_list == NULL); + rset_delete (info->rset_l); + rset_delete (info->rset_r); +} + +#if 0 +static void *r_create (RSET ct, const struct rset_control *sel, void *parms) +{ + rset_bool_parms *bool_parms = (rset_bool_parms *) parms; + struct rset_bool_info *info; + + info = (struct rset_bool_info *) xmalloc (sizeof(*info)); info->key_size = bool_parms->key_size; info->rset_l = bool_parms->rset_l; info->rset_r = bool_parms->rset_r; info->cmp = bool_parms->cmp; + info->log_item = bool_parms->log_item; info->rfd_list = NULL; - return newct; + + return info; } +#endif -static RSFD r_open (rset_control *ct, int wflag) +static RSFD r_open (RSET ct, int flag) { - struct rset_bool_info *info = ct->buf; + struct rset_bool_info *info = (struct rset_bool_info *) ct->priv; struct rset_bool_rfd *rfd; - if (wflag) + if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "bool set type is read-only"); - return NULL; + logf (LOG_FATAL, "bool set type is read-only"); + return NULL; } - rfd = xmalloc (sizeof(*rfd)); + rfd = (struct rset_bool_rfd *) nmem_malloc(ct->nmem, sizeof(*rfd)); + logf(LOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd); rfd->next = info->rfd_list; info->rfd_list = rfd; + rfd->info = info; + rfd->hits=0; - rfd->buf_l = xmalloc (info->key_size); - rfd->buf_r = xmalloc (info->key_size); - rfd->rfd_l = rset_open (info->rset_l, wflag); - rfd->rfd_r = rset_open (info->rset_r, wflag); + rfd->buf_l = nmem_malloc(ct->nmem, info->key_size); + rfd->buf_r = nmem_malloc(ct->nmem, info->key_size); + rfd->rfd_l = rset_open (info->rset_l, RSETF_READ); + rfd->rfd_r = rset_open (info->rset_r, RSETF_READ); rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l); rfd->more_r = rset_read (info->rset_r, rfd->rfd_r, rfd->buf_r); - rfd->info = info; + rfd->tail = 0; return rfd; } @@ -154,84 +222,241 @@ static void r_close (RSFD rfd) for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next) if (*rfdp == rfd) { - xfree ((*rfdp)->buf_l); - xfree ((*rfdp)->buf_r); rset_close (info->rset_l, (*rfdp)->rfd_l); rset_close (info->rset_r, (*rfdp)->rfd_r); *rfdp = (*rfdp)->next; - free (rfd); return; } logf (LOG_FATAL, "r_close but no rfd match!"); assert (0); } -static void r_delete (rset_control *ct) -{ - struct rset_bool_info *info = ct->buf; - - assert (info->rfd_list == NULL); - xfree (info); - xfree (ct); -} static void r_rewind (RSFD rfd) { struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info; - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; logf (LOG_DEBUG, "rsbool_rewind"); rset_rewind (info->rset_l, p->rfd_l); rset_rewind (info->rset_r, p->rfd_r); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); + p->hits=0; } -static int r_count (rset_control *ct) +static int r_forward (RSET ct, RSFD rfd, void *buf, + int (*cmpfunc)(const void *p1, const void *p2), + const void *untilbuf) { - return 0; + struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; + int rc; + +#if RSET_DEBUG + logf (LOG_DEBUG, "rsbool_forward (L) [%p] '%s' (ct=%p rfd=%p m=%d,%d)", + rfd, ct->control->desc, ct, rfd, p->more_l, p->more_r); +#endif + if ( p->more_l && ((cmpfunc)(untilbuf,p->buf_l)==2) ) + p->more_l = rset_forward(info->rset_l, p->rfd_l, p->buf_l, + info->cmp, untilbuf); +#if RSET_DEBUG + logf (LOG_DEBUG, "rsbool_forward (R) [%p] '%s' (ct=%p rfd=%p m=%d,%d)", + rfd, ct->control->desc, ct, rfd, p->more_l, p->more_r); +#endif + if ( p->more_r && ((cmpfunc)(untilbuf,p->buf_r)==2)) + p->more_r = rset_forward(info->rset_r, p->rfd_r, p->buf_r, + info->cmp, untilbuf); +#if RSET_DEBUG + logf (LOG_DEBUG, "rsbool_forward [%p] calling read, m=%d,%d t=%d", + rfd, p->more_l, p->more_r, p->tail); +#endif + + p->tail=0; + rc = rset_read(ct,rfd,buf); +#if RSET_DEBUG + logf (LOG_DEBUG, "rsbool_forward returning [%p] %d m=%d,%d", + rfd, rc, p->more_l, p->more_r); +#endif + return rc; } + +/* + 1,1 1,3 + 1,9 2,1 + 1,11 3,1 + 2,9 + + 1,1 1,1 + 1,3 1,3 + 1,9 + 1,11 + 2,1 2,1 + 2,9 + 3,1 +*/ + static int r_read_and (RSFD rfd, void *buf) { - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; - while (p->more_l && p->more_r) + while (p->more_l || p->more_r) { int cmp; - cmp = (*info->cmp)(p->buf_l, p->buf_r); + if (p->more_l && p->more_r) + cmp = (*info->cmp)(p->buf_l, p->buf_r); + else if (p->more_l) + cmp = -2; + else + cmp = 2; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d", + rfd, p->more_l, p->more_r, cmp, p->tail); + (*info->log_item)(LOG_DEBUG, p->buf_l, "left "); + (*info->log_item)(LOG_DEBUG, p->buf_r, "right "); +#endif if (!cmp) { memcpy (buf, p->buf_l, info->key_size); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); - p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); - return 1; + p->tail = 1; } else if (cmp == 1) { memcpy (buf, p->buf_r, info->key_size); p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); + p->tail = 1; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); + key_logdump(LOG_DEBUG,buf); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; return 1; } else if (cmp == -1) { memcpy (buf, p->buf_l, info->key_size); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); + p->tail = 1; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; return 1; } - else if (cmp > 1) + else if (cmp > 1) /* cmp == 2 */ + { +#define OLDCODE 0 +#if OLDCODE + memcpy (buf, p->buf_r, info->key_size); + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); - else - p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); + if (p->tail) + { + if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1) + p->tail = 0; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and returning C m=%d/%d c=%d", + p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; + return 1; + } +#else + + if (p->tail) + { + memcpy (buf, p->buf_r, info->key_size); + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); + if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1) + p->tail = 0; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; + return 1; + } + else + { +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] about to forward R m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); +#endif + if (p->more_r && p->more_l) + p->more_r = rset_forward( info->rset_r, p->rfd_r, + p->buf_r, (info->cmp), p->buf_l); + else + return 0; /* no point in reading further */ + } +#endif + } + else /* cmp == -2 */ + { +#if OLDCODE + memcpy (buf, p->buf_l, info->key_size); + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); + if (p->tail) + { + if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1) + p->tail = 0; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; + return 1; + } +#else + if (p->tail) + { + memcpy (buf, p->buf_l, info->key_size); + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); + if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1) + p->tail = 0; +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; + return 1; + } + else + { +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] about to forward L m=%d/%d c=%d", + rfd, p->more_l, p->more_r, cmp); +#endif + if (p->more_r && p->more_l) + p->more_l = rset_forward( + info->rset_l, p->rfd_l, + p->buf_l, (info->cmp), p->buf_r); + else + return 0; /* no point in reading further */ + } +#endif + } } +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_and [%p] reached its end",rfd); +#endif return 0; } static int r_read_or (RSFD rfd, void *buf) { - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; while (p->more_l || p->more_r) @@ -249,18 +474,36 @@ static int r_read_or (RSFD rfd, void *buf) memcpy (buf, p->buf_l, info->key_size); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d", + p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; return 1; } else if (cmp > 0) { memcpy (buf, p->buf_r, info->key_size); p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d", + p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; return 1; } else { memcpy (buf, p->buf_l, info->key_size); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); +#if RSET_DEBUG + logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d", + p->more_l, p->more_r, cmp); + (*info->log_item)(LOG_DEBUG, buf, ""); +#endif + p->hits++; return 1; } } @@ -269,7 +512,7 @@ static int r_read_or (RSFD rfd, void *buf) static int r_read_not (RSFD rfd, void *buf) { - struct rset_bool_rfd *p = rfd; + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; struct rset_bool_info *info = p->info; while (p->more_l || p->more_r) @@ -286,15 +529,20 @@ static int r_read_not (RSFD rfd, void *buf) { memcpy (buf, p->buf_l, info->key_size); p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); + p->hits++; return 1; } else if (cmp > 1) - p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r); + { + p->more_r = rset_forward( + info->rset_r, p->rfd_r, + p->buf_r, (info->cmp), p->buf_l); + } else { memcpy (buf, p->buf_l, info->key_size); do - { + { p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l); if (!p->more_l) break; @@ -318,3 +566,34 @@ static int r_write (RSFD rfd, const void *buf) logf (LOG_FATAL, "bool set type is read-only"); return -1; } + +static void r_pos (RSFD rfd, double *current, double *total) +{ + struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd; + struct rset_bool_info *info = p->info; + double lcur,ltot; + double rcur,rtot; + double r; + ltot=-1; rtot=-1; + rset_pos(info->rset_l, p->rfd_l, &lcur, <ot); + rset_pos(info->rset_r, p->rfd_r, &rcur, &rtot); + if ( (rtot<0) && (ltot<0)) { /*no position */ + *current=rcur; /* return same as you got */ + *total=rtot; /* probably -1 for not available */ + } + if ( rtot<0) { rtot=0; rcur=0;} /* if only one useful, use it */ + if ( ltot<0) { ltot=0; lcur=0;} + if ( rtot+ltot < 1 ) { /* empty rset */ + *current=0; + *total=0; + return; + } + r=1.0*(lcur+rcur)/(ltot+rtot); /* weighed average of l and r */ + *current=(double) (p->hits); + *total=*current/r ; +#if RSET_DEBUG + yaz_log(LOG_DEBUG,"bool_pos: (%s/%s) %0.1f/%0.1f= %0.4f ", + info->rset_l->control->desc, info->rset_r->control->desc, + *current, *total, r); +#endif +}