/*
- * Copyright (C) 1994-1996, Index Data I/S
+ * Copyright (C) 1994-1998, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: trunc.c,v $
- * Revision 1.1 1996-11-04 14:07:40 adam
+ * Revision 1.10 1998-03-05 08:45:13 adam
+ * New result set model and modular ranking system. Moved towards
+ * descent server API. System information stored as "SGML" records.
+ *
+ * Revision 1.9 1998/01/12 15:04:09 adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.8 1997/10/31 12:34:27 adam
+ * Bug fix: memory leak.
+ *
+ * Revision 1.7 1997/09/29 09:07:29 adam
+ * Minor change.
+ *
+ * Revision 1.6 1997/09/22 12:39:06 adam
+ * Added get_pos method for the ranked result sets.
+ *
+ * Revision 1.5 1997/09/17 12:19:17 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.4 1996/12/23 15:30:44 adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.3 1996/12/20 11:07:14 adam
+ * Multi-or result set.
+ *
+ * Revision 1.2 1996/11/08 11:10:28 adam
+ * Buffers used during file match got bigger.
+ * Compressed ISAM support everywhere.
+ * Bug fixes regarding masking characters in queries.
+ * Redesigned Regexp-2 queries.
+ *
+ * Revision 1.1 1996/11/04 14:07:40 adam
* Moved truncation code to trunc.c.
*
*/
#include <rsisamc.h>
#include <rsnull.h>
+#define NEW_TRUNC 1
+
+#if NEW_TRUNC
+#include <rsm_or.h>
+#endif
+
struct trunc_info {
int *ptr;
int *indx;
}
}
-static
-struct trunc_info *heap_init (int size, int key_size,
- int (*cmp)(const void *p1, const void *p2))
+static struct trunc_info *heap_init (int size, int key_size,
+ int (*cmp)(const void *p1,
+ const void *p2))
{
struct trunc_info *ti = xmalloc (sizeof(*ti));
int i;
xfree (ti->heap);
xfree (ti->swapbuf);
xfree (ti->tmpbuf);
+ xfree (ti->buf);
xfree (ti);
}
-static RSET rset_trunc_r (ZServerInfo *zi, ISAM_P *isam_p, int from, int to,
+static RSET rset_trunc_r (ZebraHandle zi, ISAM_P *isam_p, int from, int to,
int merge_chunk)
{
RSET result;
rset_temp_parms parms;
parms.key_size = sizeof(struct it_key);
+ parms.temp_path = res_get (zi->res, "setTmpDir");
result = rset_create (rset_kind_temp, &parms);
- result_rsfd = rset_open (result, RSETF_WRITE|RSETF_SORT_SYSNO);
+ 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;
merge_chunk);
rscur++;
}
- ti = heap_init (rscur, sizeof(struct it_key), key_compare);
+ ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
for (i = rscur; --i >= 0; )
{
- rsfd[i] = rset_open (rset[i], RSETF_READ|RSETF_SORT_SYSNO);
- if (rset_read (rset[i], rsfd[i], ti->tmpbuf))
+ rsfd[i] = rset_open (rset[i], RSETF_READ);
+ if (rset_read (rset[i], rsfd[i], ti->tmpbuf, &term_index))
heap_insert (ti, ti->tmpbuf, i);
else
{
while (1)
{
- if (!rset_read (rset[n], rsfd[n], ti->tmpbuf))
+ if (!rset_read (rset[n], rsfd[n], ti->tmpbuf, &term_index))
{
heap_delete (ti);
rset_close (rset[n], rsfd[n]);
ispt = xmalloc (sizeof(*ispt) * (to-from));
ti = heap_init (to-from, sizeof(struct it_key),
- key_compare);
+ key_compare_it);
for (i = to-from; --i >= 0; )
{
ispt[i] = is_position (zi->isam, isam_p[from+i]);
int n = ti->indx[ti->ptr[1]];
rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]);
-#if 0
+#if 1
/* section that preserve all keys */
heap_delete (ti);
if (is_readkey (ispt[n], ti->tmpbuf))
ispt = xmalloc (sizeof(*ispt) * (to-from));
ti = heap_init (to-from, sizeof(struct it_key),
- key_compare);
+ key_compare_it);
for (i = to-from; --i >= 0; )
{
ispt[i] = isc_pp_open (zi->isamc, isam_p[from+i]);
- if (isc_read_key (ispt[i], ti->tmpbuf))
+ if (isc_pp_read (ispt[i], ti->tmpbuf))
heap_insert (ti, ti->tmpbuf, i);
else
isc_pp_close (ispt[i]);
/* section that preserve all keys with unique sysnos */
while (1)
{
- if (!isc_read_key (ispt[n], ti->tmpbuf))
+ if (!isc_pp_read (ispt[n], ti->tmpbuf))
{
heap_delete (ti);
isc_pp_close (ispt[n]);
return isc_block (i1) - isc_block (i2);
}
-RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no)
+RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no,
+ const char *term, int length, const char *flags)
{
+ logf (LOG_DEBUG, "rset_trunc no=%d", no);
if (zi->isam)
{
if (no < 1)
parms.pos = *isam_p;
parms.is = zi->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);
parms.pos = *isam_p;
parms.is = zi->isamc;
+ parms.rset_term = rset_term_create (term, length, flags);
return rset_create (rset_kind_isamc, &parms);
}
+#if NEW_TRUNC
+ else if (no < 200)
+ {
+ rset_m_or_parms parms;
+
+ parms.key_size = sizeof(struct it_key);
+ parms.cmp = key_compare_it;
+ parms.isc = zi->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);
+ return rset_create (rset_kind_m_or, &parms);
+ }
+#endif
qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
}
else
- logf (LOG_FATAL, "Neither isam nor isamc set in rset_trunc");
+ {
+ logf (LOG_WARN, "Neither isam nor isamc set in rset_trunc");
+ return rset_create (rset_kind_null, NULL);
+ }
return rset_trunc_r (zi, isam_p, 0, no, 100);
}
projects / idzebra-moved-to-github.git / blobdiff