X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=acd9e4a2c789909926a1428eb4753ac7bf8c1c76;hb=863d336f803da454e03f39ee2225719fed05021e;hp=cd69643fa6f66fb0676583aa21828b132bd9e45b;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index cd69643..acd9e4a 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,5 +1,5 @@ -/* $Id: trunc.c,v 1.27 2002-08-02 19:26:55 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 +/* $Id: trunc.c,v 1.36 2004-08-20 14:44:46 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps This file is part of the Zebra server. @@ -30,13 +30,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include #include -#include #include #if NEW_TRUNC #include #endif +#include struct trunc_info { int *ptr; @@ -142,11 +141,11 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, RSET result; RSFD result_rsfd; rset_temp_parms parms; + int nn = 0; 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_rsfd = rset_open (result, RSETF_WRITE); @@ -154,7 +153,6 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, { RSFD *rsfd; RSET *rset; - int term_index; int i, i_add = (to-from)/merge_chunk + 1; struct trunc_info *ti; int rscur = 0; @@ -181,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 { @@ -194,10 +192,11 @@ 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]]); + nn++; 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]); @@ -216,61 +215,6 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, xfree (rsfd); heap_close (ti); } - else if (zi->reg->isam) - { - ISPT *ispt; - int i; - struct trunc_info *ti; - - ispt = (ISPT *) xmalloc (sizeof(*ispt) * (to-from)); - - ti = heap_init (to-from, sizeof(struct it_key), - key_compare_it); - for (i = to-from; --i >= 0; ) - { - ispt[i] = is_position (zi->reg->isam, isam_p[from+i]); - if (is_readkey (ispt[i], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, i); - else - is_pt_free (ispt[i]); - } - while (ti->heapnum) - { - int n = ti->indx[ti->ptr[1]]; - - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); - if (preserve_position) - { -/* section that preserve all keys */ - heap_delete (ti); - if (is_readkey (ispt[n], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, n); - else - is_pt_free (ispt[n]); - } - else - { -/* section that preserve all keys with unique sysnos */ - while (1) - { - if (!is_readkey (ispt[n], ti->tmpbuf)) - { - heap_delete (ti); - is_pt_free (ispt[n]); - break; - } - if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) - { - heap_delete (ti); - heap_insert (ti, ti->tmpbuf, n); - break; - } - } - } - } - heap_close (ti); - xfree (ispt); - } else if (zi->reg->isamc) { ISAMC_PP *ispt; @@ -294,6 +238,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]]); + nn++; if (preserve_position) { heap_delete (ti); @@ -324,66 +269,12 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, heap_close (ti); xfree (ispt); } - - else if (zi->reg->isamd) - { - ISAMD_PP *ispt; - int i; - struct trunc_info *ti; - - ispt = (ISAMD_PP *) xmalloc (sizeof(*ispt) * (to-from)); - - ti = heap_init (to-from, sizeof(struct it_key), - key_compare_it); - for (i = to-from; --i >= 0; ) - { - logf(LOG_FATAL, "isam_d does not (currently) support truncs"); - abort(); - /*ispt[i] = isamd_pp_open (zi->reg->isamd, isam_p[from+i]); */ - if (isamd_pp_read (ispt[i], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, i); - else - isamd_pp_close (ispt[i]); - } - while (ti->heapnum) - { - int n = ti->indx[ti->ptr[1]]; - - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); -#if 0 -/* section that preserve all keys */ - heap_delete (ti); - if (isamd_pp_read (ispt[n], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, n); - else - isamd_pp_close (ispt[n]); -#else -/* section that preserve all keys with unique sysnos */ - while (1) - { - if (!isamd_pp_read (ispt[n], ti->tmpbuf)) - { - heap_delete (ti); - isamd_pp_close (ispt[n]); - break; - } - if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) - { - heap_delete (ti); - heap_insert (ti, ti->tmpbuf, n); - break; - } - } -#endif - } - heap_close (ti); - xfree (ispt); - } else if (zi->reg->isams) { ISAMS_PP *ispt; int i; struct trunc_info *ti; + int nn = 0; ispt = (ISAMS_PP *) xmalloc (sizeof(*ispt) * (to-from)); @@ -402,6 +293,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]]); + nn++; while (1) { if (!isams_pp_read (ispt[n], ti->tmpbuf)) @@ -433,17 +325,20 @@ 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]]); + nn++; if (preserve_position) { @@ -487,42 +382,27 @@ static int isams_trunc_cmp (const void *p1, const void *p2) ISAMS_P i1 = *(ISAMS_P*) p1; ISAMS_P i2 = *(ISAMS_P*) p2; - return i1 - i2; -} - -static int isam_trunc_cmp (const void *p1, const void *p2) -{ - ISAM_P i1 = *(ISAM_P*) p1; - ISAM_P i2 = *(ISAM_P*) p2; - int d; - - d = is_type (i1) - is_type (i2); - if (d) - return d; - return is_block (i1) - is_block (i2); + if (i1 > i2) + return 1; + else if (i1 < i2) + return -1; + return 0; } 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; - - d = isc_type (i1) - isc_type (i2); - if (d) - return d; - return isc_block (i1) - isc_block (i2); -} -static int isamd_trunc_cmp (const void *p1, const void *p2) -{ - ISAMD_P i1 = *(ISAMD_P*) p1; - ISAMD_P i2 = *(ISAMD_P*) p2; - int d; - - d = isamd_type (i1) - isamd_type (i2); - if (d) - return d; - return isamd_block (i1) - isamd_block (i2); + zint d; + + 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) + return -1; + return 0; } RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, @@ -533,7 +413,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int 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); } if (zi->reg->isams) @@ -544,26 +423,10 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, 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->isam) - { - if (no == 1) - { - rset_isam_parms parms; - - parms.pos = *isam_p; - parms.is = zi->reg->isam; - parms.rset_term = rset_term_create (term, length, flags, - term_type); - return rset_create (rset_kind_isam, &parms); - } - qsort (isam_p, no, sizeof(*isam_p), isam_trunc_cmp); - } else if (zi->reg->isamc) { if (no == 1) @@ -574,11 +437,9 @@ 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; @@ -589,60 +450,46 @@ 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 qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); } - else if (zi->reg->isamd) - { - if (no == 1) - { - rset_isamd_parms parms; - - logf(LOG_FATAL, "isam_d does not (currently) support truncs"); - abort(); - /* parms.pos = *isam_p; */ - parms.is = zi->reg->isamd; - parms.rset_term = rset_term_create (term, length, flags, - term_type); - return rset_create (rset_kind_isamd, &parms); - } -#if NEW_TRUNC_NOT_DONE_FOR_ISAM_D - else if (no < 10000) - { - rset_m_or_parms parms; - - parms.key_size = sizeof(struct it_key); - parms.cmp = key_compare_it; - parms.isc = 0; - parms.isamd=zi->reg->isamd; - parms.isam_positions = isam_p; - parms.no_isam_positions = no; - parms.no_save_positions = 100000; - parms.rset_term = rset_term_create (term, length, flags); - return rset_create (rset_kind_m_or, &parms); - } -#endif - qsort (isam_p, no, sizeof(*isam_p), isamd_trunc_cmp); - } else if (zi->reg->isamb) { if (no == 1) { 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); } - qsort (isam_p, no, sizeof(*isam_p), isamd_trunc_cmp); +#if 1 + else if (no <10000 ) /* FIXME - hardcoded number */ + { + 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; + /* FIXME - make it so that we can pass a null ptr to term */ + /* needs changes in all rsets, here and there! */ + for (i=0;i