X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=167c562ee5135953dd0f84dba817909d9046e526;hb=e5ebc859654d84aa9098142b34015648d8e333de;hp=c523bd396574b9c67f6195a62bfb7eac99ff6202;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index c523bd3..167c562 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -4,7 +4,22 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: trunc.c,v $ - * Revision 1.14 1999-05-26 07:49:13 adam + * Revision 1.19 2001-01-16 16:56:15 heikki + * Searching in my isam-d + * + * 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 * C++ compilation. * * Revision 1.13 1999/05/12 13:08:06 adam @@ -56,18 +71,20 @@ #include #include +#define NEW_TRUNC 1 + #include "zserver.h" #include +#include +#include +#if ZMBOL #include #include -#include -#include - -#define NEW_TRUNC 1 - +#include #if NEW_TRUNC #include #endif +#endif struct trunc_info { int *ptr; @@ -166,7 +183,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; @@ -174,7 +191,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); @@ -241,7 +258,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; @@ -253,7 +271,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 @@ -293,7 +311,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; @@ -305,7 +323,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 @@ -345,7 +363,62 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, heap_close (ti); xfree (ispt); } - else if (zi->isams) + + else if (zi->service->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; ) + { + ispt[i] = isamd_pp_open (zi->service->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); + } + +#endif + else if (zi->service->isams) { ISAMS_PP *ispt; int i; @@ -357,7 +430,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 @@ -387,10 +460,22 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, heap_close (ti); xfree (ispt); } + else + logf (LOG_WARN, "Unknown isam set in rset_trunc_r"); + rset_close (result, result_rsfd); 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; @@ -414,55 +499,75 @@ static int isamc_trunc_cmp (const void *p1, const void *p2) return d; return isc_block (i1) - isc_block (i2); } - -static int isams_trunc_cmp (const void *p1, const void *p2) +static int isamd_trunc_cmp (const void *p1, const void *p2) { - ISAMS_P i1 = *(ISAMS_P*) p1; - ISAMS_P i2 = *(ISAMS_P*) p2; + ISAMD_P i1 = *(ISAMD_P*) p1; + ISAMD_P i2 = *(ISAMD_P*) p2; + int d; - return i1 - i2; + d = isamd_type (i1) - isamd_type (i2); + if (d) + return d; + return isamd_block (i1) - isamd_block (i2); } +#endif -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); - if (zi->isam) + if (no < 1) + { + rset_null_parms parms; + parms.rset_term = rset_term_create (term, length, flags); + return rset_create (rset_kind_null, &parms); + } + if (zi->service->isams) { - if (no < 1) - return rset_create (rset_kind_null, NULL); - else if (no == 1) + 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) - return rset_create (rset_kind_null, NULL); - else if (no == 1) + 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; @@ -472,24 +577,39 @@ 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) + else if (zi->service->isamd) { - if (no < 1) - return rset_create (rset_kind_null, NULL); - else if (no == 1) + if (no == 1) { - rset_isams_parms parms; + rset_isamd_parms parms; parms.pos = *isam_p; - parms.is = zi->isams; + parms.is = zi->service->isamd; parms.rset_term = rset_term_create (term, length, flags); - return rset_create (rset_kind_isams, &parms); + return rset_create (rset_kind_isamd, &parms); } - qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp); +#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->service->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); } +#endif else { - logf (LOG_WARN, "Neither isam / isamc / isams set in rset_trunc"); + logf (LOG_WARN, "Unknown isam set in rset_trunc"); return rset_create (rset_kind_null, NULL); } return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100);