X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=rset%2Frsbetween.c;h=e04c74617d07c7f93a2a78f1e6e17ad2d147e3b5;hb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;hp=92119707e4f408cdb67e1a305691d3662e81a6db;hpb=78646a6f682820f4157c1c17cd2dee3129327917;p=idzebra-moved-to-github.git diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 9211970..e04c746 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $Id: rsbetween.c,v 1.11 2004-01-30 13:07:14 heikki Exp $ +/* $Id: rsbetween.c,v 1.15 2004-08-03 14:54:41 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -38,12 +38,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#define RSBETWEEN_DEBUG 0 + static void *r_create_between(RSET ct, const struct rset_control *sel, void *parms); static RSFD r_open_between (RSET ct, int flag); static void r_close_between (RSFD rfd); static void r_delete_between (RSET ct); static void r_rewind_between (RSFD rfd); -static int r_count_between (RSET ct); +static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, + int (*cmpfunc)(const void *p1, const void *p2), + const void *untilbuf); static int r_read_between (RSFD rfd, void *buf, int *term_index); static int r_write_between (RSFD rfd, const void *buf); @@ -55,8 +59,8 @@ static const struct rset_control control_between = r_close_between, r_delete_between, r_rewind_between, - rset_default_forward, - r_count_between, + r_forward_between, /* rset_default_forward, */ + rset_default_pos, r_read_between, r_write_between, }; @@ -97,6 +101,21 @@ struct rset_between_rfd { struct rset_between_info *info; }; +#if RSBETWEEN_DEBUG +static void log2 (struct rset_between_rfd *p, char *msg, int cmp_l, int cmp_r) +{ + char buf_l[32]; + char buf_m[32]; + char buf_r[32]; + logf(LOG_DEBUG,"btw: %s l=%s(%d/%d) m=%s(%d) r=%s(%d/%d), lev=%d", + msg, + (*p->info->printer)(p->buf_l, buf_l), p->more_l, cmp_l, + (*p->info->printer)(p->buf_m, buf_m), p->more_m, + (*p->info->printer)(p->buf_r, buf_r), p->more_r, cmp_r, + p->level); +} +#endif + static void *r_create_between (RSET ct, const struct rset_control *sel, void *parms) { @@ -239,7 +258,9 @@ static void r_rewind_between (RSFD rfd) struct rset_between_info *info = ((struct rset_between_rfd*)rfd)->info; struct rset_between_rfd *p = (struct rset_between_rfd *) rfd; +#if RSBETWEEN_DEBUG logf (LOG_DEBUG, "rsbetween_rewind"); +#endif rset_rewind (info->rset_l, p->rfd_l); rset_rewind (info->rset_m, p->rfd_m); rset_rewind (info->rset_r, p->rfd_r); @@ -256,25 +277,36 @@ static void r_rewind_between (RSFD rfd) p->level=0; } -static int r_count_between (RSET ct) -{ - return 0; -} -static void log2 (struct rset_between_rfd *p, char *msg, int cmp_l, int cmp_r) +static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, + int (*cmpfunc)(const void *p1, const void *p2), + const void *untilbuf) { - char buf_l[32]; - char buf_m[32]; - char buf_r[32]; - logf(LOG_DEBUG,"btw: %s l=%s(%d/%d) m=%s(%d) r=%s(%d/%d), lev=%d", - msg, - (*p->info->printer)(p->buf_l, buf_l), p->more_l, cmp_l, - (*p->info->printer)(p->buf_m, buf_m), p->more_m, - (*p->info->printer)(p->buf_r, buf_r), p->more_r, cmp_r, - p->level); + struct rset_between_info *info = ((struct rset_between_rfd*)rfd)->info; + struct rset_between_rfd *p = (struct rset_between_rfd *) rfd; + int rc; +#if RSBETWEEN_DEBUG + log2( p, "fwd: before forward", 0,0); +#endif + /* It is enough to forward the m pointer here, the read will */ + /* naturally forward the l, m, and attr pointers */ + if (p->more_m) + p->more_m=rset_forward(info->rset_m,p->rfd_m, p->buf_m, + &p->term_index_m, info->cmp,untilbuf); +#if RSBETWEEN_DEBUG + log2( p, "fwd: after forward M", 0,0); +#endif + rc = r_read_between(rfd, buf, term_index); +#if RSBETWEEN_DEBUG + log2( p, "fwd: after forward", 0,0); +#endif + return rc; } + + + static int r_read_between (RSFD rfd, void *buf, int *term_index) { struct rset_between_rfd *p = (struct rset_between_rfd *) rfd; @@ -285,7 +317,9 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) while (p->more_m) { +#if RSBETWEEN_DEBUG log2( p, "start of loop", cmp_l, cmp_r); +#endif /* forward L until past m, count levels, note rec boundaries */ if (p->more_l) @@ -295,7 +329,9 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) p->level = 0; cmp_l=2; /* past this record */ } +#if RSBETWEEN_DEBUG log2( p, "after first L", cmp_l, cmp_r); +#endif while (cmp_l < 0) /* l before m */ { @@ -322,44 +358,108 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) } else if (cmp_attr > 0) break; - p->more_attr = rset_read (info->rset_attr, p->rfd_attr, + else if (cmp_attr==-1) + p->more_attr = rset_read (info->rset_attr, p->rfd_attr, p->buf_attr, &dummy_term); - } + /* if we had a forward that went all the way to + * the seqno, we could use that. But fwd only goes + * to the sysno */ + else if (cmp_attr==-2) + { + p->more_attr = rset_forward( + info->rset_attr, p->rfd_attr, + p->buf_attr, &dummy_term, + info->cmp, p->buf_l); +#if RSBETWEEN_DEBUG + logf(LOG_DEBUG, "btw: after frowarding attr m=%d",p->more_attr); +#endif + } + } /* while more_attr */ } } +#define NEWCODE 1 +#if NEWCODE + if (cmp_l==-2) + { + if (p->more_l) + { + p->more_l=rset_forward( + info->rset_l, p->rfd_l, + p->buf_l, &p->term_index_l, + info->cmp, p->buf_m); + if (p->more_l) + cmp_l= (*info->cmp)(p->buf_l, p->buf_m); + else + cmp_l=2; +#if RSBETWEEN_DEBUG + log2( p, "after forwarding L", cmp_l, cmp_r); +#endif + } + } else + { + p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, + &p->term_index_l); + } +#else p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l, &p->term_index_l); +#endif if (p->more_l) { cmp_l= (*info->cmp)(p->buf_l, p->buf_m); } else cmp_l=2; +#if RSBETWEEN_DEBUG log2( p, "end of L loop", cmp_l, cmp_r); +#endif } /* forward L */ /* forward R until past m, count levels */ +#if RSBETWEEN_DEBUG log2( p, "Before moving R", cmp_l, cmp_r); +#endif if (p->more_r) cmp_r= (*info->cmp)(p->buf_r, p->buf_m); else cmp_r=2; +#if RSBETWEEN_DEBUG log2( p, "after first R", cmp_l, cmp_r); +#endif while (cmp_r < 0) /* r before m */ { - /* -2, earlier record, doesn't matter */ + /* -2, earlier record, don't count level */ if (cmp_r == -1) p->level--; /* relevant end tag */ if (p->more_r) { +#if NEWCODE + if (cmp_r==-2) + { + p->more_r=rset_forward( + info->rset_r, p->rfd_r, + p->buf_r, &p->term_index_r, + info->cmp, p->buf_m); + } else + { + p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, + &p->term_index_r); + } + if (p->more_r) + cmp_r= (*info->cmp)(p->buf_r, p->buf_m); + +#else p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r); cmp_r= (*info->cmp)(p->buf_r, p->buf_m); +#endif } else cmp_r=2; +#if RSBETWEEN_DEBUG log2( p, "End of R loop", cmp_l, cmp_r); +#endif } /* forward R */ if ( ( p->level <= 0 ) && ! p->more_l) @@ -369,7 +469,9 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) { memcpy (buf, p->buf_m, info->key_size); *term_index = p->term_index_m; +#if RSBETWEEN_DEBUG log2( p, "Returning a hit (and forwarding m)", cmp_l, cmp_r); +#endif p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, &p->term_index_m); if (cmp_l == 2) @@ -378,17 +480,38 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) } else if ( ! p->more_l ) /* not in data, no more starts */ { +#if RSBETWEEN_DEBUG log2( p, "no more starts, exiting without a hit", cmp_l, cmp_r); +#endif return 0; /* ergo, nothing can be found. stop scanning */ } +#if NEWCODE + if (cmp_l == 2) + { + p->level = 0; + p->more_m=rset_forward( + info->rset_m, p->rfd_m, + p->buf_m, &p->term_index_m, + info->cmp, p->buf_l); + } else + { + p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, + &p->term_index_m); + } +#else if (cmp_l == 2) p->level = 0; p->more_m = rset_read (info->rset_m, p->rfd_m, p->buf_m, &p->term_index_m); +#endif +#if RSBETWEEN_DEBUG log2( p, "End of M loop", cmp_l, cmp_r); +#endif } /* while more_m */ +#if RSBETWEEN_DEBUG log2( p, "Exiting, nothing more in m", cmp_l, cmp_r); +#endif return 0; /* no more data possible */