Mirrors_Framework/FlashDB
1
0
Fork 0
mirror of https://github.com/armink/FlashDB.git synced 2026-10-06 12:59:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from eggcar/master

Browse Source 
Fix: kv iterator now returns valid kv obj only.
This commit is contained in:
朱天龙 (Armink)
2020-07-05 11:04:49 +08:00
committed by GitHub
parent f4bbeedac7 e411c5c29a
commit bc49f77a32
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fdb_kvdb.c
+21 -19
View File
@@ -1638,32 +1638,34 @@ fdb_kv_iterator_t fdb_kv_iterator_init(fdb_kv_iterator_t itr)
* @param db database object
* @param itr the iterator structure
*
* @return false if iterate not ended, true if iterate ended.
* @return false if iteration is ended, true if iteration is not ended.
*/
bool fdb_kv_iterate(fdb_kvdb_t db, fdb_kv_iterator_t itr)
{
struct kvdb_sec_info sector;
fdb_kv_t kv = &(itr->curr_kv);
do {
if (read_sector_info(db, itr->sector_addr, &sector, false) != FDB_NO_ERR) {
continue;
}
else if (sector.status.store == FDB_SECTOR_STORE_USING || sector.status.store == FDB_SECTOR_STORE_FULL) {
if (kv->addr.start == 0) {
kv->addr.start = sector.addr + SECTOR_HDR_DATA_SIZE;
if (read_sector_info(db, itr->sector_addr, &sector, false) == FDB_NO_ERR) {
if (sector.status.store == FDB_SECTOR_STORE_USING || sector.status.store == FDB_SECTOR_STORE_FULL) {
if (kv->addr.start == 0) {
kv->addr.start = sector.addr + SECTOR_HDR_DATA_SIZE;
}
else if ((kv->addr.start = get_next_kv_addr(db, &sector, kv)) == FAILED_ADDR) {
kv->addr.start = 0;
continue;
}
do {
read_kv(db, kv);
if (kv->status == FDB_KV_WRITE) {
/* We got a valid kv here. */
/* If iterator statistics is needed */
itr->iterated_cnt++;
itr->iterated_obj_bytes += kv->len;
itr->iterated_value_bytes += kv->value_len;
return true;
}
} while((kv->addr.start = get_next_kv_addr(db, &sector, kv)) != FAILED_ADDR);
}
else if ((kv->addr.start = get_next_kv_addr(db, &sector, kv)) == FAILED_ADDR) {
kv->addr.start = 0;
continue;
}
/* If iterator statistics is needed */
itr->iterated_cnt++;
itr->iterated_obj_bytes += kv->len;
itr->iterated_value_bytes += kv->value_len;
/* We got a valid kv here. */
read_kv(db, kv);
return true;
}
/** Set kv->addr.start to 0 when we get into a new sector so that if we successfully get the next sector info,
* the kv->addr.start is set to the new sector.addr + SECTOR_HDR_DATA_SIZE.