X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsm_or.c;h=a3a858bfc886d2f1a90fbd1775de1500337f89cc;hp=2683029e8b15161a181a09d972c17e78ab3dcd41;hb=896c0427df9d8eff5de6a1735dcd992e067df844;hpb=2d6227440bb26674cab2091b3d79c1934995b762 diff --git a/rset/rsm_or.c b/rset/rsm_or.c index 2683029..a3a858b 100644 --- a/rset/rsm_or.c +++ b/rset/rsm_or.c @@ -1,45 +1,37 @@ -/* - * Copyright (C) 1994-1998, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsm_or.c,v $ - * 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. - * - */ +/* $Id: rsm_or.c,v 1.13 2002-08-02 19:26:57 adam 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 static void *r_create(RSET ct, const struct rset_control *sel, void *parms); static RSFD r_open (RSET ct, int flag); @@ -97,6 +89,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) @@ -151,19 +145,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; @@ -174,6 +168,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); @@ -184,11 +179,11 @@ static void heap_close (struct trunc_info *ti) 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; ct->flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(*info)); + 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; @@ -197,14 +192,14 @@ static void *r_create (RSET ct, 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 = xmalloc (sizeof(*ct->rset_terms)); + ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms)); ct->rset_terms[0] = r_parms->rset_term; return info; } @@ -212,7 +207,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) 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) @@ -220,13 +215,14 @@ 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); @@ -246,6 +242,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; } @@ -266,6 +269,7 @@ static void r_close (RSFD rfd) if (((struct rset_mor_rfd *) rfd)->ispt[i]) isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[i]); xfree (((struct rset_mor_rfd *)rfd)->ispt); + xfree (((struct rset_mor_rfd *)rfd)->pbuf); xfree (rfd); return; } @@ -275,7 +279,7 @@ 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); @@ -299,7 +303,8 @@ static int r_count (RSET ct) 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) @@ -317,6 +322,12 @@ static int r_read (RSFD rfd, void *buf, int *term_index) } 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) @@ -333,6 +344,12 @@ static int r_read (RSFD rfd, void *buf, int *term_index) break; } } + if (mrfd->countp && ( + *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1)) + { + memcpy (mrfd->pbuf, buf, ti->keysize); + (*mrfd->countp)++; + } return 1; }