-/* $Id: trunc.c,v 1.53 2005-04-20 08:32:36 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: trunc.c,v 1.67 2006-08-14 10:40:15 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
const char *flags, ISAM_P *isam_p, int from, int to,
int merge_chunk, int preserve_position,
int term_type, NMEM rset_nmem,
- const struct key_control *kctrl, int scope,
+ struct rset_key_control *kctrl, int scope,
TERMID termid)
{
- RSET result;
+ RSET result;
RSFD result_rsfd;
int nn = 0;
- result = rstemp_create( rset_nmem,kctrl, scope,
- res_get(zi->res, "setTmpDir"), termid);
+ result = rset_create_temp(rset_nmem, kctrl, scope,
+ res_get(zi->res, "setTmpDir"), termid);
result_rsfd = rset_open(result, RSETF_WRITE);
if (to - from > merge_chunk)
struct trunc_info *ti;
int rscur = 0;
int rsmax = (to-from)/i_add + 1;
+ int cmp_border = preserve_position ? 0 : 1;
+ NMEM rset_nmem_sub = nmem_create(); /* all sub rsets not needed
+ after this */
rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
rset[rscur] = rset_trunc_r(zi, term, length, flags,
isam_p, i, i+i_add,
merge_chunk, preserve_position,
- term_type, rset_nmem,
- kctrl, scope,termid);
+ term_type, rset_nmem_sub,
+ kctrl, scope, 0);
else
rset[rscur] = rset_trunc_r(zi, term, length, flags,
isam_p, i, to,
merge_chunk, preserve_position,
- term_type, rset_nmem,
- kctrl, scope,termid);
+ term_type, rset_nmem_sub,
+ kctrl, scope, 0);
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(rsfd[i], ti->tmpbuf,0))
+ if (rset_read(rsfd[i], ti->tmpbuf, 0))
heap_insert(ti, ti->tmpbuf, i);
else
{
rset_delete(rset[n]);
break;
}
- if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+ if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > cmp_border)
{
heap_delete(ti);
heap_insert(ti, ti->tmpbuf, n);
xfree(rset);
xfree(rsfd);
heap_close(ti);
+ nmem_destroy(rset_nmem_sub);
}
else if (zi->reg->isamc)
{
RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
const char *term, int length, const char *flags,
int preserve_position, int term_type, NMEM rset_nmem,
- const struct key_control *kctrl, int scope)
+ struct rset_key_control *kctrl, int scope,
+ struct ord_list *ol, int reg_type,
+ zint hits_limit, const char *term_ref_id)
{
TERMID termid;
+ RSET result;
int trunc_chunk;
- yaz_log(YLOG_DEBUG, "rset_trunc no=%d", no);
+
+ termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol,
+ reg_type, hits_limit, term_ref_id);
if (no < 1)
- return rsnull_create(rset_nmem,kctrl);
- termid = rset_term_create(term, length, flags, term_type,rset_nmem);
+ return rset_create_null(rset_nmem, kctrl, termid);
+
if (zi->reg->isams)
{
if (no == 1)
{
int trunc_limit = atoi(res_get_def(zi->res, "trunclimit", "10000"));
if (no == 1)
- return rsisamb_create(rset_nmem,kctrl, scope,
+ return rsisamb_create(rset_nmem, kctrl, scope,
zi->reg->isamb, *isam_p, termid);
else if (no < trunc_limit)
{
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);
+ zi->reg->isamb, isam_p[i],
+ 0 /* termid */);
+ r = rset_create_or(rset_nmem, kctrl, scope,
+ termid, no, rsets);
xfree(rsets);
return r;
}
- fprintf(stderr, "Using rset_trunc_r limit=%d\n", trunc_limit);
qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
}
else
{
yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
- return rsnull_create(rset_nmem, kctrl);
+ return rset_create_null(rset_nmem, kctrl, 0);
}
- trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "100"));
- return rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
- preserve_position, term_type, rset_nmem, kctrl, scope,
- termid);
+ trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "20"));
+ result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
+ preserve_position, term_type, rset_nmem, kctrl,
+ scope, termid);
+ return result;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff