projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed the VOLATILE flag from rsets
[idzebra-moved-to-github.git]
/
rset
/
rsisamc.c
diff --git
a/rset/rsisamc.c
b/rset/rsisamc.c
index
d9f85db
..
681868b
100644
(file)
--- a/
rset/rsisamc.c
+++ b/
rset/rsisamc.c
@@
-1,4
+1,4
@@
-/* $Id: rsisamc.c,v 1.16 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisamc.c,v 1.19 2004-08-23 12:38:53 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-34,7
+34,7
@@
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 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 =
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
@@
-57,7
+57,7
@@
struct rset_pp_info {
ISAMC_PP pt;
struct rset_pp_info *next;
struct rset_isamc_info *info;
ISAMC_PP pt;
struct rset_pp_info *next;
struct rset_isamc_info *info;
- int *countp;
+ zint *countp;
void *buf;
};
void *buf;
};
@@
-74,16
+74,12
@@
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
rset_isamc_parms *pt = (rset_isamc_parms *) parms;
struct rset_isamc_info *info;
rset_isamc_parms *pt = (rset_isamc_parms *) parms;
struct rset_isamc_info *info;
- ct->flags |= RSET_FLAG_VOLATILE;
info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
info->is = pt->is;
info->pos = pt->pos;
info->key_size = pt->key_size;
info->cmp = pt->cmp;
info->ispt_list = NULL;
info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
info->is = pt->is;
info->pos = pt->pos;
info->key_size = pt->key_size;
info->cmp = pt->cmp;
info->ispt_list = NULL;
- ct->no_rset_terms = 1;
- ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
- ct->rset_terms[0] = pt->rset_term;
return info;
}
return info;
}
@@
-103,10
+99,6
@@
RSFD r_open (RSET ct, int flag)
info->ispt_list = ptinfo;
ptinfo->pt = isc_pp_open (info->is, info->pos);
ptinfo->info = info;
info->ispt_list = ptinfo;
ptinfo->pt = isc_pp_open (info->is, info->pos);
ptinfo->info = info;
- if (ct->rset_terms[0]->nn < 0)
- ct->rset_terms[0]->nn = isc_pp_num (ptinfo->pt);
- ct->rset_terms[0]->count = 0;
- ptinfo->countp = &ct->rset_terms[0]->count;
ptinfo->buf = xmalloc (info->key_size);
return ptinfo;
}
ptinfo->buf = xmalloc (info->key_size);
return ptinfo;
}
@@
-135,8
+127,6
@@
static void r_delete (RSET ct)
logf (LOG_DEBUG, "rsisamc_delete");
assert (info->ispt_list == NULL);
logf (LOG_DEBUG, "rsisamc_delete");
assert (info->ispt_list == NULL);
- rset_term_destroy (ct->rset_terms[0]);
- xfree (ct->rset_terms);
xfree (info);
}
xfree (info);
}
@@
-146,11
+136,10
@@
static void r_rewind (RSFD rfd)
abort ();
}
abort ();
}
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
- *term_index = 0;
r = isc_pp_read(pinfo->pt, buf);
if (r > 0)
{
r = isc_pp_read(pinfo->pt, buf);
if (r > 0)
{