-#include <ccan/tdb2/tdb.c>
-#include <ccan/tdb2/free.c>
-#include <ccan/tdb2/lock.c>
-#include <ccan/tdb2/io.c>
-#include <ccan/tdb2/hash.c>
-#include <ccan/tdb2/check.c>
-#include <ccan/tdb2/summary.c>
+#include "tdb2-source.h"
#include <ccan/tap/tap.h>
#include "logging.h"
struct tdb_context *tdb;
int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
- TDB_NOMMAP|TDB_CONVERT };
+ TDB_NOMMAP|TDB_CONVERT,
+ TDB_INTERNAL|TDB_VERSION1, TDB_VERSION1,
+ TDB_NOMMAP|TDB_VERSION1,
+ TDB_INTERNAL|TDB_CONVERT|TDB_VERSION1,
+ TDB_CONVERT|TDB_VERSION1,
+ TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
struct tdb_data key = { (unsigned char *)&j, sizeof(j) };
struct tdb_data data = { (unsigned char *)&j, sizeof(j) };
char *summary;
- plan_tests(sizeof(flags) / sizeof(flags[0]) * (1 + 2 * 17) + 1);
+ plan_tests(sizeof(flags) / sizeof(flags[0]) * (1 + 2 * 5) + 1);
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
tdb = tdb_open("run-summary.tdb", flags[i],
O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
for (j = 0;
j <= TDB_SUMMARY_HISTOGRAMS;
j += TDB_SUMMARY_HISTOGRAMS) {
- summary = tdb_summary(tdb, j);
+ ok1(tdb_summary(tdb, j, &summary) == TDB_SUCCESS);
ok1(strstr(summary, "Number of records: 500\n"));
ok1(strstr(summary, "Smallest/average/largest keys: 4/4/4\n"));
ok1(strstr(summary, "Smallest/average/largest data: 0/2/4\n"));
- ok1(strstr(summary, "Free bucket 16:"));
- ok1(strstr(summary, "Free bucket 24:"));
- ok1(strstr(summary, "Free bucket 32:"));
- ok1(strstr(summary, "Free bucket 40:"));
- ok1(strstr(summary, "Free bucket 48:"));
- ok1(strstr(summary, "Free bucket 56:"));
- ok1(strstr(summary, "Free bucket 64:"));
- ok1(strstr(summary, "Free bucket 72:"));
- ok1(strstr(summary, "Free bucket 80:"));
- ok1(strstr(summary, "Free bucket 88-136:"));
- ok1(strstr(summary, "Free bucket 144-264:"));
- ok1(strstr(summary, "Free bucket 272-520:"));
- ok1(strstr(summary, "Free bucket 528-1032:"));
- if (j == TDB_SUMMARY_HISTOGRAMS)
+ if (!(flags[i] & TDB_VERSION1)
+ && j == TDB_SUMMARY_HISTOGRAMS) {
ok1(strstr(summary, "|")
&& strstr(summary, "*"));
- else
+ } else {
ok1(!strstr(summary, "|")
&& !strstr(summary, "*"));
+ }
free(summary);
}
tdb_close(tdb);