-/* $Id: rsmultior.c,v 1.2 2004-08-19 12:49:15 heikki Exp $
+/* $Id: rsmultior.c,v 1.7 2004-08-26 11:11:59 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <isamc.h>
#include <rsmultior.h>
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
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 int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
+static void r_pos (RSFD rfd, double *current, double *total);
static const struct rset_control control =
{
"multi-or",
- r_create,
r_open,
r_close,
r_delete,
r_rewind,
r_forward,
- rset_default_pos, /* FIXME */
+ r_pos,
r_read,
r_write,
};
int (*cmp)(const void *p1, const void *p2);
int no_rsets;
RSET *rsets;
- int term_index;
- struct rset_multior_rfd *rfd_list;
+ struct rset_multior_rfd *rfd_list; /* rfds in use */
+ struct rset_multior_rfd *free_list; /* rfds free */
+ /* rfds are allocated when first opened, if nothing in freelist */
+ /* when allocated, all their pointers are allocated as well, and */
+ /* those are kept intact when in the freelist, ready to be reused */
};
HEAP h;
struct rset_multior_rfd *next;
struct rset_multior_info *info;
- zint *countp;
+ zint hits; /* returned so far */
char *prevvalue; /* to see if we are in another record */
+ /* FIXME - is this really needed? */
};
#if 0
static
-HEAP heap_create (int size, int key_size,
+HEAP heap_create (NMEM nmem, int size, int key_size,
int (*cmp)(const void *p1, const void *p2))
{
- HEAP h = (HEAP) xmalloc (sizeof(*h));
+ HEAP h = (HEAP) nmem_malloc (nmem, sizeof(*h));
++size; /* heap array starts at 1 */
h->heapnum = 0;
h->heapmax = size;
h->keysize = key_size;
h->cmp = cmp;
- h->heap = (struct heap_item**) xmalloc((size)*sizeof(*h->heap));
+ h->heap = (struct heap_item**) nmem_malloc(nmem,(size)*sizeof(*h->heap));
h->heap[0]=0; /* not used */
return h;
}
+static void heap_clear( HEAP h)
+{
+ assert(h);
+ h->heapnum=0;
+}
+
static void heap_destroy (HEAP h)
{
- xfree (h->heap); /* safe, they all point to the rfd */
- xfree (h);
+ /* nothing to delete, all is nmem'd, and will go away in due time */
}
+RSET rsmultior_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ int no_rsets, RSET* rsets)
+{
+ RSET rnew=rset_create_base(&control, nmem);
+ struct rset_multior_info *info;
+ info = (struct rset_multior_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ info->key_size = key_size;
+ info->cmp = cmp;
+ info->no_rsets=no_rsets;
+ info->rsets=(RSET*)nmem_malloc(rnew->nmem, no_rsets*sizeof(*rsets));
+ memcpy(info->rsets,rsets,no_rsets*sizeof(*rsets));
+ info->rfd_list = NULL;
+ info->free_list = NULL;
+ rnew->priv=info;
+ return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+ struct rset_multior_info *info = (struct rset_multior_info *) ct->priv;
+ int i;
+
+ assert (info->rfd_list == NULL);
+ for(i=0;i<info->no_rsets;i++)
+ rset_delete(info->rsets[i]);
+}
+#if 0
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
{
rset_multior_parms *r_parms = (rset_multior_parms *) parms;
struct rset_multior_info *info;
-
- ct->flags |= RSET_FLAG_VOLATILE;
- /* FIXME - Remove the whole flags thing, from all rsets */
info = (struct rset_multior_info *) xmalloc (sizeof(*info));
info->key_size = r_parms->key_size;
assert (info->key_size > 1);
info->no_rsets= r_parms->no_rsets;
info->rsets=r_parms->rsets; /* now we own it! */
info->rfd_list=0;
- info->term_index=0 ; /* r_parms->rset_term; */ /*??*/ /*FIXME */
- ct->no_rset_terms = 1;
- ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
- ct->rset_terms[0] = r_parms->rset_term;
return info;
}
+#endif
static RSFD r_open (RSET ct, int flag)
{
struct rset_multior_rfd *rfd;
- struct rset_multior_info *info = (struct rset_multior_info *) ct->buf;
+ struct rset_multior_info *info = (struct rset_multior_info *) ct->priv;
int i;
- int dummy_termindex;
if (flag & RSETF_WRITE)
{
logf (LOG_FATAL, "multior set type is read-only");
return NULL;
}
- rfd = (struct rset_multior_rfd *) xmalloc (sizeof(*rfd));
+ rfd=info->free_list;
+ if (rfd) {
+ info->free_list=rfd->next;
+ heap_clear(rfd->h);
+ assert(rfd->items);
+ /* all other pointers shouls already be allocated, in right sizes! */
+ }
+ else {
+ rfd = (struct rset_multior_rfd *) nmem_malloc (ct->nmem,sizeof(*rfd));
+ rfd->h = heap_create( ct->nmem, info->no_rsets,
+ info->key_size, info->cmp);
+ rfd->items=(struct heap_item *) nmem_malloc(ct->nmem,
+ info->no_rsets*sizeof(*rfd->items));
+ for (i=0; i<info->no_rsets; i++){
+ rfd->items[i].rset=info->rsets[i];
+ rfd->items[i].buf=nmem_malloc(ct->nmem,info->key_size);
+ }
+ }
rfd->flag = flag;
rfd->next = info->rfd_list;
rfd->info = info;
info->rfd_list = rfd;
- if (ct->no_rset_terms==1)
- rfd->countp=&ct->rset_terms[0]->count;
- else
- rfd->countp=0;
- rfd->h = heap_create( info->no_rsets, info->key_size, info->cmp);
rfd->prevvalue=0;
- rfd->items=(struct heap_item *) xmalloc(info->no_rsets*sizeof(*rfd->items));
+ rfd->hits=0;
for (i=0; i<info->no_rsets; i++){
- rfd->items[i].rset=info->rsets[i];
- rfd->items[i].buf=xmalloc(info->key_size);
- rfd->items[i].fd=rset_open(info->rsets[i],RSETF_READ);
-/* if (item_readbuf(&(rfd->items[i]))) */
- if ( rset_read(rfd->items[i].rset, rfd->items[i].fd,
- rfd->items[i].buf, &dummy_termindex) )
- heap_insert(rfd->h, &(rfd->items[i]));
+ rfd->items[i].fd=rset_open(info->rsets[i],RSETF_READ);
+ if ( rset_read(rfd->items[i].rset, rfd->items[i].fd,
+ rfd->items[i].buf) )
+ heap_insert(rfd->h, &(rfd->items[i]));
}
return rfd;
}
for (i = 0; i<info->no_rsets; i++) {
if (mrfd->items[i].fd)
rset_close(info->rsets[i],mrfd->items[i].fd);
- xfree(mrfd->items[i].buf);
}
- xfree(mrfd->items);
- if (mrfd->prevvalue)
- xfree(mrfd->prevvalue);
- xfree(mrfd);
+ mrfd->next=info->free_list;
+ info->free_list=mrfd;
return;
}
logf (LOG_FATAL, "r_close but no rfd match!");
assert (0);
}
-static void r_delete (RSET ct)
-{
- struct rset_multior_info *info = (struct rset_multior_info *) ct->buf;
- int i;
-
- assert (info->rfd_list == NULL);
- for(i=0;i<info->no_rsets;i++)
- rset_delete(info->rsets[i]);
- xfree(info->rsets);
- xfree(info);
-
- for (i = 0; i<ct->no_rset_terms; i++) /* usually only 1 */
- rset_term_destroy (ct->rset_terms[i]);
- xfree (ct->rset_terms);
-}
static void r_rewind (RSFD rfd)
{
}
-static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
struct rset_multior_info *info = mrfd->info;
struct heap_item it;
int rdres;
- int dummycount=0;
if (heap_empty(mrfd->h))
return 0;
if (cmpfunc)
assert(cmpfunc==mrfd->info->cmp);
- *term_index=0;
it = *(mrfd->h->heap[1]);
memcpy(buf,it.buf, info->key_size);
- if (mrfd->countp) {
- if (mrfd->prevvalue) { /* in another record */
- if ( (*mrfd->info->cmp)(mrfd->prevvalue,it.buf) < -1)
- (*mrfd->countp)++;
- } else {
- mrfd->prevvalue=xmalloc(info->key_size);
- (*mrfd->countp)++;
- }
- memcpy(mrfd->prevvalue,it.buf, info->key_size);
- }
+ (mrfd->hits)++;
if (untilbuf)
- rdres=rset_forward(it.rset, it.fd, it.buf, &dummycount,
- cmpfunc,untilbuf);
+ rdres=rset_forward(it.rset, it.fd, it.buf, cmpfunc,untilbuf);
else
- rdres=rset_read(it.rset, it.fd, it.buf, &dummycount);
+ rdres=rset_read(it.rset, it.fd, it.buf);
if ( rdres )
heap_balance(mrfd->h);
else
}
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
- return r_forward(0,rfd, buf, term_index,0,0);
+ return r_forward(0,rfd, buf,0,0);
}
-#if 0
-static int old_read
+static void r_pos (RSFD rfd, double *current, double *total)
{
struct rset_multior_rfd *mrfd = (struct rset_multior_rfd *) rfd;
- struct trunc_info *ti = mrfd->ti;
- int n = ti->indx[ti->ptr[1]];
-
- if (!ti->heapnum)
- return 0;
- *term_index = 0;
- memcpy (buf, ti->heap[ti->ptr[1]], ti->keysize);
- if (((struct rset_multior_rfd *) rfd)->position)
- {
- if (isc_pp_read (((struct rset_multior_rfd *) rfd)->ispt[n], ti->tmpbuf))
- {
- heap_delete (ti);
- if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
- ((struct rset_multior_rfd *) rfd)->position--;
- heap_insert (ti, ti->tmpbuf, n);
- }
- else
- heap_delete (ti);
- if (mrfd->countp && (
- *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1))
- {
- memcpy (mrfd->pbuf, buf, ti->keysize);
- (*mrfd->countp)++;
- }
- return 1;
- }
- while (1)
- {
- if (!isc_pp_read (((struct rset_multior_rfd *) rfd)->ispt[n], ti->tmpbuf))
- {
- heap_delete (ti);
- break;
- }
- if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
- {
- heap_delete (ti);
- heap_insert (ti, ti->tmpbuf, n);
- break;
- }
+ struct rset_multior_info *info = mrfd->info;
+ double cur, tot;
+ double scur=0.0, stot=0.0;
+ int i;
+ for (i=0; i<info->no_rsets; i++){
+ rset_pos(mrfd->items[i].rset, mrfd->items[i].fd, &cur, &tot);
+ logf(LOG_LOG, "r_pos: %d %0.1f %0.1f", i, cur,tot);
+ scur += cur;
+ stot += tot;
}
- if (mrfd->countp && (
- *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1))
- {
- memcpy (mrfd->pbuf, buf, ti->keysize);
- (*mrfd->countp)++;
+ if (stot <1.0) { /* nothing there */
+ *current=0;
+ *total=0;
+ return;
}
- return 1;
+ *current=mrfd->hits;
+ *total=*current*stot/scur;
}
-#endif
-/*!*/ /* FIXME Forward */
-/*!*/ /* FIXME pos */
-
static int r_write (RSFD rfd, const void *buf)
{
logf (LOG_FATAL, "multior set type is read-only");
projects / idzebra-moved-to-github.git / blobdiff