-/* $Id: trunc.c,v 1.31 2004-08-06 13:14:46 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: trunc.c,v 1.51 2005-01-15 20:47:15 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 <rset.h>
struct trunc_info {
int *ptr;
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;
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, 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;
int rsmax = (to-from)/i_add + 1;
- rset = (RSET *) xmalloc (sizeof(*rset) * rsmax);
- rsfd = (RSFD *) xmalloc (sizeof(*rsfd) * rsmax);
+ rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
+ rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
for (i = from; i < to; i += i_add)
{
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;
}
}
}
}
- xfree (rset);
- xfree (rsfd);
+ xfree(rset);
+ xfree(rsfd);
heap_close (ti);
}
else if (zi->reg->isamc)
int i;
struct trunc_info *ti;
- ispt = (ISAMC_PP *) 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);
{
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)
{
}
}
heap_close (ti);
- xfree (ispt);
+ xfree(ispt);
}
else if (zi->reg->isams)
{
struct trunc_info *ti;
int nn = 0;
- ispt = (ISAMS_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);
{
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)
{
}
}
heap_close (ti);
- xfree (ispt);
+ xfree(ispt);
}
else if (zi->reg->isamb)
{
int i;
struct trunc_info *ti;
- ispt = (ISAMB_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);
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], 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]]);
+ rset_write (result_rsfd, ti->heap[ti->ptr[1]]);
nn++;
if (preserve_position)
}
}
heap_close (ti);
- xfree (ispt);
+ 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;
}
{
ISAMC_P i1 = *(ISAMC_P*) p1;
ISAMC_P i2 = *(ISAMC_P*) p2;
- int d;
+ zint d;
- d = (int) (isc_type (i1) - isc_type (i2));
- if (d)
- return d;
- d = isc_block (i1) - isc_block (i2);
+ 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)
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)
+ return rsisamb_create(rset_nmem,kctrl, scope,
+ zi->reg->isamb, *isam_p, termid);
+ else if (no <10000 ) /* FIXME - hardcoded number */
{
- 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);
- }
+ RSET r;
+ RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */
+ int i;
+ for (i = 0; i<no; i++)
+ rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
+ zi->reg->isamb, isam_p[i], termid);
+ r = rsmulti_or_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);
}