X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Ftrunc.c;h=eb81fbbed48be025cf122f65300675abb510f497;hp=0f9128e502903e22bc1603078e241be91c0a49ed;hb=354f1142c4cc8c59b6f1170b95caec40bfe4d8c0;hpb=81a75ae20b5b250309a70de51bfdf8de0019f882 diff --git a/index/trunc.c b/index/trunc.c index 0f9128e..eb81fbb 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,97 +1,31 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: trunc.c,v $ - * Revision 1.22 2002-04-05 08:46:26 adam - * Zebra with full functionality - * - * Revision 1.21 2002/04/04 14:14:13 adam - * Multiple registers (alpha early) - * - * Revision 1.20 2002/03/20 20:24:29 adam - * Hits per term. Returned in SearchResult-1 - * - * 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 - * First version of ISAMS. - * - * Revision 1.12 1999/02/02 14:51:10 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.11 1998/03/25 13:48:02 adam - * Fixed bug in rset_trunc_r. - * - * Revision 1.10 1998/03/05 08:45:13 adam - * New result set model and modular ranking system. Moved towards - * descent server API. System information stored as "SGML" records. - * - * Revision 1.9 1998/01/12 15:04:09 adam - * The test option (-s) only uses read-lock (and not write lock). - * - * Revision 1.8 1997/10/31 12:34:27 adam - * Bug fix: memory leak. - * - * Revision 1.7 1997/09/29 09:07:29 adam - * Minor change. - * - * Revision 1.6 1997/09/22 12:39:06 adam - * Added get_pos method for the ranked result sets. - * - * Revision 1.5 1997/09/17 12:19:17 adam - * Zebra version corresponds to YAZ version 1.4. - * Changed Zebra server so that it doesn't depend on global common_resource. - * - * Revision 1.4 1996/12/23 15:30:44 adam - * Work on truncation. - * Bug fix: result sets weren't deleted after server shut down. - * - * Revision 1.3 1996/12/20 11:07:14 adam - * Multi-or result set. - * - * Revision 1.2 1996/11/08 11:10:28 adam - * Buffers used during file match got bigger. - * Compressed ISAM support everywhere. - * Bug fixes regarding masking characters in queries. - * Redesigned Regexp-2 queries. - * - * Revision 1.1 1996/11/04 14:07:40 adam - * Moved truncation code to trunc.c. - * - */ +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#if HAVE_CONFIG_H +#include +#endif #include #include -#define NEW_TRUNC 1 - #include "index.h" -#include -#include -#include -#include -#include -#include -#if NEW_TRUNC -#include -#endif +#include struct trunc_info { int *ptr; @@ -105,7 +39,7 @@ struct trunc_info { char *buf; }; -static void heap_swap (struct trunc_info *ti, int i1, int i2) +static void heap_swap(struct trunc_info *ti, int i1, int i2) { int swap; @@ -114,11 +48,11 @@ static void heap_swap (struct trunc_info *ti, int i1, int i2) ti->ptr[i2] = swap; } -static void heap_delete (struct trunc_info *ti) +static void heap_delete(struct trunc_info *ti) { int cur = 1, child = 2; - heap_swap (ti, 1, ti->heapnum--); + heap_swap(ti, 1, ti->heapnum--); while (child <= ti->heapnum) { if (child < ti->heapnum && (*ti->cmp)(ti->heap[ti->ptr[child]], @@ -127,7 +61,7 @@ static void heap_delete (struct trunc_info *ti) if ((*ti->cmp)(ti->heap[ti->ptr[cur]], ti->heap[ti->ptr[child]]) > 0) { - heap_swap (ti, cur, child); + heap_swap(ti, cur, child); cur = child; child = 2*cur; } @@ -136,40 +70,40 @@ static void heap_delete (struct trunc_info *ti) } } -static void heap_insert (struct trunc_info *ti, const char *buf, int indx) +static void heap_insert(struct trunc_info *ti, const char *buf, int indx) { int cur, parent; cur = ++(ti->heapnum); - memcpy (ti->heap[ti->ptr[cur]], buf, ti->keysize); + memcpy(ti->heap[ti->ptr[cur]], buf, ti->keysize); ti->indx[ti->ptr[cur]] = indx; parent = cur/2; while (parent && (*ti->cmp)(ti->heap[ti->ptr[parent]], ti->heap[ti->ptr[cur]]) > 0) { - heap_swap (ti, cur, parent); + heap_swap(ti, cur, parent); cur = parent; parent = cur/2; } } -static struct trunc_info *heap_init (int size, int key_size, - int (*cmp)(const void *p1, - const void *p2)) +static struct trunc_info *heap_init(int size, int key_size, + int (*cmp)(const void *p1, + const void *p2)) { - struct trunc_info *ti = (struct trunc_info *) xmalloc (sizeof(*ti)); + struct trunc_info *ti = (struct trunc_info *) xmalloc(sizeof(*ti)); int i; ++size; ti->heapnum = 0; ti->keysize = key_size; ti->cmp = cmp; - ti->indx = (int *) xmalloc (size * sizeof(*ti->indx)); - ti->heap = (char **) xmalloc (size * sizeof(*ti->heap)); - ti->ptr = (int *) xmalloc (size * sizeof(*ti->ptr)); - ti->swapbuf = (char *) xmalloc (ti->keysize); - ti->tmpbuf = (char *) xmalloc (ti->keysize); - ti->buf = (char *) xmalloc (size * ti->keysize); + ti->indx = (int *) xmalloc(size * sizeof(*ti->indx)); + ti->heap = (char **) xmalloc(size * sizeof(*ti->heap)); + ti->ptr = (int *) xmalloc(size * sizeof(*ti->ptr)); + ti->swapbuf = (char *) xmalloc(ti->keysize); + ti->tmpbuf = (char *) xmalloc(ti->keysize); + ti->buf = (char *) xmalloc(size * ti->keysize); for (i = size; --i >= 0; ) { ti->ptr[i] = i; @@ -178,444 +112,345 @@ static struct trunc_info *heap_init (int size, int key_size, return ti; } -static void heap_close (struct trunc_info *ti) +static void heap_close(struct trunc_info *ti) { - xfree (ti->ptr); - xfree (ti->indx); - xfree (ti->heap); - xfree (ti->swapbuf); - xfree (ti->tmpbuf); - xfree (ti->buf); - xfree (ti); + xfree(ti->ptr); + xfree(ti->indx); + xfree(ti->heap); + xfree(ti->swapbuf); + xfree(ti->tmpbuf); + xfree(ti->buf); + xfree(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) +static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length, + const char *flags, ISAM_P *isam_p, int from, int to, + int merge_chunk, int preserve_position, + int term_type, NMEM rset_nmem, + struct rset_key_control *kctrl, int scope, + TERMID termid) { - RSET result; + 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); - result = rset_create (rset_kind_temp, &parms); - result_rsfd = rset_open (result, RSETF_WRITE); + result = rset_create_temp(rset_nmem, kctrl, scope, + res_get(zi->res, "setTmpDir"), termid); + 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; int rsmax = (to-from)/i_add + 1; - - rset = (RSET *) xmalloc (sizeof(*rset) * rsmax); - rsfd = (RSFD *) xmalloc (sizeof(*rsfd) * rsmax); - + int cmp_border = preserve_position ? 0 : 1; + NMEM rset_nmem_sub = nmem_create(); /* all sub rsets not needed + after this */ + + rset = (RSET *) xmalloc(sizeof(*rset) * rsmax); + rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax); + for (i = from; i < to; i += i_add) { if (i_add <= to - i) - rset[rscur] = rset_trunc_r (zi, term, length, flags, - isam_p, i, i+i_add, merge_chunk); + rset[rscur] = rset_trunc_r(zi, term, length, flags, + isam_p, i, i+i_add, + merge_chunk, preserve_position, + term_type, rset_nmem_sub, + kctrl, scope, 0); else - rset[rscur] = rset_trunc_r (zi, term, length, flags, - isam_p, i, to, merge_chunk); + rset[rscur] = rset_trunc_r(zi, term, length, flags, + isam_p, i, to, + merge_chunk, preserve_position, + term_type, rset_nmem_sub, + kctrl, scope, 0); rscur++; } - ti = heap_init (rscur, sizeof(struct it_key), key_compare_it); + ti = heap_init (rscur, sizeof(struct it_key), key_compare); for (i = rscur; --i >= 0; ) { - rsfd[i] = rset_open (rset[i], RSETF_READ); - if (rset_read (rset[i], rsfd[i], ti->tmpbuf, &term_index)) - heap_insert (ti, ti->tmpbuf, i); + rsfd[i] = rset_open(rset[i], RSETF_READ); + if (rset_read(rsfd[i], ti->tmpbuf, 0)) + heap_insert(ti, ti->tmpbuf, i); else { - rset_close (rset[i], rsfd[i]); - rset_delete (rset[i]); + rset_close(rsfd[i]); + rset_delete(rset[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++; while (1) { - if (!rset_read (rset[n], rsfd[n], ti->tmpbuf, &term_index)) + if(!rset_read (rsfd[n], ti->tmpbuf,0)) { - heap_delete (ti); - rset_close (rset[n], rsfd[n]); - rset_delete (rset[n]); + heap_delete(ti); + rset_close(rsfd[n]); + rset_delete(rset[n]); break; } - if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1) + if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > cmp_border) { - heap_delete (ti); - heap_insert (ti, ti->tmpbuf, n); + heap_delete(ti); + heap_insert(ti, ti->tmpbuf, n); break; } } } - xfree (rset); - xfree (rsfd); - heap_close (ti); + xfree(rset); + xfree(rsfd); + heap_close(ti); + nmem_destroy(rset_nmem_sub); } - else if (zi->reg->isam) + else if (zi->reg->isamc) { - ISPT *ispt; + ISAMC_PP *ispt; int i; struct trunc_info *ti; - ispt = (ISPT *) xmalloc (sizeof(*ispt) * (to-from)); + ispt = (ISAMC_PP *) xmalloc(sizeof(*ispt) * (to-from)); - ti = heap_init (to-from, sizeof(struct it_key), - key_compare_it); + ti = heap_init(to-from, sizeof(struct it_key), + key_compare); 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); + ispt[i] = isamc_pp_open(zi->reg->isamc, isam_p[from+i]); + if (isamc_pp_read(ispt[i], ti->tmpbuf)) + heap_insert(ti, ti->tmpbuf, i); else - is_pt_free (ispt[i]); + isamc_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 1 -/* section that preserve all keys */ - heap_delete (ti); - if (is_readkey (ispt[n], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, n); + rset_write(result_rsfd, ti->heap[ti->ptr[1]]); + nn++; + if (preserve_position) + { + heap_delete(ti); + if (isamc_pp_read(ispt[n], ti->tmpbuf)) + heap_insert(ti, ti->tmpbuf, n); + else + isamc_pp_close(ispt[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)) + while (1) { - 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; + if (!isamc_pp_read(ispt[n], ti->tmpbuf)) + { + heap_delete(ti); + isamc_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); + heap_close(ti); + xfree(ispt); } - else if (zi->reg->isamc) + else if (zi->reg->isams) { - ISAMC_PP *ispt; + ISAMS_PP *ispt; int i; struct trunc_info *ti; + int nn = 0; - ispt = (ISAMC_PP *) xmalloc (sizeof(*ispt) * (to-from)); + ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from)); - ti = heap_init (to-from, sizeof(struct it_key), - key_compare_it); + ti = heap_init(to-from, sizeof(struct it_key), + key_compare); for (i = to-from; --i >= 0; ) { - ispt[i] = isc_pp_open (zi->reg->isamc, isam_p[from+i]); - if (isc_pp_read (ispt[i], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, i); + ispt[i] = isams_pp_open(zi->reg->isams, isam_p[from+i]); + if (isams_pp_read(ispt[i], ti->tmpbuf)) + heap_insert(ti, ti->tmpbuf, i); else - isc_pp_close (ispt[i]); + isams_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 (isc_pp_read (ispt[n], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, n); - else - isc_pp_close (ispt[n]); -#else -/* section that preserve all keys with unique sysnos */ + rset_write(result_rsfd, ti->heap[ti->ptr[1]]); + nn++; while (1) { - if (!isc_pp_read (ispt[n], ti->tmpbuf)) + if (!isams_pp_read(ispt[n], ti->tmpbuf)) { - heap_delete (ti); - isc_pp_close (ispt[n]); + heap_delete(ti); + isams_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); + heap_delete(ti); + heap_insert(ti, ti->tmpbuf, n); break; } } -#endif } - heap_close (ti); - xfree (ispt); + heap_close(ti); + xfree(ispt); } - - else if (zi->reg->isamd) + else if (zi->reg->isamb) { - ISAMD_PP *ispt; + ISAMB_PP *ispt; int i; struct trunc_info *ti; - ispt = (ISAMD_PP *) xmalloc (sizeof(*ispt) * (to-from)); + ispt = (ISAMB_PP *) xmalloc(sizeof(*ispt) * (to-from)); - ti = heap_init (to-from, sizeof(struct it_key), - key_compare_it); + ti = heap_init(to-from, sizeof(struct it_key), + key_compare); for (i = to-from; --i >= 0; ) { - 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]); + if (isam_p[from+i]) { + ispt[i] = isamb_pp_open(zi->reg->isamb, isam_p[from+i], scope); + 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]]); -#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) + rset_write(result_rsfd, ti->heap[ti->ptr[1]]); + nn++; + + if (preserve_position) { - 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; - } + heap_delete(ti); + if (isamb_pp_read(ispt[n], ti->tmpbuf)) + heap_insert(ti, ti->tmpbuf, n); + else + isamb_pp_close(ispt[n]); } -#endif - } - heap_close (ti); - xfree (ispt); - } - - else if (zi->reg->isams) - { - ISAMS_PP *ispt; - int i; - struct trunc_info *ti; - - ispt = (ISAMS_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] = isams_pp_open (zi->reg->isams, isam_p[from+i]); - if (isams_pp_read (ispt[i], ti->tmpbuf)) - heap_insert (ti, ti->tmpbuf, i); else - isams_pp_close (ispt[i]); - } - while (ti->heapnum) - { - int n = ti->indx[ti->ptr[1]]; - - rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]); - while (1) { - if (!isams_pp_read (ispt[n], ti->tmpbuf)) + while (1) { - heap_delete (ti); - isams_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; + if (!isamb_pp_read(ispt[n], ti->tmpbuf)) + { + heap_delete(ti); + isamb_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; + } } } } - heap_close (ti); - xfree (ispt); + heap_close(ti); + xfree(ispt); } else - logf (LOG_WARN, "Unknown isam set in rset_trunc_r"); + yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc_r"); - rset_close (result, result_rsfd); + rset_close(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; -} - -static int isam_trunc_cmp (const void *p1, const void *p2) +static int isams_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) +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); + ISAM_P i1 = *(ISAM_P*) p1; + ISAM_P i2 = *(ISAM_P*) p2; + zint d; + + d = (isamc_type(i1) - isamc_type(i2)); + if (d == 0) + d = isamc_block(i1) - isamc_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, - const char *term, int length, const char *flags) +RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no, + const char *term, int length, const char *flags, + int preserve_position, int term_type, NMEM rset_nmem, + struct rset_key_control *kctrl, int scope, + struct ord_list *ol, const char *index_type, + zint hits_limit, const char *term_ref_id) { - logf (LOG_DEBUG, "rset_trunc no=%d", no); - 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->reg->isams) - { - if (no == 1) - { - rset_isams_parms parms; + TERMID termid; + RSET result; + int trunc_chunk; + int trunc_limit = atoi(res_get_def(zh->res, "trunclimit", "10000")); - parms.pos = *isam_p; - parms.is = zi->reg->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); - } - else if (zi->reg->isam) - { - if (no == 1) - { - rset_isam_parms parms; + termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol, + *index_type, hits_limit, term_ref_id); - parms.pos = *isam_p; - parms.is = zi->reg->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->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); - 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); - 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) + return rset_create_null(rset_nmem, kctrl, termid); + else if (no == 1) + return zebra_create_rset_isam(zh, rset_nmem, kctrl, + scope, *isam_p, termid); + else if (zh->reg->isamb && no > 1 && no < trunc_limit) { - if (no == 1) - { - rset_isamd_parms parms; - - parms.pos = *isam_p; - parms.is = zi->reg->isamd; - parms.rset_term = rset_term_create (term, length, flags); - 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); + RSET r; + RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */ + int i; + for (i = 0; ireg->isamb, isam_p[i], + 0 /* termid */); + r = rset_create_or(rset_nmem, kctrl, scope, + termid, no, rsets); + xfree(rsets); + return r; } + if (zh->reg->isamc) + 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 rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100); + qsort(isam_p, no, sizeof(*isam_p), isams_trunc_cmp); + trunc_chunk = atoi(res_get_def(zh->res, "truncchunk", "20")); + result = rset_trunc_r(zh, term, length, flags, isam_p, 0, no, trunc_chunk, + preserve_position, term_type, rset_nmem, kctrl, + scope, termid); + return result; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +