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
/
rstemp.c
diff --git
a/rset/rstemp.c
b/rset/rstemp.c
index
e32822b
..
0a3b582
100644
(file)
--- a/
rset/rstemp.c
+++ b/
rset/rstemp.c
@@
-1,5
+1,5
@@
-/* $Id: rstemp.c,v 1.33 2002-08-02 19:26:57 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rstemp.c,v 1.43 2004-08-20 14:44:46 heikki Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-20,8
+20,6
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#include <fcntl.h>
#include <assert.h>
#ifdef WIN32
#include <fcntl.h>
#include <assert.h>
#ifdef WIN32
@@
-41,9
+39,10
@@
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_count (RSET ct);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+/* static int r_count (RSET ct);*/
+static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static int r_write (RSFD rfd, const void *buf);
+static void r_pos (RSFD rfd, double *current, double *total);
static const struct rset_control control =
{
static const struct rset_control control =
{
@@
-53,7
+52,8
@@
static const struct rset_control control =
r_close,
r_delete,
r_rewind,
r_close,
r_delete,
r_rewind,
- r_count,
+ rset_default_forward,
+ r_pos,
r_read,
r_write,
};
r_read,
r_write,
};
@@
-67,20
+67,22
@@
struct rset_temp_info {
char *buf_mem; /* window buffer */
size_t buf_size; /* size of window */
size_t pos_end; /* last position in set */
char *buf_mem; /* window buffer */
size_t buf_size; /* size of window */
size_t pos_end; /* last position in set */
- size_t pos_cur; /* current position in set */
size_t pos_buf; /* position of first byte in window */
size_t pos_border; /* position of last byte+1 in window */
int dirty; /* window is dirty */
size_t pos_buf; /* position of first byte in window */
size_t pos_border; /* position of last byte+1 in window */
int dirty; /* window is dirty */
- int hits; /* no of hits */
+ zint hits; /* no of hits */
char *temp_path;
int (*cmp)(const void *p1, const void *p2);
char *temp_path;
int (*cmp)(const void *p1, const void *p2);
+ struct rset_temp_rfd *rfd_list;
};
struct rset_temp_rfd {
struct rset_temp_info *info;
struct rset_temp_rfd *next;
};
struct rset_temp_rfd {
struct rset_temp_info *info;
struct rset_temp_rfd *next;
- int *countp;
+ zint *countp;
void *buf;
void *buf;
+ size_t pos_cur; /* current position in set */
+ zint cur; /* number of the current hit */
};
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
};
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
@@
-94,22
+96,20
@@
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
info->key_size = temp_parms->key_size;
info->buf_size = 4096;
info->buf_mem = (char *) xmalloc (info->buf_size);
info->key_size = temp_parms->key_size;
info->buf_size = 4096;
info->buf_mem = (char *) xmalloc (info->buf_size);
- info->pos_cur = 0;
info->pos_end = 0;
info->pos_buf = 0;
info->dirty = 0;
info->pos_end = 0;
info->pos_buf = 0;
info->dirty = 0;
- info->hits = -1;
+ info->hits = 0;
info->cmp = temp_parms->cmp;
info->cmp = temp_parms->cmp;
+ info->rfd_list = NULL;
+
if (!temp_parms->temp_path)
if (!temp_parms->temp_path)
- info->temp_path = NULL;
+ info->temp_path = NULL;
else
{
else
{
- info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
- strcpy (info->temp_path, temp_parms->temp_path);
+ info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
+ strcpy (info->temp_path, temp_parms->temp_path);
}
}
- ct->no_rset_terms = 1;
- ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
- ct->rset_terms[0] = temp_parms->rset_term;
return info;
}
return info;
}
@@
-119,8
+119,7
@@
static RSFD r_open (RSET ct, int flag)
struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
struct rset_temp_rfd *rfd;
struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
struct rset_temp_rfd *rfd;
- assert (info->fd == -1);
- if (info->fname)
+ if (info->fd == -1 && info->fname)
{
if (flag & RSETF_WRITE)
info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
{
if (flag & RSETF_WRITE)
info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
@@
-133,10
+132,12
@@
static RSFD r_open (RSET ct, int flag)
}
}
rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd));
}
}
rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd));
+ rfd->next = info->rfd_list;
+ info->rfd_list = rfd;
rfd->info = info;
r_rewind (rfd);
rfd->info = info;
r_rewind (rfd);
- rfd->countp = &ct->rset_terms[0]->count;
+ *rfd->countp = 0;
rfd->buf = xmalloc (info->key_size);
return rfd;
rfd->buf = xmalloc (info->key_size);
return rfd;
@@
-185,7
+186,7
@@
static void r_flush (RSFD rfd, int mk)
if (info->fname && info->fd != -1 && info->dirty)
{
size_t count;
if (info->fname && info->fd != -1 && info->dirty)
{
size_t count;
- int r;
+ int r;
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
@@
-211,15
+212,26
@@
static void r_flush (RSFD rfd, int mk)
static void r_close (RSFD rfd)
{
struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
static void r_close (RSFD rfd)
{
struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
+ struct rset_temp_rfd **rfdp;
- r_flush (rfd, 0);
- if (info->fname && info->fd != -1)
- {
- close (info->fd);
- info->fd = -1;
- }
- xfree (((struct rset_temp_rfd *)rfd)->buf);
- xfree (rfd);
+ for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next)
+ if (*rfdp == rfd)
+ {
+ r_flush (*rfdp, 0);
+ xfree ((*rfdp)->buf);
+
+ *rfdp = (*rfdp)->next;
+ xfree (rfd);
+
+ if (!info->rfd_list && info->fname && info->fd != -1)
+ {
+ close (info->fd);
+ info->fd = -1;
+ }
+ return;
+ }
+ logf (LOG_FATAL, "r_close but no rfd match!");
+ assert (0);
}
static void r_delete (RSET ct)
}
static void r_delete (RSET ct)
@@
-237,9
+249,7
@@
static void r_delete (RSET ct)
xfree (info->fname);
}
if (info->temp_path)
xfree (info->fname);
}
if (info->temp_path)
- xfree (info->temp_path);
- rset_term_destroy (ct->rset_terms[0]);
- xfree (ct->rset_terms);
+ xfree (info->temp_path);
xfree (info);
}
xfree (info);
}
@@
-254,9
+264,10
@@
static void r_reread (RSFD rfd)
if (info->fname)
{
size_t count;
if (info->fname)
{
size_t count;
- int r;
+ int r;
- info->pos_border = info->pos_cur + info->buf_size;
+ info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur +
+ info->buf_size;
if (info->pos_border > info->pos_end)
info->pos_border = info->pos_end;
count = info->pos_border - info->pos_buf;
if (info->pos_border > info->pos_end)
info->pos_border = info->pos_end;
count = info->pos_border - info->pos_buf;
@@
-287,64
+298,75
@@
static void r_rewind (RSFD rfd)
struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
r_flush (rfd, 0);
struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
r_flush (rfd, 0);
- info->pos_cur = 0;
+ ((struct rset_temp_rfd *)rfd)->pos_cur = 0;
info->pos_buf = 0;
r_reread (rfd);
info->pos_buf = 0;
r_reread (rfd);
+ ((struct rset_temp_rfd *)rfd)->cur=0;
}
}
+/*
static int r_count (RSET ct)
{
struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
return info->pos_end / info->key_size;
}
static int r_count (RSET ct)
{
struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
return info->pos_end / info->key_size;
}
-
-static int r_read (RSFD rfd, void *buf, int *term_index)
+*/
+static int r_read (RSFD rfd, void *buf)
{
struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
struct rset_temp_info *info = mrfd->info;
{
struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
struct rset_temp_info *info = mrfd->info;
- size_t nc = info->pos_cur + info->key_size;
+ size_t nc = mrfd->pos_cur + info->key_size;
- if (nc > info->pos_border)
+ if (mrfd->pos_cur < info->pos_buf || nc > info->pos_border)
{
if (nc > info->pos_end)
return 0;
r_flush (rfd, 0);
{
if (nc > info->pos_end)
return 0;
r_flush (rfd, 0);
- info->pos_buf = info->pos_cur;
+ info->pos_buf = mrfd->pos_cur;
r_reread (rfd);
}
r_reread (rfd);
}
- memcpy (buf, info->buf_mem + (info->pos_cur - info->pos_buf),
+ memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
info->key_size);
info->key_size);
- info->pos_cur = nc;
- *term_index = 0;
+ mrfd->pos_cur = nc;
if (*mrfd->countp == 0 || (*info->cmp)(buf, mrfd->buf) > 1)
{
memcpy (mrfd->buf, buf, mrfd->info->key_size);
(*mrfd->countp)++;
}
if (*mrfd->countp == 0 || (*info->cmp)(buf, mrfd->buf) > 1)
{
memcpy (mrfd->buf, buf, mrfd->info->key_size);
(*mrfd->countp)++;
}
+ mrfd->cur++;
return 1;
}
static int r_write (RSFD rfd, const void *buf)
{
return 1;
}
static int r_write (RSFD rfd, const void *buf)
{
- struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
+ struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
+ struct rset_temp_info *info = mrfd->info;
- size_t nc = info->pos_cur + info->key_size;
+ size_t nc = mrfd->pos_cur + info->key_size;
if (nc > info->pos_buf + info->buf_size)
{
r_flush (rfd, 1);
if (nc > info->pos_buf + info->buf_size)
{
r_flush (rfd, 1);
- info->pos_buf = info->pos_cur;
+ info->pos_buf = mrfd->pos_cur;
if (info->pos_buf < info->pos_end)
r_reread (rfd);
}
info->dirty = 1;
if (info->pos_buf < info->pos_end)
r_reread (rfd);
}
info->dirty = 1;
- memcpy (info->buf_mem + (info->pos_cur - info->pos_buf), buf,
+ memcpy (info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf,
info->key_size);
info->key_size);
- info->pos_cur = nc;
+ mrfd->pos_cur = nc;
if (nc > info->pos_end)
info->pos_border = info->pos_end = nc;
if (nc > info->pos_end)
info->pos_border = info->pos_end = nc;
+ info->hits++;
return 1;
}
return 1;
}
+
+static void r_pos (RSFD rfd, double *current, double *total)
+{
+ struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
+ *current=(double) mrfd->cur;
+ *total=(double) mrfd->info->hits;
+}