X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frstemp.c;h=c02121bc42c7f67fb6a48153ae6a96c568ae635e;hp=34dd15251dd84425daa30ae29bac1e5aa4b5e4ab;hb=d02c4c703a93e0ad3f4ccde4519879f1f57a6824;hpb=c427496a1254a039887e02c8bb7ce1d673bb251b diff --git a/rset/rstemp.c b/rset/rstemp.c index 34dd152..c02121b 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,108 +1,349 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rstemp.c,v $ - * Revision 1.3 1995-09-04 15:20:40 adam - * More work on temp sets. is_open member removed. - * - * Revision 1.2 1995/09/04 09:10:56 adam - * Minor changes. - * - * Revision 1.1 1994/11/04 13:21:30 quinn - * Working. - * - */ +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data + +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 this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ +#if HAVE_CONFIG_H +#include +#endif +#include +#include +#include #include +#include +#ifdef WIN32 +#include +#endif +#if HAVE_UNISTD_H +#include +#endif +#include -#include -#include +#include +#include -static struct rset_control *r_create(const struct rset_control *sel, - void *parms); -static int r_open(struct rset_control *ct, int wflag); -static void r_close(struct rset_control *ct); -static void r_delete(struct rset_control *ct); -static void r_rewind(struct rset_control *ct); -static int r_count(struct rset_control *ct); -static int r_read(); -static int r_write(); +static RSFD r_open(RSET ct, int flag); +static void r_close(RSFD rfd); +static void r_delete(RSET ct); +static int r_read(RSFD rfd, void *buf, TERMID *term); +static int r_write(RSFD rfd, const void *buf); +static void r_pos(RSFD rfd, double *current, double *total); +static void r_flush(RSFD rfd, int mk); +static void r_reread(RSFD rfd); -static const rset_control control = +static const struct rset_control control = { - "Temporary set", - 0, - r_create, + "temp", + r_delete, + rset_get_one_term, r_open, r_close, - r_delete, - r_rewind, - r_count, + 0, /* no forward */ + r_pos, r_read, - r_write + r_write, }; -const rset_control *rset_kind_temp = &control; - -struct rset_temp_private { - int fd; - char *fname; - size_t key_size; - char *buf_mem; - size_t buf_size; - size_t pos_end; - size_t pos_cur; - size_t pos_buf; +struct rset_private { + int fd; /* file descriptor for temp file */ + char *fname; /* name of temp file */ + char *buf_mem; /* window buffer */ + size_t buf_size; /* size of window */ + size_t pos_end; /* last 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 */ + zint hits; /* no of hits */ + char *temp_path; }; -static struct rset_control *r_create(const struct rset_control *sel, - void *parms) -{ - rset_control *newct; - rset_temp_parms *temp_parms = parms; - struct rset_temp_private *info; - - logf (LOG_DEBUG, "ritemp_create(%s)", sel->desc); - newct = xmalloc(sizeof(*newct)); - memcpy(newct, sel, sizeof(*sel)); - newct->buf = xmalloc (sizeof(struct rset_temp_private)); - info = newct->buf; +struct rfd_private { + void *buf; + size_t pos_cur; /* current position in set */ + /* FIXME - term pos or what ?? */ + zint cur; /* number of the current hit */ +}; + +static int log_level = 0; +static int log_level_initialized = 0; +RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol, + int scope, const char *temp_path, TERMID term) +{ + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, + 0, 0); + struct rset_private *info; + if (!log_level_initialized) + { + log_level = yaz_log_module_level("rstemp"); + log_level_initialized = 1; + } + info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info)); info->fd = -1; info->fname = NULL; - info->key_size = temp_parms->key_size; - info->buf_size = 1024; - info->buf_mem = xmalloc (info->buf_size); - info->pos_cur = 0; + info->buf_size = 4096; + info->buf_mem = (char *) nmem_malloc(rnew->nmem, info->buf_size); info->pos_end = 0; info->pos_buf = 0; + info->dirty = 0; + info->hits = 0; - return newct; + if (!temp_path) + info->temp_path = NULL; + else + info->temp_path = nmem_strdup(rnew->nmem, temp_path); + rnew->priv = info; + return rnew; +} /* rstemp_create */ + +static void r_delete(RSET ct) +{ + struct rset_private *info = (struct rset_private*) ct->priv; + + yaz_log(log_level, "r_delete: set size %ld", (long) info->pos_end); + if (info->fname) + { + yaz_log(log_level, "r_delete: unlink %s", info->fname); + unlink(info->fname); + } } -static int r_open(struct rset_control *ct, int wflag) +static RSFD r_open(RSET ct, int flag) { - struct rset_temp_private *info = ct->buf; - info->pos_cur = 0; + struct rset_private *info = (struct rset_private *) ct->priv; + RSFD rfd; + struct rfd_private *prfd; + + if (info->fd == -1 && info->fname) + { + if (flag & RSETF_WRITE) + info->fd = open(info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); + else + info->fd = open(info->fname, O_BINARY|O_RDONLY); + if (info->fd == -1) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname); + zebra_exit("r_open"); + } + } + rfd = rfd_create_base(ct); + if (!rfd->priv) + { + prfd = (struct rfd_private *) nmem_malloc(ct->nmem, sizeof(*prfd)); + rfd->priv = (void *)prfd; + prfd->buf = nmem_malloc(ct->nmem,ct->keycontrol->key_size); + } + else + prfd= rfd->priv; + r_flush(rfd, 0); + prfd->pos_cur = 0; info->pos_buf = 0; + r_reread(rfd); + prfd->cur = 0; + return rfd; } -static void r_close(struct rset_control *ct) -{} +/* r_flush: + flush current window to file if file is assocated with set + */ +static void r_flush(RSFD rfd, int mk) +{ + struct rset_private *info = rfd->rset->priv; + + if (!info->fname && mk) + { +#if HAVE_MKSTEMP + char template[1024]; + + *template = '\0'; + + if (info->temp_path) + sprintf(template, "%s/", info->temp_path); + strcat(template, "zrs_"); +#if HAVE_UNISTD_H + sprintf(template + strlen(template), "%ld_", (long) getpid()); +#endif + strcat(template, "XXXXXX"); -static void r_delete(struct rset_control *ct) -{} + info->fd = mkstemp(template); + if (info->fd == -1) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template); + zebra_exit("r_flush"); + } + info->fname = nmem_strdup(rfd->rset->nmem, template); +#else + char *s = (char*) tempnam(info->temp_path, "zrs"); + info->fname= nmem_strdup(rfd->rset->nmem, s); -static void r_rewind(struct rset_control *ct) -{} + yaz_log(log_level, "creating tempfile %s", info->fname); + info->fd = open(info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); + if (info->fd == -1) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname); + zebra_exit("r_flush"); + } +#endif + } + if (info->fname && info->fd != -1 && info->dirty) + { + size_t count; + int r; -static int r_count(struct rset_control *ct) -{} + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname); + zebra_exit("r_flusxh"); + } + count = info->buf_size; + if (count > info->pos_end - info->pos_buf) + count = info->pos_end - info->pos_buf; + if ((r = write(info->fd, info->buf_mem, count)) < (int) count) + { + if (r == -1) + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: write %s", info->fname); + else + yaz_log(YLOG_FATAL, "rstemp: write of %ld but got %ld", + (long) count, (long) r); + zebra_exit("r_flush"); + } + info->dirty = 0; + } +} -static int r_read() -{} +static void r_close(RSFD rfd) +{ + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + if (rfd_is_last(rfd)) + { + r_flush(rfd, 0); + if (info->fname && info->fd != -1) + { + close(info->fd); + info->fd = -1; + } + } +} + + +/* r_reread: + read from file to window if file is assocated with set - + indicated by fname + */ +static void r_reread(RSFD rfd) +{ + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + + if (info->fname) + { + size_t count; + int r; + + info->pos_border = mrfd->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; + if (count > 0) + { + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) + { + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd); + zebra_exit("r_reread"); + } + if ((r = read(info->fd, info->buf_mem, count)) < (int) count) + { + if (r == -1) + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: read %s", info->fname); + else + yaz_log(YLOG_FATAL, "read of %ld but got %ld", + (long) count, (long) r); + zebra_exit("r_reread"); + } + } + } + else + info->pos_border = info->pos_end; +} + +static int r_read(RSFD rfd, void *buf, TERMID *term) +{ + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + + size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size; + + 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 = mrfd->pos_cur; + r_reread(rfd); + } + memcpy(buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf), + rfd->rset->keycontrol->key_size); + if (term) + *term = rfd->rset->term; + /* FIXME - should we store and return terms ?? */ + mrfd->pos_cur = nc; + mrfd->cur++; + return 1; +} + +static int r_write(RSFD rfd, const void *buf) +{ + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + + size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size; + + if (nc > info->pos_buf + info->buf_size) + { + r_flush(rfd, 1); + info->pos_buf = mrfd->pos_cur; + if (info->pos_buf < info->pos_end) + r_reread(rfd); + } + info->dirty = 1; + memcpy(info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf, + rfd->rset->keycontrol->key_size); + 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 rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + + *current = (double) mrfd->cur; + *total = (double) info->hits; +} +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ -static int r_write() -{}