X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=dd6abd58d0aaf55ec7ca730a078369587b9d2d67;hb=2a6f64379961f30bfe6376964ce279ab5242da1f;hp=2ecf7e07c2977832d5035fb1bc7c3f791f0ebe03;hpb=70961362d71c04daaf0b0feafe59e78d235eb116;p=idzebra-moved-to-github.git diff --git a/rset/rsm_or.c b/rset/rsm_or.c index 2ecf7e0..dd6abd5 100644 --- a/rset/rsm_or.c +++ b/rset/rsm_or.c @@ -1,38 +1,48 @@ -/* - * Copyright (C) 1994-1996, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsm_or.c,v $ - * 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. - * - */ +/* $Id: rsm_or.c,v 1.14 2004-01-16 15:27:35 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + 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 #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,13 +50,13 @@ static const rset_control control = r_close, r_delete, r_rewind, + rset_default_forward, 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; @@ -80,6 +90,8 @@ struct rset_mor_rfd { struct rset_mor_rfd *next; struct rset_mor_info *info; struct trunc_info *ti; + int *countp; + char *pbuf; }; static void heap_swap (struct trunc_info *ti, int i1, int i2) @@ -134,19 +146,19 @@ static struct trunc_info *heap_init (int size, int key_size, int (*cmp)(const void *p1, const void *p2)) { - struct trunc_info *ti = xmalloc (sizeof(*ti)); + struct trunc_info *ti = (struct trunc_info *) xmalloc (sizeof(*ti)); int i; ++size; ti->heapnum = 0; ti->keysize = key_size; ti->cmp = cmp; - ti->indx = xmalloc (size * sizeof(*ti->indx)); - ti->heap = xmalloc (size * sizeof(*ti->heap)); - ti->ptr = xmalloc (size * sizeof(*ti->ptr)); - ti->swapbuf = xmalloc (ti->keysize); - ti->tmpbuf = xmalloc (ti->keysize); - ti->buf = xmalloc (size * ti->keysize); + ti->indx = (int *) xmalloc (size * sizeof(*ti->indx)); + ti->heap = (char **) xmalloc (size * sizeof(*ti->heap)); + ti->ptr = (int *) xmalloc (size * sizeof(*ti->ptr)); + ti->swapbuf = (char *) xmalloc (ti->keysize); + ti->tmpbuf = (char *) xmalloc (ti->keysize); + ti->buf = (char *) xmalloc (size * ti->keysize); for (i = size; --i >= 0; ) { ti->ptr[i] = i; @@ -157,6 +169,7 @@ struct trunc_info *heap_init (int size, int key_size, static void heap_close (struct trunc_info *ti) { + xfree (ti->buf); xfree (ti->ptr); xfree (ti->indx); xfree (ti->heap); @@ -165,15 +178,13 @@ 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; + rset_m_or_parms *r_parms = (rset_m_or_parms *) parms; struct rset_mor_info *info; - *flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(*info)); + ct->flags |= RSET_FLAG_VOLATILE; + info = (struct rset_mor_info *) xmalloc (sizeof(*info)); info->key_size = r_parms->key_size; assert (info->key_size > 1); info->cmp = r_parms->cmp; @@ -182,19 +193,22 @@ static void *r_create (const struct rset_control *sel, void *parms, info->isc = r_parms->isc; info->no_isam_positions = r_parms->no_isam_positions; - info->isam_positions = xmalloc (sizeof(*info->isam_positions) * - info->no_isam_positions); + info->isam_positions = (ISAM_P *) + xmalloc (sizeof(*info->isam_positions) * info->no_isam_positions); memcpy (info->isam_positions, r_parms->isam_positions, sizeof(*info->isam_positions) * info->no_isam_positions); info->rfd_list = NULL; + ct->no_rset_terms = 1; + ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms)); + ct->rset_terms[0] = r_parms->rset_term; return info; } static RSFD r_open (RSET ct, int flag) { struct rset_mor_rfd *rfd; - struct rset_mor_info *info = ct->buf; + struct rset_mor_info *info = (struct rset_mor_info *) ct->buf; int i; if (flag & RSETF_WRITE) @@ -202,19 +216,24 @@ static RSFD r_open (RSET ct, int flag) logf (LOG_FATAL, "m_or set type is read-only"); return NULL; } - rfd = xmalloc (sizeof(*rfd)); + rfd = (struct rset_mor_rfd *) xmalloc (sizeof(*rfd)); rfd->flag = flag; rfd->next = info->rfd_list; rfd->info = info; info->rfd_list = rfd; - rfd->ispt = xmalloc (sizeof(*rfd->ispt) * info->no_isam_positions); + rfd->ispt = (ISAMC_PP *) + xmalloc (sizeof(*rfd->ispt) * info->no_isam_positions); 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 @@ -224,6 +243,13 @@ static RSFD r_open (RSET ct, int flag) } } rfd->position = info->no_save_positions; + + if (ct->no_rset_terms == 1) + rfd->countp = &ct->rset_terms[0]->count; + else + rfd->countp = 0; + rfd->pbuf = xmalloc (info->key_size); + r_rewind (rfd); return rfd; } @@ -243,8 +269,9 @@ 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 (((struct rset_mor_rfd *)rfd)->pbuf); + xfree (rfd); return; } logf (LOG_FATAL, "r_close but no rfd match!"); @@ -253,10 +280,16 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { - struct rset_mor_info *info = ct->buf; + struct rset_mor_info *info = (struct rset_mor_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); } @@ -269,13 +302,15 @@ 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; + struct rset_mor_rfd *mrfd = (struct rset_mor_rfd *) rfd; + struct trunc_info *ti = mrfd->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); if (((struct rset_mor_rfd *) rfd)->position) { @@ -288,6 +323,12 @@ static int r_read (RSFD rfd, void *buf) } else heap_delete (ti); + if (mrfd->countp && ( + *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1)) + { + memcpy (mrfd->pbuf, buf, ti->keysize); + (*mrfd->countp)++; + } return 1; } while (1) @@ -304,15 +345,15 @@ static int r_read (RSFD rfd, void *buf) break; } } + if (mrfd->countp && ( + *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1)) + { + memcpy (mrfd->pbuf, buf, ti->keysize); + (*mrfd->countp)++; + } 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");