libs/FlashDB
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[kvdb] change the kvdb struct element name.

Browse Source
This commit is contained in:
armink 2021-02-02 20:43:07 +08:00
parent da3489c9c2
commit 027992ced9
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/fdb_def.h
View File

@ -282,8 +282,8 @@ struct fdb_kvdb {
struct fdb_default_kv default_kvs; /**< default KV */
bool gc_request; /**< request a GC check */
bool in_recovery_check; /**< is in recovery check status when first reboot */
struct fdb_kv kv;
struct kvdb_sec_info sector;
struct fdb_kv cur_kv;
struct kvdb_sec_info cur_sector;
bool last_is_complete_del;
#ifdef FDB_KV_USING_CACHE

18
src/fdb_kvdb.c
View File

@ -1190,21 +1190,21 @@ static fdb_err_t set_kv(fdb_kvdb_t db, const char *key, const void *value_buf, s
result = del_kv(db, key, NULL, true);
} else {
/* make sure the flash has enough space */
if (new_kv_ex(db, &db->sector, strlen(key), buf_len) == FAILED_ADDR) {
if (new_kv_ex(db, &db->cur_sector, strlen(key), buf_len) == FAILED_ADDR) {
return FDB_SAVED_FULL;
}
kv_is_found = find_kv(db, key, &db->kv);
kv_is_found = find_kv(db, key, &db->cur_kv);
/* prepare to delete the old KV */
if (kv_is_found) {
result = del_kv(db, key, &db->kv, false);
result = del_kv(db, key, &db->cur_kv, false);
}
/* create the new KV */
if (result == FDB_NO_ERR) {
result = create_kv_blob(db, &db->sector, key, value_buf, buf_len);
result = create_kv_blob(db, &db->cur_sector, key, value_buf, buf_len);
}
/* delete the old KV */
if (kv_is_found && result == FDB_NO_ERR) {
result = del_kv(db, key, &db->kv, true);
result = del_kv(db, key, &db->cur_kv, true);
}
/* process the GC after set KV */
if (db->gc_request) {
@ -1394,13 +1394,11 @@ static void kv_auto_update(fdb_kvdb_t db)
if (get_kv(db, VER_NUM_KV_NAME, &saved_ver_num, sizeof(size_t), NULL) > 0) {
/* check version number */
if (saved_ver_num != setting_ver_num) {
struct fdb_kv kv;
size_t i, value_len;
struct kvdb_sec_info sector;
FDB_DEBUG("Update the KV from version %zu to %zu.\n", saved_ver_num, setting_ver_num);
for (i = 0; i < db->default_kvs.num; i++) {
/* add a new KV when it's not found */
if (!find_kv(db, db->default_kvs.kvs[i].key, &kv)) {
if (!find_kv(db, db->default_kvs.kvs[i].key, &db->cur_kv)) {
/* It seems to be a string when value length is 0.
* This mechanism is for compatibility with older versions (less then V4.0). */
if (db->default_kvs.kvs[i].value_len == 0) {
@ -1408,8 +1406,8 @@ static void kv_auto_update(fdb_kvdb_t db)
} else {
value_len = db->default_kvs.kvs[i].value_len;
}
sector.empty_kv = FAILED_ADDR;
create_kv_blob(db, &sector, db->default_kvs.kvs[i].key, db->default_kvs.kvs[i].value, value_len);
db->cur_sector.empty_kv = FAILED_ADDR;
create_kv_blob(db, &db->cur_sector, db->default_kvs.kvs[i].key, db->default_kvs.kvs[i].value, value_len);
}
}
} else {