-/* $Id: trunc.c,v 1.30 2004-08-06 12:28:22 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: trunc.c,v 1.38 2004-08-24 15:00:16 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
#include <rstemp.h>
#include <rsnull.h>
#include <rsisams.h>
-#include <rsisam.h>
#include <rsisamc.h>
#include <rsisamb.h>
#if NEW_TRUNC
#include <rsm_or.h>
#endif
+#include <rsmultior.h>
struct trunc_info {
int *ptr;
{
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(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;
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
{
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]);
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]]);
- nn++;
- 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;
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)
{
else
logf (LOG_WARN, "Unknown isam set in rset_trunc_r");
- parms.rset_term->nn = nn;
rset_close (result, result_rsfd);
return result;
}
if (i1 > i2)
return 1;
- if (i1 < i2)
+ else if (i1 < i2)
return -1;
return 0;
}
-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);
-}
-
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;
+ 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)
{
logf (LOG_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 (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,
- term_type);
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,
- term_type);
- 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;
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
+ */
+
+#if 0 /* NEW_TRUNC */ /* FIXME - Use the new multi_or instead !! */
else if (no < 10000)
{
rset_m_or_parms parms;
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
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,
- term_type);
return rset_create (rset_kind_isamb, &parms);
}
+ */
+#if 1
+ else if (no <10000 ) /* FIXME - hardcoded number */
+ {
+ RSET r;
+ RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
+ int i;
+ for (i=0;i<no;i++)
+ rsets[i]=rsisamb_create(NULL, /* */
+ sizeof(struct it_key), key_compare_it,
+ zi->reg->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<no;i++)
+ {
+ b_parms.pos = isam_p[i];
+ m_parms.rsets[i]=rset_create (rset_kind_isamb, &b_parms);
+ }
+ return rset_create (rset_kind_multior, &m_parms);
+ */
+ } /* <10000 - rs_multior */
+#endif
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 rsnull_create (NULL); /* FIXME - nmem */
}
return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100,
preserve_position, term_type);