diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-23 22:45:03 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-25 13:15:18 +1100 |
| commit | d4c0e8fdf063f88032c32de7ece60d502b322089 (patch) | |
| tree | 90b12082a9b9f70c11a5d00d03fcd81b25ad9881 /lib/tdb | |
| parent | dffb572ce0b350bf42549c882275b627d9b36e59 (diff) | |
| download | samba-d4c0e8fdf063f88032c32de7ece60d502b322089.tar.gz samba-d4c0e8fdf063f88032c32de7ece60d502b322089.tar.bz2 samba-d4c0e8fdf063f88032c32de7ece60d502b322089.zip | |
tdb: detect tdb store of identical records and skip
This can help with ldb where we rewrite the index records
Diffstat (limited to 'lib/tdb')
| -rw-r--r-- | lib/tdb/common/tdb.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/tdb/common/tdb.c b/lib/tdb/common/tdb.c index 0389d3cb96..564c5fed5c 100644 --- a/lib/tdb/common/tdb.c +++ b/lib/tdb/common/tdb.c @@ -121,6 +121,7 @@ tdb_off_t tdb_find_lock_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t has return rec_ptr; } +static TDB_DATA _tdb_fetch(struct tdb_context *tdb, TDB_DATA key); /* update an entry in place - this only works if the new data size is <= the old data size and the key exists. @@ -135,6 +136,25 @@ static int tdb_update_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash, if (!(rec_ptr = tdb_find(tdb, key, hash, &rec))) return -1; + /* it could be an exact duplicate of what is there - this is + * surprisingly common (eg. with a ldb re-index). */ + if (rec.key_len == key.dsize && + rec.data_len == dbuf.dsize && + rec.full_hash == hash) { + TDB_DATA data = _tdb_fetch(tdb, key); + if (data.dsize == dbuf.dsize && + memcmp(data.dptr, dbuf.dptr, data.dsize) == 0) { + if (data.dptr) { + free(data.dptr); + } + return 0; + } + if (data.dptr) { + free(data.dptr); + } + } + + /* must be long enough key, data and tailer */ if (rec.rec_len < key.dsize + dbuf.dsize + sizeof(tdb_off_t)) { tdb->ecode = TDB_SUCCESS; /* Not really an error */ |