tdb2: fixes and test for hash enlargement.

[ccan] / ccan / tdb2 / tdb.c

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 915b4c765afe51aa90e32030beb2b8b182390763..d19ceda239d50e71681607d39487d19187b61ac9 100644 (file)
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -599,12 +599,18 @@ static void enlarge_hash(struct tdb_context *tdb)
                                 "find_bucket_and_lock: zero hash bucket!\n");
                        goto unlock;
                }
-               h = hash_record(tdb, off);
+
+               /* Find next empty hash slot. */
+               for (h = hash_record(tdb, off);
+                    tdb_read_off(tdb, newoff + (h & ((num * 2)-1))
+                                 * sizeof(tdb_off_t)) != 0;
+                    h++);
+
                /* FIXME: Encode extra hash bits! */
-               if (tdb_write_off(tdb, newoff
-                                 + (h & ((num * 2) - 1)) * sizeof(uint64_t),
-                                 off) == -1)
+               if (tdb_write_off(tdb, newoff + (h & ((num * 2)-1))
+                                 * sizeof(tdb_off_t), off) == -1)
                        goto unlock;
+               i++;
        }
 
        /* Free up old hash. */