tdb2: get rid of zones

[ccan] / ccan / tdb2 / test / run-02-expand.c

diff --git a/ccan/tdb2/test/run-02-expand.c b/ccan/tdb2/test/run-02-expand.c
index b681c05c1b6a5519e173d4d88541a3634a8593c3..aa5d5679243a5f71efdafca6e7f5ddbb95a45cbf 100644 (file)
--- a/ccan/tdb2/test/run-02-expand.c
+++ b/ccan/tdb2/test/run-02-expand.c
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
                        TDB_NOMMAP|TDB_CONVERT };
 
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT,
                        TDB_NOMMAP|TDB_CONVERT };
 

-       plan_tests(sizeof(flags) / sizeof(flags[0]) * 18 + 1);
+       plan_tests(sizeof(flags) / sizeof(flags[0]) * 7 + 1);

 
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
                tdb = tdb_open("run-expand.tdb", flags[i],
 
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
                tdb = tdb_open("run-expand.tdb", flags[i],


@@ -25,47 +25,15 @@ int main(int argc, char *argv[])
                if (!tdb)
                        continue;
 
                if (!tdb)
                        continue;
 

-               /* First expand. Should not fill zone. */
-               val = tdb->map_size - sizeof(struct tdb_header);
+               val = tdb->map_size;

                ok1(tdb_expand(tdb, 1) == 0);
                ok1(tdb_expand(tdb, 1) == 0);

-               ok1(tdb->map_size < sizeof(struct tdb_header)
-                   + (1 << INITIAL_ZONE_BITS));
+               ok1(tdb->map_size >= val + 1 * TDB_EXTENSION_FACTOR);

                ok1(tdb_check(tdb, NULL, NULL) == 0);
 
                ok1(tdb_check(tdb, NULL, NULL) == 0);
 

-               /* Fill zone. */
-               val = (1<<INITIAL_ZONE_BITS)
-                       - sizeof(struct tdb_used_record)
-                       - (tdb->map_size - sizeof(struct tdb_header));
-               ok1(tdb_expand(tdb, val) == 0);
-               ok1(tdb->map_size == sizeof(struct tdb_header)
-                   + (1 << INITIAL_ZONE_BITS));
+               val = tdb->map_size;
+               ok1(tdb_expand(tdb, 1024) == 0);
+               ok1(tdb->map_size >= val + 1024 * TDB_EXTENSION_FACTOR);

                ok1(tdb_check(tdb, NULL, NULL) == 0);
                ok1(tdb_check(tdb, NULL, NULL) == 0);

-
-               /* Second expand, adds another zone of same size. */
-               ok1(tdb_expand(tdb, 4 << INITIAL_ZONE_BITS) == 0);
-               ok1(tdb->map_size ==
-                   (2<<INITIAL_ZONE_BITS) + sizeof(struct tdb_header));
-               ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-               /* Large expand now will double file. */
-               ok1(tdb_expand(tdb, 4 << INITIAL_ZONE_BITS) == 0);
-               ok1(tdb->map_size ==
-                   (4<<INITIAL_ZONE_BITS) + sizeof(struct tdb_header));
-               ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-               /* And again? */
-               ok1(tdb_expand(tdb, 4 << INITIAL_ZONE_BITS) == 0);
-               ok1(tdb->map_size ==
-                   (8<<INITIAL_ZONE_BITS) + sizeof(struct tdb_header));
-               ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-               /* Below comfort level, won't fill zone. */
-               ok1(tdb_expand(tdb,
-                              ((3 << INITIAL_ZONE_BITS)
-                               >> TDB_COMFORT_FACTOR_BITS)
-                              - sizeof(struct tdb_used_record)) == 0);
-               ok1(tdb->map_size < (12<<INITIAL_ZONE_BITS)
-                   + sizeof(struct tdb_header));

                tdb_close(tdb);
        }
 
                tdb_close(tdb);
        }