-/* $Id: trunc.c,v 1.35 2004-08-19 12:49:14 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: trunc.c,v 1.50 2005-01-15 19:38:28 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <stdio.h>
#include <assert.h>
-#define NEW_TRUNC 1
-
#include "index.h"
-#include <rstemp.h>
-#include <rsnull.h>
-#include <rsisams.h>
-#include <rsisamc.h>
-#include <rsisamb.h>
-#if NEW_TRUNC
-#include <rsm_or.h>
-#endif
-#include <rsmultior.h>
+#include <rset.h>
struct trunc_info {
int *ptr;
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 term_type)
+ int term_type, NMEM rset_nmem,
+ const struct key_control *kctrl, int scope,
+ TERMID termid)
{
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, term_type);
result = rset_create (rset_kind_temp, &parms);
+ */
+ result=rstemp_create( 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;
rset[rscur] = rset_trunc_r (zi, term, length, flags,
isam_p, i, i+i_add,
merge_chunk, preserve_position,
- term_type);
+ term_type, rset_nmem,
+ kctrl, scope,termid);
else
rset[rscur] = rset_trunc_r (zi, term, length, flags,
isam_p, i, to,
merge_chunk, preserve_position,
- term_type);
+ term_type, rset_nmem,
+ kctrl, scope,termid);
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(rsfd[i], ti->tmpbuf,0))
heap_insert (ti, ti->tmpbuf, i);
else
{
- rset_close (rset[i], rsfd[i]);
+ rset_close (rsfd[i]);
rset_delete (rset[i]);
}
}
{
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_close (rsfd[n]);
rset_delete (rset[n]);
break;
}
{
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++;
if (preserve_position)
{
{
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)
{
for (i = to-from; --i >= 0; )
{
if (isam_p[from+i]) {
- ispt[i] = isamb_pp_open (zi->reg->isamb, 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
{
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++;
if (preserve_position)
xfree (ispt);
}
else
- logf (LOG_WARN, "Unknown isam set in rset_trunc_r");
+ yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc_r");
- parms.rset_term->nn = nn;
- rset_close (result, result_rsfd);
+ rset_close (result_rsfd);
return result;
}
RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
const char *term, int length, const char *flags,
- int preserve_position, int term_type)
+ int preserve_position, int term_type, NMEM rset_nmem,
+ const struct key_control *kctrl, int scope)
{
- logf (LOG_DEBUG, "rset_trunc no=%d", no);
+ TERMID termid;
+ yaz_log (YLOG_DEBUG, "rset_trunc no=%d", 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);
- }
+ return rsnull_create (rset_nmem,kctrl);
+ termid=rset_term_create(term, length, flags, term_type,rset_nmem);
if (zi->reg->isams)
{
if (no == 1)
- {
- rset_isams_parms parms;
-
- 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);
- }
+ return rsisams_create(rset_nmem, kctrl, scope,
+ zi->reg->isams, *isam_p, termid);
qsort (isam_p, no, sizeof(*isam_p), isams_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,
- term_type);
- 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,
- term_type);
- return rset_create (rset_kind_m_or, &parms);
- }
-#endif
+ return rsisamc_create(rset_nmem, kctrl, scope,
+ zi->reg->isamc, *isam_p, termid);
qsort (isam_p, no, sizeof(*isam_p), isamc_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);
- }
-#if 1
+ return rsisamb_create(rset_nmem,kctrl, scope,
+ zi->reg->isamb, *isam_p, termid);
else if (no <10000 ) /* FIXME - hardcoded number */
{
- rset_multior_parms m_parms;
- rset_isamb_parms b_parms;
+ RSET r;
+ RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
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);
- m_parms.rset_term = rset_term_create (term, length, flags,
- term_type);
- 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<no;i++)
- {
- b_parms.pos = isam_p[i];
- b_parms.rset_term = rset_term_create (term, length, flags,
- term_type);
- m_parms.rsets[i]=rset_create (rset_kind_isamb, &b_parms);
- }
- return rset_create (rset_kind_multior, &m_parms);
- } /* <10000 - rs_multior */
-#endif
+ rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
+ zi->reg->isamb, isam_p[i], termid);
+ r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
+ xfree(rsets);
+ return r;
+ }
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);
+ yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc");
+ return rsnull_create (rset_nmem, kctrl);
}
return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100,
- preserve_position, term_type);
+ preserve_position, term_type, rset_nmem,kctrl,scope,
+ termid);
}
projects / idzebra-moved-to-github.git / blobdiff