X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=118344c357688daed7cfd6c4b95719c709a73d01;hb=297ba5c5c265a5f869f43a0a211bf9f48f700add;hp=887110b1ecb19c831123eb4c1f3dab3a9c25ad63;hpb=543ab71dfcf03778b00faa164f94552cf11cab79;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index 887110b..118344c 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: trunc.c,v $ - * Revision 1.15 1999-07-20 13:59:18 adam + * Revision 1.18 2000-05-18 12:01:36 adam + * System call times(2) used again. More 64-bit fixes. + * + * Revision 1.17 2000/03/15 15:00:30 adam + * First work on threaded version. + * + * Revision 1.16 1999/11/30 13:48:03 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * Revision 1.15 1999/07/20 13:59:18 adam * Fixed bug that occurred when phrases had 0 hits. * * Revision 1.14 1999/05/26 07:49:13 adam @@ -59,18 +68,19 @@ #include #include +#define NEW_TRUNC 1 + #include "zserver.h" #include +#include +#include +#if ZMBOL #include #include -#include -#include - -#define NEW_TRUNC 1 - #if NEW_TRUNC #include #endif +#endif struct trunc_info { int *ptr; @@ -169,7 +179,7 @@ static void heap_close (struct trunc_info *ti) } static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, - const char *flags, ISAM_P *isam_p, int from, int to, + const char *flags, ISAMS_P *isam_p, int from, int to, int merge_chunk) { RSET result; @@ -177,7 +187,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, rset_temp_parms parms; parms.key_size = sizeof(struct it_key); - parms.temp_path = res_get (zi->res, "setTmpDir"); + parms.temp_path = res_get (zi->service->res, "setTmpDir"); parms.rset_term = rset_term_create (term, length, flags); result = rset_create (rset_kind_temp, &parms); result_rsfd = rset_open (result, RSETF_WRITE); @@ -244,7 +254,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, xfree (rsfd); heap_close (ti); } - else if (zi->isam) +#if ZMBOL + else if (zi->service->isam) { ISPT *ispt; int i; @@ -256,7 +267,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = is_position (zi->isam, isam_p[from+i]); + ispt[i] = is_position (zi->service->isam, isam_p[from+i]); if (is_readkey (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -296,7 +307,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, heap_close (ti); xfree (ispt); } - else if (zi->isamc) + else if (zi->service->isamc) { ISAMC_PP *ispt; int i; @@ -308,7 +319,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = isc_pp_open (zi->isamc, isam_p[from+i]); + ispt[i] = isc_pp_open (zi->service->isamc, isam_p[from+i]); if (isc_pp_read (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -348,7 +359,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, heap_close (ti); xfree (ispt); } - else if (zi->isams) +#endif + else if (zi->service->isams) { ISAMS_PP *ispt; int i; @@ -360,7 +372,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, key_compare_it); for (i = to-from; --i >= 0; ) { - ispt[i] = isams_pp_open (zi->isams, isam_p[from+i]); + ispt[i] = isams_pp_open (zi->service->isams, isam_p[from+i]); if (isams_pp_read (ispt[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else @@ -394,6 +406,15 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, return result; } +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; +} + +#if ZMBOL static int isam_trunc_cmp (const void *p1, const void *p2) { ISAM_P i1 = *(ISAM_P*) p1; @@ -417,16 +438,9 @@ static int isamc_trunc_cmp (const void *p1, const void *p2) return d; return isc_block (i1) - isc_block (i2); } +#endif -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; -} - -RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no, +RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, const char *term, int length, const char *flags) { logf (LOG_DEBUG, "rset_trunc no=%d", no); @@ -436,38 +450,52 @@ RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no, parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_null, &parms); } - if (zi->isam) + if (zi->service->isams) + { + if (no == 1) + { + rset_isams_parms parms; + + parms.pos = *isam_p; + parms.is = zi->service->isams; + parms.rset_term = rset_term_create (term, length, flags); + return rset_create (rset_kind_isams, &parms); + } + qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); + } +#if ZMBOL + else if (zi->service->isam) { if (no == 1) { rset_isam_parms parms; parms.pos = *isam_p; - parms.is = zi->isam; + parms.is = zi->service->isam; parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_isam, &parms); } qsort (isam_p, no, sizeof(*isam_p), isam_trunc_cmp); } - else if (zi->isamc) + else if (zi->service->isamc) { if (no == 1) { rset_isamc_parms parms; parms.pos = *isam_p; - parms.is = zi->isamc; + parms.is = zi->service->isamc; parms.rset_term = rset_term_create (term, length, flags); return rset_create (rset_kind_isamc, &parms); } #if NEW_TRUNC - else if (no < 200) + else if (no < 10000) { rset_m_or_parms parms; parms.key_size = sizeof(struct it_key); parms.cmp = key_compare_it; - parms.isc = zi->isamc; + parms.isc = zi->service->isamc; parms.isam_positions = isam_p; parms.no_isam_positions = no; parms.no_save_positions = 100000; @@ -477,19 +505,7 @@ RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no, #endif qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); } - else if (zi->isams) - { - if (no == 1) - { - rset_isams_parms parms; - - parms.pos = *isam_p; - parms.is = zi->isams; - parms.rset_term = rset_term_create (term, length, flags); - return rset_create (rset_kind_isams, &parms); - } - qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); - } +#endif else { logf (LOG_WARN, "Neither isam / isamc / isams set in rset_trunc");