X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=59ad37813109ed0363e2921b0c2f7b323c6c6fb7;hb=93d44a21d1aa585bb7f68d23a7590fc38ccb62a6;hp=a537f38734137245bfb3f950a40c2bc69bc717d6;hpb=230fdc17aa503a23c842cd587f241cfe2fce1c0d;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index a537f38..59ad378 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,4 +1,4 @@ -/* $Id: trunc.c,v 1.41 2004-08-31 14:43:41 heikki Exp $ +/* $Id: trunc.c,v 1.49 2004-11-19 10:27:03 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -25,12 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include "index.h" -#include -#include -#include -#include -#include -#include +#include struct trunc_info { int *ptr; @@ -131,7 +126,9 @@ static void heap_close (struct trunc_info *ti) static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, const char *flags, ISAMS_P *isam_p, int from, int to, int merge_chunk, int preserve_position, - int term_type, NMEM rset_nmem) + int term_type, NMEM rset_nmem, + const struct key_control *kctrl, int scope, + TERMID termid) { RSET result; RSFD result_rsfd; @@ -144,9 +141,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, parms.temp_path = res_get (zi->res, "setTmpDir"); result = rset_create (rset_kind_temp, &parms); */ - result=rstemp_create( rset_nmem, /* NULL, FIXME - use a proper nmem */ - sizeof(struct it_key), key_compare_it, - res_get (zi->res, "setTmpDir")); + result=rstemp_create( rset_nmem,kctrl, scope, + res_get (zi->res, "setTmpDir"), termid); result_rsfd = rset_open (result, RSETF_WRITE); if (to - from > merge_chunk) @@ -167,19 +163,21 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, rset[rscur] = rset_trunc_r (zi, term, length, flags, isam_p, i, i+i_add, merge_chunk, preserve_position, - term_type, rset_nmem); + term_type, rset_nmem, + kctrl, scope,termid); else rset[rscur] = rset_trunc_r (zi, term, length, flags, isam_p, i, to, merge_chunk, preserve_position, - term_type, rset_nmem); + term_type, rset_nmem, + kctrl, scope,termid); rscur++; } ti = heap_init (rscur, sizeof(struct it_key), key_compare_it); for (i = rscur; --i >= 0; ) { rsfd[i] = rset_open (rset[i], RSETF_READ); - if (rset_read(rsfd[i], ti->tmpbuf)) + if (rset_read(rsfd[i], ti->tmpbuf,0)) heap_insert (ti, ti->tmpbuf, i); else { @@ -196,7 +194,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, while (1) { - if (!rset_read (rsfd[n], ti->tmpbuf)) + if (!rset_read (rsfd[n], ti->tmpbuf,0)) { heap_delete (ti); rset_close (rsfd[n]); @@ -326,7 +324,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, for (i = to-from; --i >= 0; ) { if (isam_p[from+i]) { - ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i]); + ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i], scope); if (isamb_pp_read (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -371,7 +369,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, xfree (ispt); } else - logf (LOG_WARN, "Unknown isam set in rset_trunc_r"); + yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc_r"); rset_close (result_rsfd); return result; @@ -407,121 +405,54 @@ static int isamc_trunc_cmp (const void *p1, const void *p2) RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, const char *term, int length, const char *flags, - int preserve_position, int term_type, NMEM rset_nmem) + int preserve_position, int term_type, NMEM rset_nmem, + const struct key_control *kctrl, int scope) { - logf (LOG_DEBUG, "rset_trunc no=%d", no); + TERMID termid; + yaz_log (YLOG_DEBUG, "rset_trunc no=%d", no); if (no < 1) - return rsnull_create (rset_nmem); /* FIXME - use a proper nmem */ + return rsnull_create (rset_nmem,kctrl); + termid=rset_term_create(term, length, flags, term_type,rset_nmem); if (zi->reg->isams) { if (no == 1) - return rsisams_create(rset_nmem, /* FIXME - use some nmem */ - sizeof(struct it_key), key_compare_it, - zi->reg->isams, *isam_p); - /* - { - rset_isams_parms parms; - - parms.pos = *isam_p; - parms.is = zi->reg->isams; - return rset_create (rset_kind_isams, &parms); - } - */ + return rsisams_create(rset_nmem, kctrl, scope, + zi->reg->isams, *isam_p, termid); qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); } else if (zi->reg->isamc) { if (no == 1) - return rsisamc_create(rset_nmem, /* FIXME - use some nmem */ - sizeof(struct it_key), key_compare_it, - zi->reg->isamc, *isam_p); - /* - { - rset_isamc_parms parms; - - parms.key_size = sizeof(struct it_key); - parms.cmp = key_compare_it; - parms.pos = *isam_p; - parms.is = zi->reg->isamc; - return rset_create (rset_kind_isamc, &parms); - } - */ - -#if 0 /* NEW_TRUNC */ /* FIXME - Use the new multi_or instead !! */ - else if (no < 10000) - { - rset_m_or_parms parms; - - parms.key_size = sizeof(struct it_key); - parms.cmp = key_compare_it; - parms.isc = zi->reg->isamc; - parms.isam_positions = isam_p; - parms.no_isam_positions = no; - parms.no_save_positions = 100000; - return rset_create (rset_kind_m_or, &parms); - } -#endif + return rsisamc_create(rset_nmem, kctrl, scope, + zi->reg->isamc, *isam_p, termid); qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); } else if (zi->reg->isamb) { if (no == 1) - return rsisamb_create(rset_nmem, /* FIXME - use some nmem */ - sizeof(struct it_key), key_compare_it, - zi->reg->isamb, *isam_p); - /* - { - rset_isamb_parms parms; - parms.key_size = sizeof(struct it_key); - parms.cmp = key_compare_it; - parms.pos = *isam_p; - parms.is = zi->reg->isamb; - return rset_create (rset_kind_isamb, &parms); - } - */ -#if 1 + return rsisamb_create(rset_nmem,kctrl, scope, + zi->reg->isamb, *isam_p, termid); else if (no <10000 ) /* FIXME - hardcoded number */ { RSET r; RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */ int i; for (i=0;ireg->isamb, isam_p[i] ); - r=rsmultior_create( rset_nmem, /* FIXME - use some nmem */ - sizeof(struct it_key), key_compare_it, - no, rsets); + rsets[i]=rsisamb_create(rset_nmem, kctrl, scope, + zi->reg->isamb, isam_p[i], termid); + r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets); xfree(rsets); return r; - /* - rset_multior_parms m_parms; - rset_isamb_parms b_parms; - int i; - m_parms.key_size = sizeof(struct it_key); - m_parms.cmp = key_compare_it; - m_parms.no_rsets=no; - m_parms.rsets=xmalloc(sizeof(*m_parms.rsets)*no); - b_parms.key_size = sizeof(struct it_key); - b_parms.cmp = key_compare_it; - b_parms.is = zi->reg->isamb; - for (i=0;i