X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamb%2Ftstisamb.c;h=a85b27687d3c5145f91ae6043b9491c5e2dda6d3;hp=872ef0a1e1ae62bf8a300e2bc796c2d1e128d1b6;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hpb=892728fe00debf2b9176e0bc7517a73113f6660b

diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c
index 872ef0a..a85b276 100644
--- a/isamb/tstisamb.c
+++ b/isamb/tstisamb.c
@@ -1,6 +1,6 @@
-/* $Id: tstisamb.c,v 1.4 2004-06-02 07:51:52 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: tstisamb.c,v 1.23 2006-05-10 08:13:27 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,27 +20,44 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
+#include <stdlib.h>
 #include <string.h>
-#include <yaz/xmalloc.h>
 #include <yaz/log.h>
-#include <isamb.h>
+#include <yaz/xmalloc.h>
+#include <idzebra/isamb.h>
 #include <assert.h>
 
+static void log_item(int level, const void *b, const char *txt)
+{
+    int x;
+    memcpy(&x, b, sizeof(int));
+    yaz_log(YLOG_DEBUG, "%s %d", txt, x);
+}
+
+static void log_pr(const char *txt)
+{
+    yaz_log(YLOG_DEBUG, "%s", txt);
+}
+
 int compare_item(const void *a, const void *b)
 {
     int ia, ib;
 
     memcpy(&ia, a, sizeof(int));
     memcpy(&ib, b, sizeof(int));
-    return ia - ib;
+    if (ia > ib)
+	return 1;
+    if (ia < ib)
+	return -1;
+   return 0;
 }
 
-void *code_start(int mode)
+void *code_start()
 {
     return 0;
 }
 
-void code_item(int mode, void *p, char **dst, char **src)
+void code_item(void *p, char **dst, const char **src)
 {
     memcpy (*dst, *src, sizeof(int));
     (*dst) += sizeof(int);
@@ -50,13 +67,17 @@ void code_item(int mode, void *p, char **dst, char **src)
 void code_reset(void *p)
 {
 }
-void code_stop(int mode, void *p)
+void code_stop(void *p)
 {
 }
 
 struct read_info {
+    int val;
+    int step;
+
     int no;
     int max;
+    int insertMode;
 };
 
 int code_read(void *vp, char **dst, int *insertMode)
@@ -64,48 +85,143 @@ int code_read(void *vp, char **dst, int *insertMode)
     struct read_info *ri = (struct read_info *)vp;
     int x;
 
-    if (ri->no > ri->max)
-	exit(3);
-    if (ri->no == ri->max)
+    if (ri->no >= ri->max)
 	return 0;
-    x = ri->no;
+    ri->no++;
+
+    x = ri->val;
     memcpy (*dst, &x, sizeof(int));
     (*dst)+=sizeof(int);
 
-    (ri->no)++;
-    *insertMode = 1;
+    ri->val = ri->val + ri->step;
+    *insertMode = ri->insertMode;
+
+#if 1
+    yaz_log(YLOG_DEBUG, "%d %5d", ri->insertMode, x);
+#endif
     return 1;
 }
 
+void tst_insert(ISAMB isb, int n)
+{
+    ISAMC_I isamc_i;
+    ISAM_P isamc_p;
+    struct read_info ri;
+    ISAMB_PP pp;
+    char key_buf[20];
+    int nerrs = 0;
+
+    /* insert a number of entries */
+    ri.no = 0;
+    ri.max = n;
+
+    ri.val = 0;
+    ri.step = 1;
+    ri.insertMode = 1;
+
+    isamc_i.clientData = &ri;
+    isamc_i.read_item = code_read;
+    
+    isamc_p = 0; /* new list */
+    isamb_merge (isb, &isamc_p , &isamc_i);
+
+    /* read the entries */
+    pp = isamb_pp_open (isb, isamc_p, 1);
+
+    ri.val = 0;
+    while(isamb_pp_read (pp, key_buf))
+    {
+	int x;
+	memcpy (&x, key_buf, sizeof(int));
+	if (x != ri.val)
+	{
+	    yaz_log(YLOG_WARN, "isamb_pp_read. n=%d Got %d (expected %d)",
+		    n, x, ri.val);
+	    nerrs++;
+	}
+	else if (nerrs)
+	    yaz_log(YLOG_LOG, "isamb_pp_read. n=%d Got %d",
+		    n, x);
+
+	ri.val++;
+    }
+    if (ri.val != ri.max)
+    {
+	yaz_log(YLOG_WARN, "ri.max != ri.max (%d != %d)", ri.val, ri.max);
+	nerrs++;
+    }
+    isamb_dump(isb, isamc_p, log_pr);
+    isamb_pp_close(pp);
+
+    if (nerrs)
+        exit(3);
+    /* delete a number of entries (even ones) */
+    ri.no = 0;
+    ri.max = n - n/2;
+
+    ri.val = 0;
+    ri.step = 2;
+    ri.insertMode = 0;
+
+    isamc_i.clientData = &ri;
+    isamc_i.read_item = code_read;
+    
+    isamb_merge (isb, &isamc_p , &isamc_i);
+
+    /* delete a number of entries (odd ones) */
+    ri.no = 0;
+    ri.max = n/2;
+
+    ri.val = 1;
+    ri.step = 2;
+    ri.insertMode = 0;
+
+    isamc_i.clientData = &ri;
+    isamc_i.read_item = code_read;
+    
+    isamb_merge (isb, &isamc_p, &isamc_i);
+
+    if (isamc_p)
+    {
+	yaz_log(YLOG_WARN, "isamb_merge did not return empty list n=%d",
+		n);
+	exit(3);
+    }
+}
+
 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;
-    char key_buf[10];
 
     /* insert a number of entries */
-    ri.no = 0;
+    ri.val = 0;
     ri.max = n;
 
+    ri.no = 0;
+    ri.step = 1;
+    ri.insertMode = 1;
+
     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);
+    pp = isamb_pp_open (isb, isamc_p, 1);
     
-    for (i = 0; i<ri.max; i++)
+    for (i = 0; i<ri.max; i +=2 )
     {
 	int x = -1;
 	int xu = i;
 	isamb_pp_forward(pp, &x, &xu);
-	if (x != xu)
+	if (x != xu && xu != x+1)
 	{
-	    yaz_log(LOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
+	    yaz_log(YLOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
 		    x, xu);
 	    exit(4);
 	}
@@ -113,16 +229,16 @@ void tst_forward(ISAMB isb, int n)
     }
     isamb_pp_close(pp);
     
-    pp = isamb_pp_open (isb, isamc_p);
+    pp = isamb_pp_open (isb, isamc_p, 1);
     for (i = 0; i<ri.max; i += 100)
     {
 	int x = -1;
-	int xuntil = i;
-	isamb_pp_forward(pp, &x, &xuntil);
-	if (x > xuntil)
+	int xu = i;
+	isamb_pp_forward(pp, &x, &xu);
+	if (x != xu && xu != x+1)
 	{
-	    yaz_log(LOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
-		    x, xuntil);
+	    yaz_log(YLOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
+		    x, xu);
 	    exit(4);
 	}
 	ri.no++;
@@ -132,51 +248,277 @@ void tst_forward(ISAMB isb, int n)
     isamb_unlink(isb, isamc_p);
 }
 
-void tst_insert(ISAMB isb, int n)
+void tst_x(ISAMB isb)
 {
     ISAMC_I isamc_i;
-    ISAMC_P isamc_p;
+    ISAM_P isamb_p = 0;
     struct read_info ri;
-    ISAMB_PP pp;
-    char key_buf[10];
-
-    /* insert a number of entries */
-    ri.no = 0;
-    ri.max = n;
 
     isamc_i.clientData = &ri;
     isamc_i.read_item = code_read;
+    ri.no = 0;
+    ri.max = 500;
+
+    ri.val = 1000;
+    ri.step = 1;
+    ri.insertMode = 1;
+
+    isamb_merge (isb, &isamb_p , &isamc_i);
+
+    ri.no = 0;
+    ri.max = 500;
+
+    ri.val = 1;
+    ri.step = 1;
+    ri.insertMode = 1;
+
+    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.max = i + chunk;
+
+	ri.val = 0;
+	ri.step = 1;
+	ri.insertMode = 1;
+	
+	isamc_i.clientData = &ri;
+	isamc_i.read_item = code_read;
+	
+	isamb_merge (isb, &isamb_p , &isamc_i);
+    }
+}
+
+
+struct random_read_info {
+    int max;
+    int idx;
+    int level;
+    int *delta;
+};
+
+int tst_random_read(void *vp, char **dst, int *insertMode)
+{
+    struct random_read_info *ri = (struct random_read_info *)vp;
+    int x;
+
+    while(ri->idx < ri->max && ri->delta[ri->idx] == ri->level)
+    {
+	ri->idx++;
+	ri->level = 0;
+    }
+    if (ri->idx >= ri->max)
+	return 0;
     
-    isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
+    if (ri->delta[ri->idx] > 0)
+    {
+	ri->level++;
+	*insertMode = 1;
+    }
+    else
+    {
+	ri->level--;
+	*insertMode = 0;
+    }
+    x = ri->idx;
+    memcpy (*dst, &x, sizeof(int));
+    (*dst)+=sizeof(int);
 
-    /* read the entries */
-    pp = isamb_pp_open (isb, isamc_p);
+    yaz_log(YLOG_DEBUG, "%d %5d", *insertMode, x);
+    return 1;
+}
+
+void tst_random(ISAMB isb, int n, int rounds, int max_dups)
+{
+    ISAM_P isamb_p = 0;
+
+    int *freq = malloc(sizeof(int) * n);
+    int *delta = malloc(sizeof(int) * n);
+    int i, j;
+    for (i = 0; i<n; i++)
+	freq[i] = 0;
     
-    ri.no = 0;
-    while(isamb_pp_read (pp, key_buf))
+    for (j = 0; j<rounds; j++)
     {
-	int x;
-	memcpy (&x, key_buf, sizeof(int));
-	if (x != ri.no)
+	yaz_log(YLOG_DEBUG, "round %d", j);
+	for (i = 0; i<n; i++)
 	{
-	    yaz_log(LOG_WARN, "isamb_pp_read. Got %d (expected %d)",
-		    x, ri.no);
-	    exit(3);
+	    if (rand() & 1)
+		delta[i] = (rand() % (1+max_dups)) - freq[i];
+	    else
+		delta[i] = 0;
+	}
+	if (n)
+	{
+	    ISAMC_I isamc_i;
+	    struct random_read_info ri;
+	    
+	    ri.delta = delta;
+	    ri.idx = 0;
+	    ri.max = n;
+	    ri.level = 0;
+	    
+	    isamc_i.clientData = &ri;
+	    isamc_i.read_item = tst_random_read;
+
+	    isamb_merge (isb, &isamb_p , &isamc_i);
+	}
+	
+	yaz_log(YLOG_DEBUG, "dump %d", j);
+	isamb_dump(isb, isamb_p, log_pr);
+
+	yaz_log(YLOG_DEBUG, "----------------------------");
+	for (i = 0; i<n; i++)
+	    freq[i] += delta[i];
+
+	if (!isamb_p)
+	{
+	    for (i = 0; i<n; i++)
+		if (freq[i])
+		{
+		    yaz_log(YLOG_WARN, "isamb_merge returned 0, but "
+			    "freq is non-empty");
+		    exit(1);
+		}
+	}
+	else
+	{
+	    int level = 0;
+	    int idx = 0;
+	    char key_buf[20];
+	    ISAMB_PP pp = isamb_pp_open (isb, isamb_p, 1);
+
+	    yaz_log(YLOG_DEBUG, "test %d", j);
+
+	    while(isamb_pp_read (pp, key_buf))
+	    {
+		int x;
+		memcpy (&x, key_buf, sizeof(int));
+		yaz_log(YLOG_DEBUG, "Got %d", x);
+		while (idx < n && freq[idx] == level)
+		{
+		    idx++;
+		    level = 0;
+		}
+		if (idx == n)
+		{
+		    yaz_log(YLOG_WARN, "tst_random: Extra item: %d", x);
+		    exit(1);
+		}
+		if (idx != x)
+		{
+		    yaz_log(YLOG_WARN, "tst_random: Mismatch %d != %d",
+			    x, idx);
+		    exit(1);
+		}
+		level++;
+	    }
+	    while (idx < n && freq[idx] == level)
+	    {
+		idx++;
+		level = 0;
+	    }
+	    if (idx != n)
+	    {
+		yaz_log(YLOG_WARN, "tst_random: Missing item: %d", idx);
+		exit(1);
+	    }
+	    isamb_pp_close(pp);
 	}
-	ri.no++;
     }
-    if (ri.no != ri.max)
+    free(freq);
+    free(delta);
+}
+
+/* \fn void tst_minsert(ISAMB isb, int n)
+   \brief insert inserts n identical keys, removes n/2, then n-n/2 ..
+   \param isb ISAMB handle
+   \param n number of keys
+*/
+void tst_minsert(ISAMB isb, int n)
+{
+    ISAMC_I isamc_i;
+    ISAM_P isamb_p = 0;
+    struct read_info ri;
+
+    isamc_i.clientData = &ri;
+
+    /* all have same value = 1 */
+    ri.val = 1;  
+    ri.step = 0;
+
+    isamc_i.read_item = code_read;
+
+    ri.no = 0;
+    ri.max = n;
+
+    ri.insertMode = 1;
+
+    isamb_merge (isb, &isamb_p , &isamc_i);
+
+    isamb_dump(isb, isamb_p, log_pr);
+    
+    ri.no = 0;
+    ri.max = n - n/2;
+
+    ri.insertMode = 0;
+
+    isamb_merge (isb, &isamb_p , &isamc_i);
+
+    ri.no = 0;
+    ri.max = n/2;
+
+    ri.insertMode = 0;
+
+    isamb_merge (isb, &isamb_p , &isamc_i);
+    if (isamb_p)
     {
-	yaz_log(LOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
-	exit(3);
+	yaz_log(YLOG_WARN, "tst_minsert: isamb_merge should be empty n=%d",
+		n);
+	exit(1);
     }
-    isamb_pp_close(pp);
-
-    isamb_unlink(isb, isamc_p);
 }
 
-static void log_item(int level, const void *b, const char *txt)
+/* tests for identical keys.. ISAMB does not handle that, so some of the
+   tests below fails
+*/
+static void identical_keys_tests(ISAMB isb)
 {
+#if 1
+    tst_minsert(isb, 10);
+#endif
+#if 0
+    tst_minsert(isb, 600);  /* still fails */
+#endif
+#if 1
+    tst_random(isb, 20, 200, 1);
+#endif
+#if 1
+    tst_random(isb, 5, 200, 2);
+#endif
+
+#if 1
+    tst_random(isb, 250, 10, 4);
+#endif
+#if 1
+    /* fails if both are executed */
+    tst_random(isb, 20000, 10, 4);
+    tst_random(isb, 20000, 10, 10);
+#endif
+#if 1
+    tst_random(isb, 250, 100, 10);
+#endif
 }
 
 int main(int argc, char **argv)
@@ -186,21 +528,22 @@ int main(int argc, char **argv)
     ISAMC_M method;
     
     if (argc == 2)
-	yaz_log_init_level(LOG_ALL);
+	yaz_log_init_level(YLOG_ALL);
 	
     /* setup method (attributes) */
     method.compare_item = compare_item;
     method.log_item = log_item;
-    method.code_start = code_start;
-    method.code_item = code_item;
-    method.code_reset = code_reset;
-    method.code_stop = code_stop;
+    method.codec.start = code_start;
+    method.codec.encode = code_item;
+    method.codec.decode = code_item;
+    method.codec.reset = code_reset;
+    method.codec.stop = code_stop;
 
     /* create block system */
     bfs = bfs_create(0, 0);
     if (!bfs)
     {
-	yaz_log(LOG_WARN, "bfs_create failed");
+	yaz_log(YLOG_WARN, "bfs_create failed");
 	exit(1);
     }
 
@@ -210,17 +553,27 @@ int main(int argc, char **argv)
     isb = isamb_open (bfs, "isamb", 1, &method, 0);
     if (!isb)
     {
-	yaz_log(LOG_WARN, "isamb_open failed");
+	yaz_log(YLOG_WARN, "isamb_open failed");
 	exit(2);
     }
+#if 1
     tst_insert(isb, 1);
     tst_insert(isb, 2);
     tst_insert(isb, 20);
     tst_insert(isb, 100);
     tst_insert(isb, 500);
     tst_insert(isb, 10000);
+
     tst_forward(isb, 10000);
-    /* close isam handle */
+
+    tst_x(isb);
+
+    tst_append(isb, 1000);
+#endif
+
+    if (0)
+	identical_keys_tests(isb);
+    
     isamb_close(isb);
 
     /* exit block system */
@@ -228,3 +581,11 @@ int main(int argc, char **argv)
     exit(0);
     return 0;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+