X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=95f297f170f70d91578073f34669ad0cdd456f51;hb=fcd23b68a84ac461cbea22271f91b7989a767201;hp=8f4a42b693eb539bfbf4f64dd6f066fae7251472;hpb=764b78fb481cf1084a5a583ffefbe8a0f32af28c;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index 8f4a42b..95f297f 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,27 +1,36 @@ -/* - * Copyright (C) 1994-2002, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto - * - * $Id: trunc.c,v 1.24 2002-04-16 22:31:42 adam Exp $ - * - */ +/* $Id: trunc.c,v 1.39 2004-08-25 09:18:06 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +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 Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include -#define NEW_TRUNC 1 - #include "index.h" #include #include #include -#include #include -#include #include -#if NEW_TRUNC -#include -#endif +#include struct trunc_info { int *ptr; @@ -121,24 +130,29 @@ 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 merge_chunk, int preserve_position, + int term_type) { 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); result = rset_create (rset_kind_temp, &parms); + */ + result=rstemp_create(NULL, /* FIXME - use a proper nmem */ + sizeof(struct it_key), key_compare_it, + 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; @@ -152,18 +166,20 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length, if (i_add <= to - i) rset[rscur] = rset_trunc_r (zi, term, length, flags, isam_p, i, i+i_add, - merge_chunk, preserve_position); + merge_chunk, preserve_position, + term_type); else rset[rscur] = rset_trunc_r (zi, term, length, flags, isam_p, i, to, - merge_chunk, preserve_position); + merge_chunk, preserve_position, + term_type); 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 (rset[i], rsfd[i], ti->tmpbuf)) heap_insert (ti, ti->tmpbuf, i); else { @@ -176,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]); @@ -198,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; @@ -276,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); @@ -306,64 +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; ) - { - 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)); @@ -382,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)) @@ -413,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) { @@ -467,84 +382,60 @@ 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, const char *term, int length, const char *flags, - int preserve_position) + int preserve_position, int term_type) { 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); - } + return rsnull_create (NULL); /* FIXME - use a proper nmem */ if (zi->reg->isams) { if (no == 1) + return rsisams_create(NULL, /* FIXME - use some nmem */ + sizeof(struct it_key), key_compare_it, + zi->reg->isams, *isam_p); + /* { rset_isams_parms parms; 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; - - 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) + return rsisamc_create(NULL, /* FIXME - use some nmem */ + sizeof(struct it_key), key_compare_it, + zi->reg->isamc, *isam_p); + /* { rset_isamc_parms parms; @@ -552,10 +443,11 @@ 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); 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; @@ -566,62 +458,70 @@ 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); 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; - - 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); - } else if (zi->reg->isamb) { if (no == 1) + return rsisamb_create(NULL, /* FIXME - use some nmem */ + sizeof(struct it_key), key_compare_it, + zi->reg->isamb, *isam_p); + /* { 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); 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 r; + RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */ + int i; + for (i=0;ireg->isamb, isam_p[i] ); + r=rsmultior_create( NULL, /* FIXME - use some nmem */ + sizeof(struct it_key), key_compare_it, + no, rsets); + xfree(rsets); + return r; + /* + 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; + for (i=0;i