Get rid of typedefs iSAMS_P, ISAMC_P, ISAMB_P and use ISAM_P instead.

[idzebra-moved-to-github.git] / isamb / tstisamb.c

diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c
index 17f2a38..d815089 100644 (file)
--- a/isamb/tstisamb.c
+++ b/isamb/tstisamb.c
@@ -1,6 +1,6 @@
-/* $Id: tstisamb.c,v 1.14 2005-01-02 18:51:31 adam Exp $
+/* $Id: tstisamb.c,v 1.20 2005-04-13 13:03:48 adam Exp $
    Copyright (C) 1995-2005
-   Index Data Aps
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,6 +20,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+#include <stdlib.h>
 #include <string.h>
 #include <yaz/log.h>
 #include <yaz/xmalloc.h>
@@ -96,7 +97,7 @@ int code_read(void *vp, char **dst, int *insertMode)
 void tst_insert(ISAMB isb, int n)
 {
     ISAMC_I isamc_i;
-    ISAMC_P isamc_p;
+    ISAM_P isamc_p;
     struct read_info ri;
     ISAMB_PP pp;
     char key_buf[10];
@@ -111,7 +112,8 @@ void tst_insert(ISAMB isb, int n)
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
     
-    isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
+    isamc_p = 0; /* new list */
+    isamb_merge (isb, &isamc_p , &isamc_i);
 
     /* read the entries */
     pp = isamb_pp_open (isb, isamc_p, 1);
@@ -143,7 +145,6 @@ void tst_insert(ISAMB isb, int n)
 
     if (nerrs)
         exit(3);
-    return;
     /* delete a number of entries (even ones) */
     ri.no = 0;
     ri.step = 2;
@@ -153,10 +154,10 @@ void tst_insert(ISAMB isb, int n)
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
     
-    isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
+    isamb_merge (isb, &isamc_p , &isamc_i);
 
     /* delete a number of entries (odd ones) */
-    ri.no = 0;
+    ri.no = 1;
     ri.step = 2;
     ri.max = n;
     ri.insertMode = 0;
@@ -164,7 +165,7 @@ void tst_insert(ISAMB isb, int n)
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
     
-    isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
+    isamb_merge (isb, &isamc_p, &isamc_i);
 
     if (isamc_p)
     {
@@ -176,7 +177,7 @@ void tst_insert(ISAMB isb, int n)
 void tst_forward(ISAMB isb, int n)
 {
     ISAMC_I isamc_i;
-    ISAMC_P isamc_p;
+    ISAM_P isamc_p;
     struct read_info ri;
     int i;
     ISAMB_PP pp;
@@ -190,7 +191,8 @@ void tst_forward(ISAMB isb, int n)
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
     
-    isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
+    isamc_p = 0;
+    isamb_merge (isb, &isamc_p, &isamc_i);
 
     /* read the entries */
     pp = isamb_pp_open (isb, isamc_p, 1);
@@ -229,6 +231,50 @@ void tst_forward(ISAMB isb, int n)
     isamb_unlink(isb, isamc_p);
 }
 
+void tst_x(ISAMB isb)
+{
+    ISAMC_I isamc_i;
+    ISAM_P isamb_p = 0;
+    struct read_info ri;
+
+    isamc_i.clientData = &ri;
+    isamc_i.read_item = code_read;
+    ri.no = 1000;
+    ri.step = 1;
+    ri.max = 1500;
+
+    isamb_merge (isb, &isamb_p , &isamc_i);
+
+    ri.no = 1;
+    ri.step = 1;
+    ri.max = 500;
+
+    isamb_merge (isb, &isamb_p , &isamc_i);
+}
+
+void tst_append(ISAMB isb, int n)
+{
+    ISAMC_I isamc_i;
+    ISAM_P isamb_p = 0;
+    struct read_info ri;
+    int i;
+    int chunk = 10;
+
+    for (i = 0; i < n; i += chunk)
+    {
+       /* insert a number of entries */
+       ri.no = 0;
+       ri.step = 1;
+       ri.max = i + chunk;
+       ri.insertMode = 1;
+       
+       isamc_i.clientData = &ri;
+       isamc_i.read_item = code_read;
+       
+       isamb_merge (isb, &isamb_p , &isamc_i);
+    }
+}
+
 int main(int argc, char **argv)
 {
     BFiles bfs;
@@ -270,7 +316,12 @@ int main(int argc, char **argv)
     tst_insert(isb, 100);
     tst_insert(isb, 500);
     tst_insert(isb, 10000);
+
     tst_forward(isb, 10000);
+
+    tst_x(isb);
+
+    tst_append(isb, 1000);
     /* close isam handle */
     isamb_close(isb);