X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-wronghash-fail.c;h=63c1bdf1e46b637ded5ee05bb2fc5742d01ea79f;hp=15047677a2ce2e73ca4d9daf288b34241e303e5a;hb=926996e88c32445c874ff9c4f47f159db6b45995;hpb=b929638e3cfe629285af3ecd0813e03eaeaa1133;ds=sidebyside diff --git a/ccan/tdb2/test/run-tdb1-wronghash-fail.c b/ccan/tdb2/test/run-tdb1-wronghash-fail.c index 15047677..63c1bdf1 100644 --- a/ccan/tdb2/test/run-tdb1-wronghash-fail.c +++ b/ccan/tdb2/test/run-tdb1-wronghash-fail.c @@ -3,108 +3,140 @@ #include #include -static void log_fn(struct tdb1_context *tdb, enum tdb1_debug_level level, const char *fmt, ...) +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 = tdb->log.log_private; - if (strstr(fmt, "hash")) + unsigned int *count = priv; + if (strstr(message, "hash")) (*count)++; } +static uint64_t jenkins_hashfn(const void *key, size_t len, uint64_t seed, + void *unused) +{ + return hashlittle(key, len); +} + +/* the tdb1_old_hash function is "magic" as it automatically makes us test the + * tdb1_incompatible_hash as well, so use this wrapper. */ +static uint64_t old_hash(const void *key, size_t len, uint64_t seed, + void *unused) +{ + 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; - TDB1_DATA d; - struct tdb1_logging_context log_ctx = { log_fn, &log_count }; + TDB_DATA d; + union tdb_attribute log_attr, jhash_attr, ohash_attr, + incompat_hash_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; plan_tests(28); /* Create with default hash. */ log_count = 0; - tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, - O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx, NULL); + tdb = tdb_open("run-wronghash-fail.tdb1", TDB_VERSION1, + O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr); ok1(tdb); ok1(log_count == 0); d.dptr = (void *)"Hello"; d.dsize = 5; - ok1(tdb1_store(tdb, d, d, TDB1_INSERT) == 0); - tdb1_close(tdb); + ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS); + tdb_close(tdb); /* Fail to open with different hash. */ - tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0, - &log_ctx, tdb1_jenkins_hash); + tdb = tdb_open("run-wronghash-fail.tdb1", TDB_VERSION1, O_RDWR, 0, + &jhash_attr); ok1(!tdb); ok1(log_count == 1); /* Create with different hash. */ log_count = 0; - tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, - O_CREAT|O_RDWR|O_TRUNC, - 0600, &log_ctx, tdb1_jenkins_hash); + tdb = tdb_open("run-wronghash-fail.tdb1", TDB_VERSION1, + O_CREAT|O_RDWR|O_TRUNC, 0600, &jhash_attr); ok1(tdb); ok1(log_count == 0); - tdb1_close(tdb); + tdb_close(tdb); /* Endian should be no problem. */ log_count = 0; - tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0, - &log_ctx, tdb1_old_hash); + tdb = tdb_open("test/jenkins-le-hash.tdb1", TDB_VERSION1, O_RDWR, 0, + &ohash_attr); ok1(!tdb); ok1(log_count == 1); log_count = 0; - tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0, - &log_ctx, tdb1_old_hash); + tdb = tdb_open("test/jenkins-be-hash.tdb1", TDB_VERSION1, O_RDWR, 0, + &ohash_attr); ok1(!tdb); ok1(log_count == 1); log_count = 0; /* Fail to open with old default hash. */ - tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDWR, 0, - &log_ctx, tdb1_old_hash); + tdb = tdb_open("run-wronghash-fail.tdb1", TDB_VERSION1, O_RDWR, 0, + &ohash_attr); ok1(!tdb); ok1(log_count == 1); log_count = 0; - tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDONLY, - 0, &log_ctx, tdb1_jenkins_hash); + tdb = tdb_open("test/jenkins-le-hash.tdb1", TDB_VERSION1, O_RDONLY, + 0, &incompat_hash_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); + tdb_close(tdb); log_count = 0; - tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDONLY, - 0, &log_ctx, tdb1_jenkins_hash); + tdb = tdb_open("test/jenkins-be-hash.tdb1", TDB_VERSION1, O_RDONLY, + 0, &incompat_hash_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); + tdb_close(tdb); /* It should open with jenkins hash if we don't specify. */ log_count = 0; - tdb = tdb1_open_ex("test/jenkins-le-hash.tdb1", 0, 0, O_RDWR, 0, - &log_ctx, NULL); + tdb = tdb_open("test/jenkins-le-hash.tdb1", TDB_VERSION1, O_RDWR, 0, + &log_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); + tdb_close(tdb); log_count = 0; - tdb = tdb1_open_ex("test/jenkins-be-hash.tdb1", 0, 0, O_RDWR, 0, - &log_ctx, NULL); + tdb = tdb_open("test/jenkins-be-hash.tdb1", TDB_VERSION1, O_RDWR, 0, + &log_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); + tdb_close(tdb); log_count = 0; - tdb = tdb1_open_ex("run-wronghash-fail.tdb", 0, 0, O_RDONLY, - 0, &log_ctx, NULL); + tdb = tdb_open("run-wronghash-fail.tdb1", TDB_VERSION1, O_RDONLY, + 0, &log_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); - tdb1_close(tdb); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); + tdb_close(tdb); return exit_status();