X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=0691af14eca8fbda4624f448678002577309382e;hb=e172ced0dcc937dfc433a33c7e20962b9e6b5ea0;hp=6355cfa0591daa6d817a760d4990f9f20b2b9776;hpb=b4470de12aa07f21f5394c19af0d21b196087225;p=idzebra-moved-to-github.git diff --git a/rset/rset.c b/rset/rset.c index 6355cfa..0691af1 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,4 +1,4 @@ -/* $Id: rset.c,v 1.26 2004-08-23 12:38:53 heikki Exp $ +/* $Id: rset.c,v 1.38 2004-10-22 11:33:29 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -26,29 +26,87 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include - +#include #include -/* #include <../index/index.h> */ /* for log_keydump. Debugging only */ -RSET rset_create(const struct rset_control *sel, void *parms) + +/* creates an rfd. Either allocates a new one, in which case the priv */ +/* pointer is null, and will have to be filled in, or picks up one */ +/* from the freelist, in which case the priv is already allocated, */ +/* and presumably everything that hangs from it as well */ + +RSFD rfd_create_base(RSET rs) { - RSET rnew; + RSFD rnew=rs->free_list; + if (rnew) { + rs->free_list=rnew->next; + assert(rnew->rset==rs); + /* logf(LOG_DEBUG,"rfd-create_base (fl): rfd=%p rs=%p fl=%p priv=%p", + rnew, rs, rs->free_list, rnew->priv); */ + } else { + rnew=nmem_malloc(rs->nmem, sizeof(*rnew)); + rnew->priv=NULL; + rnew->rset=rs; + /* logf(LOG_DEBUG,"rfd_create_base (new): rfd=%p rs=%p fl=%p priv=%p", + rnew, rs, rs->free_list, rnew->priv); */ + } + rnew->next=NULL; /* not part of any (free?) list */ + return rnew; +} - logf (LOG_DEBUG, "rs_create(%s)", sel->desc); - rnew = (RSET) xmalloc(sizeof(*rnew)); +/* puts an rfd into the freelist of the rset. Only when the rset gets */ +/* deleted, will all the nmem disappear */ +void rfd_delete_base(RSFD rfd) +{ + RSET rs=rfd->rset; + /* logf(LOG_DEBUG,"rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p", + rfd, rs, rfd->priv, rs->free_list); */ + assert(NULL == rfd->next); + rfd->next=rs->free_list; + rs->free_list=rfd; +} + + +RSET rset_create_base(const struct rset_control *sel, + NMEM nmem, const struct key_control *kcontrol, + int scope, TERMID term) +{ + RSET rnew; + NMEM M; + /* assert(nmem); */ /* can not yet be used, api/t4 fails */ + if (nmem) + M=nmem; + else + M=nmem_create(); + rnew = (RSET) nmem_malloc(M,sizeof(*rnew)); + /* logf (LOG_DEBUG, "rs_create(%s) rs=%p (nm=%p)", sel->desc, rnew, nmem); */ + rnew->nmem=M; + if (nmem) + rnew->my_nmem=0; + else + rnew->my_nmem=1; rnew->control = sel; - rnew->count = 1; - rnew->buf = (*sel->f_create)(rnew, sel, parms); + rnew->count = 1; /* refcount! */ + rnew->priv = 0; + rnew->free_list=NULL; + rnew->keycontrol=kcontrol; + rnew->scope=scope; + rnew->term=term; + if (term) + term->rset=rnew; return rnew; } void rset_delete (RSET rs) { (rs->count)--; +/* logf(LOG_DEBUG,"rs_delete(%s), rs=%p, count=%d", + rs->control->desc, rs, rs->count); */ if (!rs->count) { (*rs->control->f_delete)(rs); - xfree(rs); + if (rs->my_nmem) + nmem_destroy(rs->nmem); } } @@ -58,6 +116,7 @@ RSET rset_dup (RSET rs) return rs; } +#if 0 void rset_default_pos (RSFD rfd, double *current, double *total) { /* This should never really be needed, but it is still used in */ /* those rsets that we don't really plan to use, like isam-s */ @@ -67,22 +126,22 @@ void rset_default_pos (RSFD rfd, double *current, double *total) *current=-1; /* signal that pos is not implemented */ *total=-1; } /* rset_default_pos */ +#endif -int rset_default_forward(RSET ct, RSFD rfd, void *buf, - int (*cmpfunc)(const void *p1, const void *p2), +int rset_default_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf) { int more=1; - int cmp=2; + int cmp=rfd->rset->scope; logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)", - ct->control->desc, ct,rfd); + rfd->rset->control->desc, rfd->rset, rfd); /* key_logdump(LOG_DEBUG, untilbuf); */ - while ( (cmp==2) && (more)) + while ( (cmp>=rfd->rset->scope) && (more)) { logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp); - more=rset_read(ct, rfd, buf); + more=rset_read(rfd, buf, term); if (more) - cmp=(*cmpfunc)(untilbuf,buf); + cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf); /* if (more) key_logdump(LOG_DEBUG,buf); */ } @@ -91,3 +150,66 @@ int rset_default_forward(RSET ct, RSFD rfd, void *buf, return more; } +/** + * rset_count uses rset_pos to get the total and returns that. + * This is ok for rsisamb, and for some other rsets, but in case of + * booleans etc it will give bad estimate, as nothing has been read + * from that rset + */ +zint rset_count(RSET rs) +{ + double cur,tot; + RSFD rfd=rset_open(rs,0); + rset_pos(rfd,&cur,&tot); + rset_close(rfd); + return (zint)(tot); +} + + +/** rset_get_no_terms is a getterms function for those that don't have any */ +void rset_get_no_terms(RSET ct, TERMID *terms, int maxterms, int *curterm) +{ + return; +} + +/* rset_get_one_term gets that one term from an rset. Used by rsisamX */ +void rset_get_one_term(RSET ct,TERMID *terms,int maxterms,int *curterm) +{ + if (ct->term) + { + if (*curterm < maxterms) + terms[*curterm]=ct->term; + (*curterm)++; + } +} + + +TERMID rset_term_create (const char *name, int length, const char *flags, + int type, NMEM nmem) + +{ + TERMID t; + logf (LOG_DEBUG, "term_create '%s' %d f=%s type=%d nmem=%p", + name, length, flags, type, nmem); + t= (TERMID) nmem_malloc (nmem, sizeof(*t)); + if (!name) + t->name = NULL; + else if (length == -1) + t->name = nmem_strdup(nmem,name); + else + { + t->name = (char*) nmem_malloc(nmem,length+1); + memcpy (t->name, name, length); + t->name[length] = '\0'; + } + if (!flags) + t->flags = NULL; + else + t->flags = nmem_strdup(nmem,flags); + t->type = type; + t->rankpriv=0; + t->rset=0; + return t; +} + +