#include <stdlib.h>
#include <err.h>
-static unsigned int tdb1_dumb_hash(TDB_DATA *key)
+static uint64_t tdb1_dumb_hash(const void *key, size_t len, uint64_t seed,
+ void *unused)
{
- return key->dsize;
+ return len;
}
-static void log_fn(struct tdb1_context *tdb, enum tdb_log_level level,
+static void log_fn(struct tdb_context *tdb, enum tdb_log_level level,
enum TDB_ERROR ecode, const char *message, void *priv)
{
unsigned int *count = priv;
return hdr.rwlocks;
}
-static unsigned int jenkins_hashfn(TDB_DATA *key)
+static uint64_t jenkins_hashfn(const void *key, size_t len, uint64_t seed,
+ void *unused)
{
- return hashlittle(key->dptr, key->dsize);
+ return hashlittle(key, len);
}
-static unsigned int old_hash(TDB_DATA *key)
+static uint64_t old_hash(const void *key, size_t len, uint64_t seed,
+ void *unused)
{
- return tdb1_old_hash(key);
+ return tdb1_old_hash(key, len, seed, unused);
}
int main(int argc, char *argv[])
{
- struct tdb1_context *tdb;
+ struct tdb_context *tdb;
unsigned int log_count, flags;
TDB_DATA d;
- struct tdb1_logging_context log_ctx = { log_fn, &log_count };
+ union tdb_attribute log_attr, jhash_attr, ohash_attr,
+ incompat_hash_attr, dumbhash_attr;
+
+ log_attr.base.attr = TDB_ATTRIBUTE_LOG;
+ log_attr.base.next = NULL;
+ log_attr.log.fn = log_fn;
+ log_attr.log.data = &log_count;
+
+ jhash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+ jhash_attr.base.next = &log_attr;
+ jhash_attr.hash.fn = jenkins_hashfn;
+
+ ohash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+ ohash_attr.base.next = &log_attr;
+ ohash_attr.hash.fn = old_hash;
+
+ incompat_hash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+ incompat_hash_attr.base.next = &log_attr;
+ incompat_hash_attr.hash.fn = tdb1_incompatible_hash;
+
+ dumbhash_attr.base.attr = TDB_ATTRIBUTE_HASH;
+ dumbhash_attr.base.next = &log_attr;
+ dumbhash_attr.hash.fn = tdb1_dumb_hash;
plan_tests(38 * 2);
- for (flags = 0; flags <= TDB1_CONVERT; flags += TDB1_CONVERT) {
+ for (flags = 0; flags <= TDB_CONVERT; flags += TDB_CONVERT) {
unsigned int rwmagic = TDB1_HASH_RWLOCK_MAGIC;
- if (flags & TDB1_CONVERT)
+ if (flags & TDB_CONVERT)
tdb1_convert(&rwmagic, sizeof(rwmagic));
/* Create an old-style hash. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0, flags,
- O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx,
- NULL);
+ tdb = tdb1_open("run-incompatible.tdb", flags,
+ O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr);
ok1(tdb);
ok1(log_count == 0);
d.dptr = (void *)"Hello";
/* We can still open any old-style with incompat hash. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0,
- TDB_DEFAULT,
- O_RDWR, 0600, &log_ctx,
- tdb1_incompatible_hash);
+ tdb = tdb1_open("run-incompatible.tdb",
+ TDB_DEFAULT,
+ O_RDWR, 0600, &incompat_hash_attr);
ok1(tdb);
ok1(log_count == 0);
d = tdb1_fetch(tdb, d);
tdb1_close(tdb);
log_count = 0;
- tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDONLY,
- 0, &log_ctx, jenkins_hashfn);
+ tdb = tdb1_open("test/jenkins-le-hash.tdb1", 0, O_RDONLY,
+ 0, &jhash_attr);
ok1(tdb);
ok1(log_count == 0);
ok1(tdb1_check(tdb, NULL, NULL) == 0);
tdb1_close(tdb);
log_count = 0;
- tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDONLY,
- 0, &log_ctx, jenkins_hashfn);
+ tdb = tdb1_open("test/jenkins-be-hash.tdb1", 0, O_RDONLY,
+ 0, &jhash_attr);
ok1(tdb);
ok1(log_count == 0);
ok1(tdb1_check(tdb, NULL, NULL) == 0);
/* OK, now create with incompatible hash. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0,
- flags,
- O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx,
- tdb1_incompatible_hash);
+ tdb = tdb1_open("run-incompatible.tdb",
+ flags,
+ O_CREAT|O_RDWR|O_TRUNC, 0600,
+ &incompat_hash_attr);
ok1(tdb);
ok1(log_count == 0);
d.dptr = (void *)"Hello";
/* Cannot open with old hash. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0, 0,
- O_RDWR, 0600, &log_ctx, old_hash);
+ tdb = tdb1_open("run-incompatible.tdb", 0,
+ O_RDWR, 0600, &ohash_attr);
ok1(!tdb);
ok1(log_count == 1);
/* Can open with jenkins hash. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0, 0,
- O_RDWR, 0600, &log_ctx, jenkins_hashfn);
+ tdb = tdb1_open("run-incompatible.tdb", 0,
+ O_RDWR, 0600, &jhash_attr);
ok1(tdb);
ok1(log_count == 0);
d = tdb1_fetch(tdb, d);
/* Can open by letting it figure it out itself. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0, 0,
- O_RDWR, 0600, &log_ctx, NULL);
+ tdb = tdb1_open("run-incompatible.tdb", 0,
+ O_RDWR, 0600, &log_attr);
ok1(tdb);
ok1(log_count == 0);
d.dptr = (void *)"Hello";
/* FIXME: Not possible with TDB2 :( */
/* We can also use incompatible hash with other hashes. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0,
- flags,
- O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx,
- tdb1_dumb_hash);
+ tdb = tdb1_open("run-incompatible.tdb",
+ flags,
+ O_CREAT|O_RDWR|O_TRUNC, 0600, &dumbhash_attr);
ok1(tdb);
ok1(log_count == 0);
d.dptr = (void *)"Hello";
/* It should not open if we don't specify. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0, 0, O_RDWR, 0,
- &log_ctx, NULL);
+ tdb = tdb1_open("run-incompatible.tdb", 0, O_RDWR, 0,
+ &log_attr);
ok1(!tdb);
ok1(log_count == 1);
/* Should reopen with correct hash. */
log_count = 0;
- tdb = tdb1_open_ex("run-incompatible.tdb", 0, 0, O_RDWR, 0,
- &log_ctx, tdb1_dumb_hash);
+ tdb = tdb1_open("run-incompatible.tdb", 0, O_RDWR, 0,
+ &dumbhash_attr);
ok1(tdb);
ok1(log_count == 0);
d = tdb1_fetch(tdb, d);
projects / ccan / blobdiff