* Sebastian Hammer, Adam Dickmeiss
*
* $Log: trunc.c,v $
- * Revision 1.18 2000-05-18 12:01:36 adam
+ * Revision 1.21 2002-04-04 14:14:13 adam
+ * Multiple registers (alpha early)
+ *
+ * Revision 1.20 2002/03/20 20:24:29 adam
+ * Hits per term. Returned in SearchResult-1
+ *
+ * Revision 1.19 2001/01/16 16:56:15 heikki
+ * Searching in my isam-d
+ *
+ * Revision 1.18 2000/05/18 12:01:36 adam
* System call times(2) used again. More 64-bit fixes.
*
* Revision 1.17 2000/03/15 15:00:30 adam
#define NEW_TRUNC 1
-#include "zserver.h"
+#include "index.h"
#include <rstemp.h>
#include <rsnull.h>
#include <rsisams.h>
#if ZMBOL
#include <rsisam.h>
#include <rsisamc.h>
+#include <rsisamd.h>
#if NEW_TRUNC
#include <rsm_or.h>
#endif
RSFD result_rsfd;
rset_temp_parms parms;
+ parms.cmp = key_compare_it;
parms.key_size = sizeof(struct it_key);
- parms.temp_path = res_get (zi->service->res, "setTmpDir");
+ 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_rsfd = rset_open (result, RSETF_WRITE);
heap_close (ti);
}
#if ZMBOL
- else if (zi->service->isam)
+ else if (zi->reg->isam)
{
ISPT *ispt;
int i;
key_compare_it);
for (i = to-from; --i >= 0; )
{
- ispt[i] = is_position (zi->service->isam, isam_p[from+i]);
+ 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
heap_close (ti);
xfree (ispt);
}
- else if (zi->service->isamc)
+ else if (zi->reg->isamc)
{
ISAMC_PP *ispt;
int i;
key_compare_it);
for (i = to-from; --i >= 0; )
{
- ispt[i] = isc_pp_open (zi->service->isamc, isam_p[from+i]);
+ ispt[i] = isc_pp_open (zi->reg->isamc, isam_p[from+i]);
if (isc_pp_read (ispt[i], ti->tmpbuf))
heap_insert (ti, ti->tmpbuf, i);
else
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);
+ }
+
#endif
- else if (zi->service->isams)
+ else if (zi->reg->isams)
{
ISAMS_PP *ispt;
int i;
key_compare_it);
for (i = to-from; --i >= 0; )
{
- ispt[i] = isams_pp_open (zi->service->isams, isam_p[from+i]);
+ ispt[i] = isams_pp_open (zi->reg->isams, isam_p[from+i]);
if (isams_pp_read (ispt[i], ti->tmpbuf))
heap_insert (ti, ti->tmpbuf, i);
else
heap_close (ti);
xfree (ispt);
}
+ else
+ logf (LOG_WARN, "Unknown isam set in rset_trunc_r");
+
rset_close (result, result_rsfd);
return result;
}
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);
+}
#endif
RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
parms.rset_term = rset_term_create (term, length, flags);
return rset_create (rset_kind_null, &parms);
}
- if (zi->service->isams)
+ if (zi->reg->isams)
{
if (no == 1)
{
rset_isams_parms parms;
parms.pos = *isam_p;
- parms.is = zi->service->isams;
+ 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);
}
#if ZMBOL
- else if (zi->service->isam)
+ else if (zi->reg->isam)
{
if (no == 1)
{
rset_isam_parms parms;
parms.pos = *isam_p;
- parms.is = zi->service->isam;
+ 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->service->isamc)
+ 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->service->isamc;
+ parms.is = zi->reg->isamc;
parms.rset_term = rset_term_create (term, length, flags);
return rset_create (rset_kind_isamc, &parms);
}
parms.key_size = sizeof(struct it_key);
parms.cmp = key_compare_it;
- parms.isc = zi->service->isamc;
+ parms.isc = zi->reg->isamc;
parms.isam_positions = isam_p;
parms.no_isam_positions = no;
parms.no_save_positions = 100000;
#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);
+ }
#endif
else
{
- logf (LOG_WARN, "Neither isam / isamc / isams set in rset_trunc");
+ logf (LOG_WARN, "Unknown isam set in rset_trunc");
return rset_create (rset_kind_null, NULL);
}
return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100);
projects / idzebra-moved-to-github.git / blobdiff