Added forward functions to rsbool, and a few tests for them.

[idzebra-moved-to-github.git] / rset / rsbool.c

diff --git a/rset/rsbool.c b/rset/rsbool.c
index db767ba..aa6e280 100644 (file)
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.23 2004-01-16 15:27:35 heikki Exp $
+/* $Id: rsbool.c,v 1.24 2004-01-30 11:43:41 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -30,11 +30,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <rsbool.h>
 #include <zebrautl.h>
 
+#include <../index/index.h> /* for log_keydump. Debugging only */
+
+
 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_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+                     int (*cmpfunc)(const void *p1, const void *p2),
+                     const void *untilbuf);
 static int r_count (RSET ct);
 static int r_read_and (RSFD rfd, void *buf, int *term_index);
 static int r_read_or (RSFD rfd, void *buf, int *term_index);
@@ -49,7 +55,7 @@ static const struct rset_control control_and =
     r_close,
     r_delete,
     r_rewind,
-    rset_default_forward,
+    r_forward, /*rset_default_forward,*/
     r_count,
     r_read_and,
     r_write,
@@ -63,7 +69,11 @@ static const struct rset_control control_or =
     r_close,
     r_delete,
     r_rewind,
+#if 1
+    r_forward, 
+#else
     rset_default_forward,
+#endif
     r_count,
     r_read_or,
     r_write,
@@ -77,7 +87,7 @@ static const struct rset_control control_not =
     r_close,
     r_delete,
     r_rewind,
-    rset_default_forward,
+    r_forward, 
     r_count,
     r_read_not,
     r_write,
@@ -209,6 +219,40 @@ static void r_rewind (RSFD rfd)
     p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r, &p->term_index_r);
 }
 
+static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+                     int (*cmpfunc)(const void *p1, const void *p2),
+                     const void *untilbuf)
+{
+    struct rset_bool_info *info = ((struct rset_bool_rfd*)rfd)->info;
+    struct rset_bool_rfd *p = (struct rset_bool_rfd *) rfd;
+    int cmp=0;
+
+    logf (LOG_DEBUG, "rsbool_forward '%s' (ct=%p rfd=%p m=%d,%d)",
+                      ct->control->desc, ct, rfd, p->more_l, p->more_r);
+    if ( p->more_l)
+        p->more_l = rset_forward(info->rset_l, p->rfd_l, p->buf_l,
+                        &p->term_index_l, info->cmp, untilbuf);
+    if ( p->more_r)
+        p->more_r = rset_forward(info->rset_r, p->rfd_r, p->buf_r,
+                        &p->term_index_r, info->cmp, untilbuf);
+    if (p->more_l && p->more_r)
+           cmp = (*info->cmp)(p->buf_l, p->buf_r);
+       else if (p->more_l)
+           cmp = -2;
+       else
+           cmp = 2;
+    if ( (cmp<0) && (p->more_l) )
+    {
+        memcpy (buf, p->buf_l, info->key_size);
+           *term_index = p->term_index_l;
+    } else if ( (cmp>0) && (p->more_r) )
+    {
+        memcpy (buf, p->buf_r, info->key_size);
+           *term_index = p->term_index_r + info->term_index_s;
+    }
+    return ( p->more_l || p->more_r);
+}
+
 static int r_count (RSET ct)
 {
     return 0;
@@ -245,10 +289,14 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
             cmp = -2;
         else
             cmp = 2;
+        logf (LOG_DEBUG, "r_read_and looping: m=%d/%d c=%d t=%d",
+                        p->more_l, p->more_r, cmp, p->tail);
+        key_logdump(LOG_DEBUG,p->buf_l);
+        key_logdump(LOG_DEBUG,p->buf_r);
         if (!cmp)
         {
             memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
+               *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
                                   &p->term_index_l);
             p->tail = 1;
@@ -256,23 +304,31 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
         else if (cmp == 1)
         {
             memcpy (buf, p->buf_r, info->key_size);
-           *term_index = p->term_index_r + info->term_index_s;
+               *term_index = p->term_index_r + info->term_index_s;
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
                                   &p->term_index_r);
             p->tail = 1;
+            logf (LOG_DEBUG, "r_read_and returning A m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            key_logdump(LOG_DEBUG,buf);
             return 1;
         }
         else if (cmp == -1)
         {
             memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
+               *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
                                   &p->term_index_l);
             p->tail = 1;
+            logf (LOG_DEBUG, "r_read_and returning B m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            key_logdump(LOG_DEBUG,buf);
             return 1;
         }
         else if (cmp > 1)
         {
+#define OLDCODE 0
+#if OLDCODE
             memcpy (buf, p->buf_r, info->key_size);
             *term_index = p->term_index_r + info->term_index_s;
             
@@ -282,21 +338,87 @@ static int r_read_and (RSFD rfd, void *buf, int *term_index)
             {
                 if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1)
                     p->tail = 0;
+                logf (LOG_DEBUG, "r_read_and returning C m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                key_logdump(LOG_DEBUG,buf);
                 return 1;
             }
+#else
+            
+            if (p->tail)
+            {
+                logf (LOG_DEBUG, "r_read_and returning R tail m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                memcpy (buf, p->buf_r, info->key_size);
+                *term_index = p->term_index_r + info->term_index_s;
+                p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
+                                   &p->term_index_r);
+                if (!p->more_r || (*info->cmp)(p->buf_r, buf) > 1)
+                    p->tail = 0;
+                logf (LOG_DEBUG, "r_read_and returning D m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                key_logdump(LOG_DEBUG,buf);
+                return 1;
+            } else
+            {
+                logf (LOG_DEBUG, "r_read_and about to forward R m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                if (p->more_r && p->more_l)
+                    p->more_r = rset_forward( 
+                                    info->rset_r, p->rfd_r, 
+                                    p->buf_r, &p->term_index_r, 
+                                    (info->cmp), p->buf_l);
+                else 
+                    return 0; /* no point in reading further */
+            }
+#endif
         }
         else
         {
-            memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
-            p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
-                                  &p->term_index_l);
+#if OLDCODE
+             memcpy (buf, p->buf_l, info->key_size);
+             *term_index = p->term_index_l;
+             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
+                                    &p->term_index_l);
+             if (p->tail)
+             {
+                 if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1)
+                     p->tail = 0;
+                 logf (LOG_DEBUG, "r_read_and returning E m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                 key_logdump(LOG_DEBUG,buf);
+                 return 1;
+             }
+#else
             if (p->tail)
             {
+                logf (LOG_DEBUG, "r_read_and returning L tail m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                memcpy (buf, p->buf_l, info->key_size);
+                   *term_index = p->term_index_l;
+                p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
+                                  &p->term_index_l);
                 if (!p->more_l || (*info->cmp)(p->buf_l, buf) > 1)
                     p->tail = 0;
+                 logf (LOG_DEBUG, "r_read_and returning F m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                 key_logdump(LOG_DEBUG,buf);
                 return 1;
             }
+            else
+            {
+                logf (LOG_DEBUG, "r_read_and about to forward L m=%d/%d c=%d",
+                        p->more_l, p->more_r, cmp);
+                if (p->more_r && p->more_l)
+                    p->more_l = rset_forward( 
+                    /* p->more_l = rset_default_forward( */
+                                    info->rset_l, p->rfd_l, 
+                                    p->buf_l, &p->term_index_l, 
+                                    (info->cmp), p->buf_r);
+                else 
+                    return 0; /* no point in reading further */
+            }
+#endif
         }
     }
     return 0;
@@ -320,27 +442,36 @@ static int r_read_or (RSFD rfd, void *buf, int *term_index)
         if (!cmp)
         {
             memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
+               *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
                                   &p->term_index_l);
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
                                   &p->term_index_r);
+            logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            key_logdump(LOG_DEBUG,buf);
             return 1;
         }
         else if (cmp > 0)
         {
             memcpy (buf, p->buf_r, info->key_size);
-           *term_index = p->term_index_r + info->term_index_s;
+               *term_index = p->term_index_r + info->term_index_s;
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
                                   &p->term_index_r);
+            logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            key_logdump(LOG_DEBUG,buf);
             return 1;
         }
         else
         {
             memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
+               *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
                                   &p->term_index_l);
+            logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
+                    p->more_l, p->more_r, cmp);
+            key_logdump(LOG_DEBUG,buf);
             return 1;
         }
     }
@@ -365,14 +496,21 @@ static int r_read_not (RSFD rfd, void *buf, int *term_index)
         if (cmp < -1)
         {
             memcpy (buf, p->buf_l, info->key_size);
-           *term_index = p->term_index_l;
+               *term_index = p->term_index_l;
             p->more_l = rset_read (info->rset_l, p->rfd_l, p->buf_l,
                                   &p->term_index_l);
             return 1;
         }
         else if (cmp > 1)
+#if 0
             p->more_r = rset_read (info->rset_r, p->rfd_r, p->buf_r,
                                   &p->term_index_r);
+#else
+            p->more_r = rset_forward( 
+                            info->rset_r, p->rfd_r, 
+                            p->buf_r, &p->term_index_r, 
+                            (info->cmp), p->buf_l);
+#endif
         else
         {
             memcpy (buf, p->buf_l, info->key_size);