Use std::make_pair, rather than the std::pair contructor.
Use google logging instead of assert.h.
Small improvement in how FileDB lookups return entries.
Put the members of FileDB protected by lock_ together.
Add more verification of the hash of entries.
Do not hold the lock more than is necessary in FileDB.