-/* $Id: trunc.c,v 1.31 2004-08-06 13:14:46 adam Exp $
+/* $Id: trunc.c,v 1.36 2004-08-20 14:44:46 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#if NEW_TRUNC
#include <rsm_or.h>
#endif
+#include <rsmultior.h>
struct trunc_info {
int *ptr;
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_rsfd = rset_open (result, RSETF_WRITE);
{
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]);
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;
}
{
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)
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);
}
if (zi->reg->isams)
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);
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
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
+ else if (no <10000 ) /* FIXME - hardcoded number */
+ {
+ 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;
+ /* 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];
+ 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