-/* $Id: tstisamb.c,v 1.7 2004-08-03 14:54:41 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: tstisamb.c,v 1.16 2005-01-15 19:38:31 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
*/
#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(LOG_DEBUG, "%s %d", txt, x);
+ yaz_log(YLOG_DEBUG, "%s %d", txt, x);
}
static void log_pr(const char *txt)
{
- yaz_log(LOG_DEBUG, "%s", txt);
+ yaz_log(YLOG_DEBUG, "%s", txt);
}
int compare_item(const void *a, const void *b)
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);
void code_reset(void *p)
{
}
-void code_stop(int mode, void *p)
+void code_stop(void *p)
{
}
struct read_info {
int no;
+ int step;
int max;
+ int insertMode;
};
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;
memcpy (*dst, &x, sizeof(int));
(*dst)+=sizeof(int);
- (ri->no)++;
- *insertMode = 1;
+ ri->no = ri->no + ri->step;
+ *insertMode = ri->insertMode;
return 1;
}
-void tst_forward(ISAMB isb, int n)
+void tst_insert(ISAMB isb, int n)
{
ISAMC_I isamc_i;
ISAMC_P isamc_p;
struct read_info ri;
- int i;
ISAMB_PP pp;
+ char key_buf[10];
+ int nerrs = 0;
/* insert a number of entries */
ri.no = 0;
+ ri.step = 1;
ri.max = n;
+ ri.insertMode = 1;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
/* read the entries */
- pp = isamb_pp_open (isb, isamc_p);
-
- for (i = 0; i<ri.max; i +=2 )
+ pp = isamb_pp_open (isb, isamc_p, 1);
+
+ ri.no = 0;
+ while(isamb_pp_read (pp, key_buf))
{
- int x = -1;
- int xu = i;
- isamb_pp_forward(pp, &x, &xu);
- if (x != xu && xu != x+1)
+ int x;
+ memcpy (&x, key_buf, sizeof(int));
+ if (x != ri.no)
{
- yaz_log(LOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
- x, xu);
- exit(4);
+ yaz_log(YLOG_WARN, "isamb_pp_read. n=%d Got %d (expected %d)",
+ n, x, ri.no);
+ nerrs++;
}
+ else if (nerrs)
+ yaz_log(YLOG_LOG, "isamb_pp_read. n=%d Got %d",
+ n, x);
+
ri.no++;
}
- isamb_pp_close(pp);
-
- pp = isamb_pp_open (isb, isamc_p);
- for (i = 0; i<ri.max; i += 100)
+ if (ri.no != ri.max)
{
- int x = -1;
- 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, xu);
- exit(4);
- }
- ri.no++;
+ yaz_log(YLOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
+ nerrs++;
}
+ isamb_dump(isb, isamc_p, log_pr);
isamb_pp_close(pp);
- isamb_unlink(isb, isamc_p);
+ if (nerrs)
+ exit(3);
+ /* delete a number of entries (even ones) */
+ ri.no = 0;
+ ri.step = 2;
+ ri.max = n;
+ ri.insertMode = 0;
+
+ isamc_i.clientData = &ri;
+ isamc_i.read_item = code_read;
+
+ isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
+
+ /* delete a number of entries (odd ones) */
+ ri.no = 1;
+ ri.step = 2;
+ ri.max = n;
+ ri.insertMode = 0;
+
+ isamc_i.clientData = &ri;
+ isamc_i.read_item = code_read;
+
+ isamc_p = isamb_merge (isb, isamc_p , &isamc_i);
+
+ if (isamc_p)
+ {
+ yaz_log(YLOG_WARN, "isamb_merge did not return empty list");
+ exit(3);
+ }
}
-void tst_insert(ISAMB isb, int n)
+void tst_forward(ISAMB isb, int n)
{
ISAMC_I isamc_i;
ISAMC_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.step = 1;
ri.max = n;
+ ri.insertMode = 1;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_p = isamb_merge (isb, 0 /* new list */ , &isamc_i);
/* read the entries */
- pp = isamb_pp_open (isb, isamc_p);
+ pp = isamb_pp_open (isb, isamc_p, 1);
- ri.no = 0;
- while(isamb_pp_read (pp, key_buf))
+ for (i = 0; i<ri.max; i +=2 )
{
- int x;
- memcpy (&x, key_buf, sizeof(int));
- if (x != ri.no)
+ int x = -1;
+ int xu = i;
+ isamb_pp_forward(pp, &x, &xu);
+ if (x != xu && xu != x+1)
{
- yaz_log(LOG_WARN, "isamb_pp_read. Got %d (expected %d)",
- x, ri.no);
- exit(3);
+ yaz_log(YLOG_WARN, "isamb_pp_forward (1). Got %d (expected %d)",
+ x, xu);
+ exit(4);
}
ri.no++;
}
- if (ri.no != ri.max)
+ isamb_pp_close(pp);
+
+ pp = isamb_pp_open (isb, isamc_p, 1);
+ for (i = 0; i<ri.max; i += 100)
{
- yaz_log(LOG_WARN, "ri.max != ri.max (%d != %d)", ri.no, ri.max);
- exit(3);
+ int x = -1;
+ int xu = i;
+ isamb_pp_forward(pp, &x, &xu);
+ if (x != xu && xu != x+1)
+ {
+ yaz_log(YLOG_WARN, "isamb_pp_forward (2). Got %d (expected %d)",
+ x, xu);
+ exit(4);
+ }
+ ri.no++;
}
isamb_pp_close(pp);
- isamb_dump(isb, isamc_p, log_pr);
isamb_unlink(isb, isamc_p);
}
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);
}
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);
}
tst_insert(isb, 1);