-/* $Id: rsm_or.c,v 1.17 2004-08-06 12:55:03 adam Exp $
+/* $Id: rsm_or.c,v 1.20 2004-08-20 14:44:46 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <string.h>
#include <zebrautl.h>
-#include <isam.h>
#include <isamc.h>
#include <rsm_or.h>
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
static void r_rewind (RSFD rfd);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
{
- "multi-or",
+ "m-or (old)",
r_create,
r_open,
r_close,
int no_rec;
int (*cmp)(const void *p1, const void *p2);
ISAMC isc;
- ISAM_P *isam_positions;
+ ISAMC_P *isam_positions;
int no_isam_positions;
int no_save_positions;
struct rset_mor_rfd *next;
struct rset_mor_info *info;
struct trunc_info *ti;
- zint *countp;
char *pbuf;
};
info->isc = r_parms->isc;
info->no_isam_positions = r_parms->no_isam_positions;
- info->isam_positions = (ISAM_P *)
+ info->isam_positions = (ISAMC_P *)
xmalloc (sizeof(*info->isam_positions) * info->no_isam_positions);
memcpy (info->isam_positions, r_parms->isam_positions,
sizeof(*info->isam_positions) * info->no_isam_positions);
}
}
rfd->position = info->no_save_positions;
-
- if (ct->no_rset_terms == 1)
- rfd->countp = &ct->rset_terms[0]->count;
- else
- rfd->countp = 0;
- rfd->pbuf = xmalloc (info->key_size);
-
+ rfd->pbuf = 0;
r_rewind (rfd);
return rfd;
}
static void r_delete (RSET ct)
{
struct rset_mor_info *info = (struct rset_mor_info *) ct->buf;
- int i;
-
assert (info->rfd_list == NULL);
xfree (info->isam_positions);
-
- for (i = 0; i<ct->no_rset_terms; i++)
- rset_term_destroy (ct->rset_terms[i]);
- xfree (ct->rset_terms);
-
xfree (info);
}
}
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
struct rset_mor_rfd *mrfd = (struct rset_mor_rfd *) rfd;
struct trunc_info *ti = mrfd->ti;
if (!ti->heapnum)
return 0;
- *term_index = 0;
memcpy (buf, ti->heap[ti->ptr[1]], ti->keysize);
if (((struct rset_mor_rfd *) rfd)->position)
{
}
else
heap_delete (ti);
+ rfd->pbuf = xmalloc (info->key_size);
if (mrfd->countp && (
*mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1))
{