ntdb: create initial database to be multiple of NTDB_PGSIZE.

As copied from tdb1, there is logic in the transaction code to handle
a non-PGSIZE multiple db, but in fact this only happens for a
completely unused database: as soon as we add anything to it, it is
expanded to a NTDB_PGSIZE multiple.

If we create the database with a free record which pads it out to
NTDB_PGSIZE, we can remove this last-page-is-different logic.

Of course, the fake ntdbs we create in our tests now also need to be
multiples of NTDB_PGSIZE, so we change some numbers there too.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

1 files changed, 18 insertions, 18 deletions

diff --git a/lib/ntdb/test/run-03-coalesce.c b/lib/ntdb/test/run-03-coalesce.c
index f93b33a1c3..22a6817881 100644
--- a/lib/ntdb/test/run-03-coalesce.c
+++ b/lib/ntdb/test/run-03-coalesce.c
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
 	/* No coalescing can be done due to EOF */
 	layout = new_ntdb_layout();
 	ntdb_layout_add_freetable(layout);
-	len = 1024;
+	len = 56544;
 	ntdb_layout_add_free(layout, len, 0);
 	ntdb_layout_write(layout, free, &tap_log_attr, "run-03-coalesce.ntdb");
 	/* NOMMAP is for lockcheck. */
@@ -60,24 +60,24 @@ int main(int argc, char *argv[])
 	/* No coalescing can be done due to used record */
 	layout = new_ntdb_layout();
 	ntdb_layout_add_freetable(layout);
-	ntdb_layout_add_free(layout, 1024, 0);
+	ntdb_layout_add_free(layout, 56512, 0);
 	ntdb_layout_add_used(layout, key, data, 6);
 	ntdb_layout_write(layout, free, &tap_log_attr, "run-03-coalesce.ntdb");
 	/* NOMMAP is for lockcheck. */
 	ntdb = ntdb_open("run-03-coalesce.ntdb", NTDB_NOMMAP, O_RDWR, 0,
 		       &tap_log_attr);
-	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 1024);
+	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 56512);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 
 	/* Figure out which bucket free entry is. */
-	b_off = bucket_off(ntdb->ftable_off, size_to_bucket(1024));
+	b_off = bucket_off(ntdb->ftable_off, size_to_bucket(56512));
 	/* Lock and fail to coalesce. */
 	ok1(ntdb_lock_free_bucket(ntdb, b_off, NTDB_LOCK_WAIT) == 0);
 	test = layout->elem[1].base.off;
-	ok1(coalesce(ntdb, layout->elem[1].base.off, b_off, 1024, &test)
+	ok1(coalesce(ntdb, layout->elem[1].base.off, b_off, 56512, &test)
 	    == 0);
 	ntdb_unlock_free_bucket(ntdb, b_off);
-	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 1024);
+	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 56512);
 	ok1(test == layout->elem[1].base.off);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 	ntdb_close(ntdb);
@@ -87,13 +87,13 @@ int main(int argc, char *argv[])
 	layout = new_ntdb_layout();
 	ntdb_layout_add_freetable(layout);
 	ntdb_layout_add_free(layout, 1024, 0);
-	ntdb_layout_add_free(layout, 2048, 0);
+	ntdb_layout_add_free(layout, 55504, 0);
 	ntdb_layout_write(layout, free, &tap_log_attr, "run-03-coalesce.ntdb");
 	/* NOMMAP is for lockcheck. */
 	ntdb = ntdb_open("run-03-coalesce.ntdb", NTDB_NOMMAP, O_RDWR, 0,
 		       &tap_log_attr);
 	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 1024);
-	ok1(free_record_length(ntdb, layout->elem[2].base.off) == 2048);
+	ok1(free_record_length(ntdb, layout->elem[2].base.off) == 55504);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 
 	/* Figure out which bucket (first) free entry is. */
@@ -102,12 +102,12 @@ int main(int argc, char *argv[])
 	ok1(ntdb_lock_free_bucket(ntdb, b_off, NTDB_LOCK_WAIT) == 0);
 	test = layout->elem[2].base.off;
 	ok1(coalesce(ntdb, layout->elem[1].base.off, b_off, 1024, &test)
-	    == 1024 + sizeof(struct ntdb_used_record) + 2048);
+	    == 1024 + sizeof(struct ntdb_used_record) + 55504);
 	/* Should tell us it's erased this one... */
 	ok1(test == NTDB_ERR_NOEXIST);
 	ok1(ntdb->file->allrecord_lock.count == 0 && ntdb->file->num_lockrecs == 0);
 	ok1(free_record_length(ntdb, layout->elem[1].base.off)
-	    == 1024 + sizeof(struct ntdb_used_record) + 2048);
+	    == 1024 + sizeof(struct ntdb_used_record) + 55504);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 	ntdb_close(ntdb);
 	ntdb_layout_free(layout);
@@ -116,14 +116,14 @@ int main(int argc, char *argv[])
 	layout = new_ntdb_layout();
 	ntdb_layout_add_freetable(layout);
 	ntdb_layout_add_free(layout, 1024, 0);
-	ntdb_layout_add_free(layout, 512, 0);
+	ntdb_layout_add_free(layout, 55472, 0);
 	ntdb_layout_add_used(layout, key, data, 6);
 	ntdb_layout_write(layout, free, &tap_log_attr, "run-03-coalesce.ntdb");
 	/* NOMMAP is for lockcheck. */
 	ntdb = ntdb_open("run-03-coalesce.ntdb", NTDB_NOMMAP, O_RDWR, 0,
 		       &tap_log_attr);
 	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 1024);
-	ok1(free_record_length(ntdb, layout->elem[2].base.off) == 512);
+	ok1(free_record_length(ntdb, layout->elem[2].base.off) == 55472);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 
 	/* Figure out which bucket free entry is. */
@@ -132,10 +132,10 @@ int main(int argc, char *argv[])
 	ok1(ntdb_lock_free_bucket(ntdb, b_off, NTDB_LOCK_WAIT) == 0);
 	test = layout->elem[2].base.off;
 	ok1(coalesce(ntdb, layout->elem[1].base.off, b_off, 1024, &test)
-	    == 1024 + sizeof(struct ntdb_used_record) + 512);
+	    == 1024 + sizeof(struct ntdb_used_record) + 55472);
 	ok1(ntdb->file->allrecord_lock.count == 0 && ntdb->file->num_lockrecs == 0);
 	ok1(free_record_length(ntdb, layout->elem[1].base.off)
-	    == 1024 + sizeof(struct ntdb_used_record) + 512);
+	    == 1024 + sizeof(struct ntdb_used_record) + 55472);
 	ok1(test == NTDB_ERR_NOEXIST);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 	ntdb_close(ntdb);
@@ -146,14 +146,14 @@ int main(int argc, char *argv[])
 	ntdb_layout_add_freetable(layout);
 	ntdb_layout_add_free(layout, 1024, 0);
 	ntdb_layout_add_free(layout, 512, 0);
-	ntdb_layout_add_free(layout, 256, 0);
+	ntdb_layout_add_free(layout, 54976, 0);
 	ntdb_layout_write(layout, free, &tap_log_attr, "run-03-coalesce.ntdb");
 	/* NOMMAP is for lockcheck. */
 	ntdb = ntdb_open("run-03-coalesce.ntdb", NTDB_NOMMAP, O_RDWR, 0,
 		       &tap_log_attr);
 	ok1(free_record_length(ntdb, layout->elem[1].base.off) == 1024);
 	ok1(free_record_length(ntdb, layout->elem[2].base.off) == 512);
-	ok1(free_record_length(ntdb, layout->elem[3].base.off) == 256);
+	ok1(free_record_length(ntdb, layout->elem[3].base.off) == 54976);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 
 	/* Figure out which bucket free entry is. */
@@ -163,12 +163,12 @@ int main(int argc, char *argv[])
 	test = layout->elem[2].base.off;
 	ok1(coalesce(ntdb, layout->elem[1].base.off, b_off, 1024, &test)
 	    == 1024 + sizeof(struct ntdb_used_record) + 512
-	    + sizeof(struct ntdb_used_record) + 256);
+	    + sizeof(struct ntdb_used_record) + 54976);
 	ok1(ntdb->file->allrecord_lock.count == 0
 	    && ntdb->file->num_lockrecs == 0);
 	ok1(free_record_length(ntdb, layout->elem[1].base.off)
 	    == 1024 + sizeof(struct ntdb_used_record) + 512
-	    + sizeof(struct ntdb_used_record) + 256);
+	    + sizeof(struct ntdb_used_record) + 54976);
 	ok1(ntdb_check(ntdb, NULL, NULL) == 0);
 	ntdb_close(ntdb);
 	ntdb_layout_free(layout);