X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_tdb.c;h=9730dceffc2b5b7b8bccbeaef1ca6bacd689c2a4;hb=a3e4ebff2eb9dc2e386160b8acf77d70236f4def;hp=99b83ab72d08d7e6b733a1572063c9f8d240ca9d;hpb=8571daf007f03a2888566dbaae8a5849ffba60f3;p=ccan

diff --git a/ccan/tdb2/tdb1_tdb.c b/ccan/tdb2/tdb1_tdb.c
index 99b83ab7..9730dcef 100644
--- a/ccan/tdb2/tdb1_tdb.c
+++ b/ccan/tdb2/tdb1_tdb.c
@@ -89,11 +89,18 @@ static tdb1_off_t tdb1_find(struct tdb_context *tdb, TDB_DATA key, uint32_t hash
 		if (tdb1_rec_read(tdb, rec_ptr, r) == -1)
 			return 0;
 
-		if (!TDB1_DEAD(r) && hash==r->full_hash
-		    && key.dsize==r->key_len
-		    && tdb1_parse_data(tdb, key, rec_ptr + sizeof(*r),
-				      r->key_len, tdb1_key_compare,
-				      NULL) == 0) {
+		tdb->stats.compares++;
+		if (TDB1_DEAD(r)) {
+			tdb->stats.compare_wrong_bucket++;
+		} else if (key.dsize != r->key_len) {
+			tdb->stats.compare_wrong_keylen++;
+		} else if (hash != r->full_hash) {
+			tdb->stats.compare_wrong_rechash++;
+		} else if (tdb1_parse_data(tdb, key, rec_ptr + sizeof(*r),
+					   r->key_len, tdb1_key_compare,
+					   NULL) != 0) {
+			tdb->stats.compare_wrong_keycmp++;
+		} else {
 			return rec_ptr;
 		}
 		/* detect tight infinite loop */
@@ -591,7 +598,9 @@ int tdb1_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag)
 	assert(tdb->flags & TDB_VERSION1);
 
 	if ((tdb->flags & TDB_RDONLY) || tdb->tdb1.traverse_read) {
-		tdb->last_error = TDB_ERR_RDONLY;
+		tdb->last_error = tdb_logerr(tdb, TDB_ERR_RDONLY,
+					     TDB_LOG_USE_ERROR,
+					     "tdb_store: read-only tdb");
 		return -1;
 	}
 
@@ -784,6 +793,7 @@ int tdb1_wipe_all(struct tdb_context *tdb)
 		}
 	}
 
+	tdb1_increment_seqnum_nonblock(tdb);
 	tdb_unlockall(tdb);
 	return 0;