X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Ftrunc.c;h=391a64e07f8e2ef419779d2dd3096d807b8f8152;hp=261685e0b991ad3177f099294d3520b251a0943a;hb=13bf0c380e98816595127291b64368dd9b8ca639;hpb=f7e93f016e75e43d037b5c3e89aeb27b7176513a diff --git a/index/trunc.c b/index/trunc.c index 261685e..391a64e 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,4 +1,4 @@ -/* $Id: trunc.c,v 1.31 2004-08-06 13:14:46 adam Exp $ +/* $Id: trunc.c,v 1.43 2004-09-03 14:59:49 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -24,17 +24,8 @@ 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; @@ -135,25 +126,28 @@ 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) + int term_type, NMEM rset_nmem, + const struct key_control *kctrl) { 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( rset_nmem,kctrl, + 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; @@ -168,23 +162,23 @@ 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); + term_type, rset_nmem, kctrl); else rset[rscur] = rset_trunc_r (zi, term, length, flags, isam_p, i, to, merge_chunk, preserve_position, - term_type); + term_type, rset_nmem, kctrl); 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 (rset[i], rsfd[i], ti->tmpbuf, &term_index)) + if (rset_read(rsfd[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else { - rset_close (rset[i], rsfd[i]); + rset_close (rsfd[i]); rset_delete (rset[i]); } } @@ -192,15 +186,15 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, { int n = ti->indx[ti->ptr[1]]; - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); + rset_write (result_rsfd, ti->heap[ti->ptr[1]]); nn++; while (1) { - if (!rset_read (rset[n], rsfd[n], ti->tmpbuf, &term_index)) + if (!rset_read (rsfd[n], ti->tmpbuf)) { heap_delete (ti); - rset_close (rset[n], rsfd[n]); + rset_close (rsfd[n]); rset_delete (rset[n]); break; } @@ -238,7 +232,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, { int n = ti->indx[ti->ptr[1]]; - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); + rset_write (result_rsfd, ti->heap[ti->ptr[1]]); nn++; if (preserve_position) { @@ -293,7 +287,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, { int n = ti->indx[ti->ptr[1]]; - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); + rset_write (result_rsfd, ti->heap[ti->ptr[1]]); nn++; while (1) { @@ -326,17 +320,19 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i]); - if (isamb_pp_read (ispt[i], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, i); - else - isamb_pp_close (ispt[i]); + if (isam_p[from+i]) { + ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i]); + if (isamb_pp_read (ispt[i], ti->tmpbuf)) + heap_insert (ti, ti->tmpbuf, i); + else + isamb_pp_close (ispt[i]); + } } while (ti->heapnum) { int n = ti->indx[ti->ptr[1]]; - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); + rset_write (result_rsfd, ti->heap[ti->ptr[1]]); nn++; if (preserve_position) @@ -372,8 +368,7 @@ 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); + rset_close (result_rsfd); return result; } @@ -393,12 +388,11 @@ static int isamc_trunc_cmp (const void *p1, const void *p2) { ISAMC_P i1 = *(ISAMC_P*) p1; ISAMC_P i2 = *(ISAMC_P*) p2; - int d; + zint d; - d = (int) (isc_type (i1) - isc_type (i2)); - if (d) - return d; - d = isc_block (i1) - isc_block (i2); + d = (isc_type (i1) - isc_type (i2)); + if (d == 0) + d = isc_block (i1) - isc_block (i2); if (d > 0) return 1; else if (d < 0) @@ -408,83 +402,50 @@ 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) + int preserve_position, int term_type, NMEM rset_nmem, + const struct key_control *kctrl) { 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 (rset_nmem,kctrl); if (zi->reg->isams) { if (no == 1) - { - 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); - } + return rsisams_create(rset_nmem, kctrl, + zi->reg->isams, *isam_p); qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); } else if (zi->reg->isamc) { if (no == 1) - { - 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; - parms.rset_term = rset_term_create (term, length, flags, - term_type); - return rset_create (rset_kind_isamc, &parms); - } -#if NEW_TRUNC - 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; - parms.rset_term = rset_term_create (term, length, flags, - term_type); - return rset_create (rset_kind_m_or, &parms); - } -#endif + return rsisamc_create(rset_nmem, kctrl, + zi->reg->isamc, *isam_p); qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); } else if (zi->reg->isamb) { if (no == 1) + return rsisamb_create(rset_nmem,kctrl, + zi->reg->isamb, *isam_p); + else if (no <10000 ) /* FIXME - hardcoded number */ { - 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); - } + 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, kctrl, no, rsets); + xfree(rsets); + } qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); } else { logf (LOG_WARN, "Unknown isam set in rset_trunc"); - return rset_create (rset_kind_null, NULL); + return rsnull_create (rset_nmem, kctrl); } return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100, - preserve_position, term_type); + preserve_position, term_type, rset_nmem,kctrl); }