X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=95f297f170f70d91578073f34669ad0cdd456f51;hb=3e8db66d56c466a5a269362eb70b4931d9579128;hp=689415c08047652cf5d32d7a3781aa710d67744d;hpb=3c67867986bf92288ae3b56d6fd5d39404fa7b7a;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index 689415c..95f297f 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,4 +1,4 @@ -/* $Id: trunc.c,v 1.33 2004-08-11 13:35:04 adam Exp $ +/* $Id: trunc.c,v 1.39 2004-08-25 09:18:06 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -24,17 +24,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#define NEW_TRUNC 1 - #include "index.h" #include #include #include #include #include -#if NEW_TRUNC -#include -#endif +#include struct trunc_info { int *ptr; @@ -139,21 +135,24 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, { RSET result; RSFD result_rsfd; - rset_temp_parms parms; int nn = 0; + /* + rset_temp_parms parms; parms.cmp = key_compare_it; parms.key_size = sizeof(struct it_key); parms.temp_path = res_get (zi->res, "setTmpDir"); - parms.rset_term = rset_term_create (term, length, flags, term_type); result = rset_create (rset_kind_temp, &parms); + */ + result=rstemp_create(NULL, /* FIXME - use a proper nmem */ + sizeof(struct it_key), key_compare_it, + res_get (zi->res, "setTmpDir")); result_rsfd = rset_open (result, RSETF_WRITE); if (to - from > merge_chunk) { RSFD *rsfd; RSET *rset; - int term_index; int i, i_add = (to-from)/merge_chunk + 1; struct trunc_info *ti; int rscur = 0; @@ -180,7 +179,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, for (i = rscur; --i >= 0; ) { rsfd[i] = rset_open (rset[i], RSETF_READ); - if (rset_read (rset[i], rsfd[i], ti->tmpbuf, &term_index)) + if (rset_read (rset[i], rsfd[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else { @@ -197,7 +196,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, while (1) { - if (!rset_read (rset[n], rsfd[n], ti->tmpbuf, &term_index)) + if (!rset_read (rset[n], rsfd[n], ti->tmpbuf)) { heap_delete (ti); rset_close (rset[n], rsfd[n]); @@ -374,7 +373,6 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, else logf (LOG_WARN, "Unknown isam set in rset_trunc_r"); - parms.rset_term->nn = nn; rset_close (result, result_rsfd); return result; } @@ -413,28 +411,31 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, { logf (LOG_DEBUG, "rset_trunc no=%d", no); if (no < 1) - { - rset_null_parms parms; - parms.rset_term = rset_term_create (term, length, flags, term_type); - return rset_create (rset_kind_null, &parms); - } + return rsnull_create (NULL); /* FIXME - use a proper nmem */ if (zi->reg->isams) { if (no == 1) + return rsisams_create(NULL, /* 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; - parms.rset_term = rset_term_create (term, length, flags, - term_type); return rset_create (rset_kind_isams, &parms); } + */ qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); } else if (zi->reg->isamc) { if (no == 1) + return rsisamc_create(NULL, /* FIXME - use some nmem */ + sizeof(struct it_key), key_compare_it, + zi->reg->isamc, *isam_p); + /* { rset_isamc_parms parms; @@ -442,11 +443,11 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, parms.cmp = key_compare_it; parms.pos = *isam_p; parms.is = zi->reg->isamc; - parms.rset_term = rset_term_create (term, length, flags, - term_type); return rset_create (rset_kind_isamc, &parms); } -#if NEW_TRUNC + */ + +#if 0 /* NEW_TRUNC */ /* FIXME - Use the new multi_or instead !! */ else if (no < 10000) { rset_m_or_parms parms; @@ -457,8 +458,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, parms.isam_positions = isam_p; parms.no_isam_positions = no; parms.no_save_positions = 100000; - parms.rset_term = rset_term_create (term, length, flags, - term_type); return rset_create (rset_kind_m_or, &parms); } #endif @@ -467,23 +466,60 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, else if (zi->reg->isamb) { if (no == 1) + return rsisamb_create(NULL, /* 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; - parms.rset_term = rset_term_create (term, length, flags, - term_type); return rset_create (rset_kind_isamb, &parms); } + */ +#if 1 + 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( NULL, /* FIXME - use some nmem */ + sizeof(struct it_key), key_compare_it, + 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