From: Adam Dickmeiss Date: Thu, 27 Oct 2005 09:09:52 +0000 (+0000) Subject: Tests for identical keys in ISAMB X-Git-Tag: before.bug.529~310 X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=506e2c39ef2e84e1bfdf96715fdd98d00dade948 Tests for identical keys in ISAMB --- diff --git a/isamb/tstisamb.c b/isamb/tstisamb.c index 1a75c5d..048e6cb 100644 --- a/isamb/tstisamb.c +++ b/isamb/tstisamb.c @@ -1,4 +1,4 @@ -/* $Id: tstisamb.c,v 1.21 2005-04-14 07:48:57 adam Exp $ +/* $Id: tstisamb.c,v 1.22 2005-10-27 09:09:52 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -72,8 +72,10 @@ void code_stop(void *p) } struct read_info { - int no; + int val; int step; + + int no; int max; int insertMode; }; @@ -85,12 +87,18 @@ int code_read(void *vp, char **dst, int *insertMode) 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 = ri->no + ri->step; + ri->val = ri->val + ri->step; *insertMode = ri->insertMode; + +#if 1 + yaz_log(YLOG_DEBUG, "%d %5d", ri->insertMode, x); +#endif return 1; } @@ -100,13 +108,15 @@ void tst_insert(ISAMB isb, int n) ISAM_P isamc_p; struct read_info ri; ISAMB_PP pp; - char key_buf[10]; + char key_buf[20]; int nerrs = 0; /* insert a number of entries */ ri.no = 0; - ri.step = 1; ri.max = n; + + ri.val = 0; + ri.step = 1; ri.insertMode = 1; isamc_i.clientData = &ri; @@ -118,26 +128,26 @@ void tst_insert(ISAMB isb, int n) /* read the entries */ pp = isamb_pp_open (isb, isamc_p, 1); - ri.no = 0; + ri.val = 0; while(isamb_pp_read (pp, key_buf)) { int x; memcpy (&x, key_buf, sizeof(int)); - if (x != ri.no) + if (x != ri.val) { yaz_log(YLOG_WARN, "isamb_pp_read. n=%d Got %d (expected %d)", - n, x, ri.no); + n, x, ri.val); nerrs++; } else if (nerrs) yaz_log(YLOG_LOG, "isamb_pp_read. n=%d Got %d", n, x); - ri.no++; + ri.val++; } - if (ri.no != ri.max) + if (ri.val != ri.max) { - yaz_log(YLOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max); + yaz_log(YLOG_WARN, "ri.max != ri.max (%d != %d)", ri.val, ri.max); nerrs++; } isamb_dump(isb, isamc_p, log_pr); @@ -147,8 +157,10 @@ void tst_insert(ISAMB isb, int n) exit(3); /* delete a number of entries (even ones) */ ri.no = 0; + ri.max = n - n/2; + + ri.val = 0; ri.step = 2; - ri.max = n; ri.insertMode = 0; isamc_i.clientData = &ri; @@ -157,9 +169,11 @@ void tst_insert(ISAMB isb, int n) isamb_merge (isb, &isamc_p , &isamc_i); /* delete a number of entries (odd ones) */ - ri.no = 1; + ri.no = 0; + ri.max = n/2; + + ri.val = 1; ri.step = 2; - ri.max = n; ri.insertMode = 0; isamc_i.clientData = &ri; @@ -169,7 +183,8 @@ void tst_insert(ISAMB isb, int n) if (isamc_p) { - yaz_log(YLOG_WARN, "isamb_merge did not return empty list"); + yaz_log(YLOG_WARN, "isamb_merge did not return empty list n=%d", + n); exit(3); } } @@ -183,9 +198,11 @@ void tst_forward(ISAMB isb, int n) ISAMB_PP pp; /* insert a number of entries */ + ri.val = 0; + ri.max = n; + ri.no = 0; ri.step = 1; - ri.max = n; ri.insertMode = 1; isamc_i.clientData = &ri; @@ -239,16 +256,20 @@ void tst_x(ISAMB isb) isamc_i.clientData = &ri; isamc_i.read_item = code_read; - ri.no = 1000; + ri.no = 0; + ri.max = 500; + + ri.val = 1000; ri.step = 1; - ri.max = 1500; ri.insertMode = 1; isamb_merge (isb, &isamb_p , &isamc_i); - ri.no = 1; - ri.step = 1; + ri.no = 0; ri.max = 500; + + ri.val = 1; + ri.step = 1; ri.insertMode = 1; isamb_merge (isb, &isamb_p , &isamc_i); @@ -266,8 +287,10 @@ void tst_append(ISAMB isb, int n) { /* insert a number of entries */ ri.no = 0; - ri.step = 1; ri.max = i + chunk; + + ri.val = 0; + ri.step = 1; ri.insertMode = 1; isamc_i.clientData = &ri; @@ -277,6 +300,227 @@ void tst_append(ISAMB isb, int n) } } + +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; + + 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); + + 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