X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frstemp.c;h=b06a1fa2b0729fb18e4183cf573957a647637479;hp=173af35c670d4bef172686b1f0bcf2b8c92c0fa0;hb=a8b86c35a39ce9eb5279c46dd99ef7e91b83fb7b;hpb=0064d2b465336e0648efc8a020b8427da9016124 diff --git a/rset/rstemp.c b/rset/rstemp.c index 173af35..b06a1fa 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,10 +1,24 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Id: rstemp.c,v 1.32 2002-05-03 13:46:33 adam Exp $ - */ +/* $Id: rstemp.c,v 1.42 2004-08-06 12:55:03 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 + 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 @@ -25,9 +39,10 @@ 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_count (RSET ct);*/ static int r_read (RSFD rfd, void *buf, int *term_index); 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 = { @@ -37,7 +52,8 @@ static const struct rset_control control = r_close, r_delete, r_rewind, - r_count, + rset_default_forward, + r_pos, r_read, r_write, }; @@ -51,20 +67,22 @@ struct rset_temp_info { char *buf_mem; /* window buffer */ size_t buf_size; /* size of window */ size_t pos_end; /* last position in set */ - size_t pos_cur; /* current position in set */ size_t pos_buf; /* position of first byte in window */ size_t pos_border; /* position of last byte+1 in window */ int dirty; /* window is dirty */ - int hits; /* no of hits */ + zint hits; /* no of hits */ char *temp_path; int (*cmp)(const void *p1, const void *p2); + struct rset_temp_rfd *rfd_list; }; struct rset_temp_rfd { struct rset_temp_info *info; struct rset_temp_rfd *next; - int *countp; + zint *countp; void *buf; + size_t pos_cur; /* current position in set */ + zint cur; /* number of the current hit */ }; static void *r_create(RSET ct, const struct rset_control *sel, void *parms) @@ -78,12 +96,13 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms) info->key_size = temp_parms->key_size; info->buf_size = 4096; info->buf_mem = (char *) xmalloc (info->buf_size); - info->pos_cur = 0; info->pos_end = 0; info->pos_buf = 0; info->dirty = 0; - info->hits = -1; + info->hits = 0; info->cmp = temp_parms->cmp; + info->rfd_list = NULL; + if (!temp_parms->temp_path) info->temp_path = NULL; else @@ -103,8 +122,7 @@ static RSFD r_open (RSET ct, int flag) struct rset_temp_info *info = (struct rset_temp_info *) ct->buf; struct rset_temp_rfd *rfd; - assert (info->fd == -1); - if (info->fname) + if (info->fd == -1 && info->fname) { if (flag & RSETF_WRITE) info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); @@ -117,10 +135,13 @@ static RSFD r_open (RSET ct, int flag) } } rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd)); + rfd->next = info->rfd_list; + info->rfd_list = rfd; rfd->info = info; r_rewind (rfd); rfd->countp = &ct->rset_terms[0]->count; + *rfd->countp = 0; rfd->buf = xmalloc (info->key_size); return rfd; @@ -195,15 +216,26 @@ static void r_flush (RSFD rfd, int mk) static void r_close (RSFD rfd) { struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; + struct rset_temp_rfd **rfdp; - r_flush (rfd, 0); - if (info->fname && info->fd != -1) - { - close (info->fd); - info->fd = -1; - } - xfree (((struct rset_temp_rfd *)rfd)->buf); - xfree (rfd); + for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next) + if (*rfdp == rfd) + { + r_flush (*rfdp, 0); + xfree ((*rfdp)->buf); + + *rfdp = (*rfdp)->next; + xfree (rfd); + + if (!info->rfd_list && info->fname && info->fd != -1) + { + close (info->fd); + info->fd = -1; + } + return; + } + logf (LOG_FATAL, "r_close but no rfd match!"); + assert (0); } static void r_delete (RSET ct) @@ -240,7 +272,8 @@ static void r_reread (RSFD rfd) size_t count; int r; - info->pos_border = info->pos_cur + info->buf_size; + info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur + + info->buf_size; if (info->pos_border > info->pos_end) info->pos_border = info->pos_end; count = info->pos_border - info->pos_buf; @@ -271,36 +304,38 @@ static void r_rewind (RSFD rfd) struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; r_flush (rfd, 0); - info->pos_cur = 0; + ((struct rset_temp_rfd *)rfd)->pos_cur = 0; info->pos_buf = 0; r_reread (rfd); + ((struct rset_temp_rfd *)rfd)->cur=0; } +/* static int r_count (RSET ct) { struct rset_temp_info *info = (struct rset_temp_info *) ct->buf; return info->pos_end / info->key_size; } - +*/ static int r_read (RSFD rfd, void *buf, int *term_index) { struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; struct rset_temp_info *info = mrfd->info; - size_t nc = info->pos_cur + info->key_size; + size_t nc = mrfd->pos_cur + info->key_size; - if (nc > info->pos_border) + if (mrfd->pos_cur < info->pos_buf || nc > info->pos_border) { if (nc > info->pos_end) return 0; r_flush (rfd, 0); - info->pos_buf = info->pos_cur; + info->pos_buf = mrfd->pos_cur; r_reread (rfd); } - memcpy (buf, info->buf_mem + (info->pos_cur - info->pos_buf), + memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf), info->key_size); - info->pos_cur = nc; + mrfd->pos_cur = nc; *term_index = 0; if (*mrfd->countp == 0 || (*info->cmp)(buf, mrfd->buf) > 1) @@ -308,27 +343,37 @@ static int r_read (RSFD rfd, void *buf, int *term_index) memcpy (mrfd->buf, buf, mrfd->info->key_size); (*mrfd->countp)++; } + mrfd->cur++; return 1; } static int r_write (RSFD rfd, const void *buf) { - struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; + struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; + struct rset_temp_info *info = mrfd->info; - size_t nc = info->pos_cur + info->key_size; + size_t nc = mrfd->pos_cur + info->key_size; if (nc > info->pos_buf + info->buf_size) { r_flush (rfd, 1); - info->pos_buf = info->pos_cur; + info->pos_buf = mrfd->pos_cur; if (info->pos_buf < info->pos_end) r_reread (rfd); } info->dirty = 1; - memcpy (info->buf_mem + (info->pos_cur - info->pos_buf), buf, + memcpy (info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf, info->key_size); - info->pos_cur = nc; + mrfd->pos_cur = nc; if (nc > info->pos_end) info->pos_border = info->pos_end = nc; + info->hits++; return 1; } + +static void r_pos (RSFD rfd, double *current, double *total) +{ + struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; + *current=(double) mrfd->cur; + *total=(double) mrfd->info->hits; +}