#include "tdb1_private.h"
#include <assert.h>
-TDB_DATA tdb1_null;
-
/*
non-blocking increment of the tdb sequence number if the tdb has been opened using
the TDB_SEQNUM flag
tdb1_nest_unlock(tdb, TDB1_SEQNUM_OFS, F_WRLCK);
}
-static int tdb1_key_compare(TDB_DATA key, TDB_DATA data, void *private_data)
+static enum TDB_ERROR tdb1_key_compare(TDB_DATA key, TDB_DATA data,
+ void *matches_)
{
- return memcmp(data.dptr, key.dptr, data.dsize);
+ bool *matches = matches_;
+ *matches = (memcmp(data.dptr, key.dptr, data.dsize) == 0);
+ return TDB_SUCCESS;
}
-/* Returns 0 on fail. On success, return offset of record, and fills
- in rec */
+/* Returns 0 on fail; last_error will be TDB_ERR_NOEXIST if it simply
+ * wasn't there, otherwise a real error.
+ * On success, return offset of record, and fills in rec */
static tdb1_off_t tdb1_find(struct tdb_context *tdb, TDB_DATA key, uint32_t hash,
struct tdb1_record *r)
{
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) {
- return rec_ptr;
+ 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 {
+ enum TDB_ERROR ecode;
+ bool matches;
+ ecode = tdb1_parse_data(tdb, key, rec_ptr + sizeof(*r),
+ r->key_len, tdb1_key_compare,
+ &matches);
+
+ if (ecode != TDB_SUCCESS) {
+ tdb->last_error = ecode;
+ return 0;
+ }
+
+ if (!matches) {
+ tdb->stats.compare_wrong_keycmp++;
+ } else {
+ return rec_ptr;
+ }
}
/* detect tight infinite loop */
if (rec_ptr == r->next) {
/* find which hash bucket it is in */
hash = tdb_hash(tdb, key.dptr, key.dsize);
- if (!(rec_ptr = tdb1_find_lock_hash(tdb,key,hash,F_RDLCK,&rec)))
- return tdb1_null;
+ if (!(rec_ptr = tdb1_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
+ ret.dptr = NULL;
+ ret.dsize = 0;
+ return ret;
+ }
ret.dptr = tdb1_alloc_read(tdb, rec_ptr + sizeof(rec) + rec.key_len,
rec.data_len);
hash = tdb_hash(tdb, key.dptr, key.dsize);
if (!(rec_ptr = tdb1_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) {
- /* record not found */
- return TDB_ERR_NOEXIST;
+ return tdb->last_error;
}
ret = tdb1_parse_data(tdb, key, rec_ptr + sizeof(rec) + rec.key_len,
tdb->last_error = TDB_ERR_EXISTS;
goto fail;
}
+ if (tdb->last_error != TDB_ERR_NOEXIST) {
+ goto fail;
+ }
} else {
/* first try in-place update, on modify or replace. */
if (tdb1_update_hash(tdb, key, hash, dbuf) == 0) {
goto done;
}
- if (tdb->last_error == TDB_ERR_NOEXIST &&
- flag == TDB_MODIFY) {
- /* if the record doesn't exist and we are in TDB1_MODIFY mode then
- we should fail the store */
- goto fail;
+ if (tdb->last_error != TDB_SUCCESS) {
+ if (tdb->last_error != TDB_ERR_NOEXIST) {
+ goto fail;
+ }
+ if (flag == TDB_MODIFY) {
+ /* if the record doesn't exist and we are in TDB1_MODIFY mode then
+ we should fail the store */
+ goto fail;
+ }
}
}
/* reset the error code potentially set by the tdb1_update() */
fails and we are left with a dead spot in the tdb. */
if (!(p = (char *)malloc(key.dsize + dbuf.dsize))) {
- tdb->last_error = TDB_ERR_OOM;
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "tdb1_store: out of memory"
+ " allocating copy");
goto fail;
}
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;
}
}
}
+ tdb1_increment_seqnum_nonblock(tdb);
tdb_unlockall(tdb);
return 0;