From 8905e8b28cae54ca2cf787ac573e1c169222d2ee Mon Sep 17 00:00:00 2001 From: Hongbin Ji Date: Sat, 28 Jun 2025 18:01:57 +0800 Subject: [PATCH] =?UTF-8?q?[bugfix]:=20=E4=BF=AE=E6=94=B9=E5=9C=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E6=97=B6=E8=B0=83=E7=94=A8API=E6=8E=A5=E5=8F=A3=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=93=8D=E4=BD=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hongbin Ji --- src/fdb_kvdb.c | 23 ++++++++++------------- src/fdb_tsdb.c | 17 +++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/fdb_kvdb.c b/src/fdb_kvdb.c index 2bf2375..42850ff 100644 --- a/src/fdb_kvdb.c +++ b/src/fdb_kvdb.c @@ -17,9 +17,6 @@ #include #define FDB_LOG_TAG "[kv]" -/* rewrite log prefix */ -#undef FDB_LOG_PREFIX2 -#define FDB_LOG_PREFIX2() FDB_PRINT("[%s][%s] ", db_name(db), _fdb_db_path((fdb_db_t)db)) #if defined(FDB_USING_KVDB) @@ -434,7 +431,7 @@ static fdb_err_t read_sector_info(fdb_kvdb_t db, uint32_t addr, kv_sec_info_t se sector->addr = addr; sector->magic = sec_hdr.magic; /* check magic word and combined value */ - if (sector->magic != SECTOR_MAGIC_WORD || + if (sector->magic != SECTOR_MAGIC_WORD || (sec_hdr.combined != SECTOR_NOT_COMBINED && sec_hdr.combined != SECTOR_COMBINED)) { sector->check_ok = false; sector->combined = SECTOR_NOT_COMBINED; @@ -653,8 +650,8 @@ fdb_kv_t fdb_kv_get_obj(fdb_kvdb_t db, const char *key, fdb_kv_t kv) { bool find_ok = false; - if (!db_init_ok(db)) { - FDB_INFO("Error: KV (%s) isn't initialize OK.\n", db_name(db)); + if (!db_init_ok(db)) { + FDB_INFO("Error: KV isn't initialize OK.\n"); return 0; } @@ -700,7 +697,7 @@ size_t fdb_kv_get_blob(fdb_kvdb_t db, const char *key, fdb_blob_t blob) size_t read_len = 0; if (!db_init_ok(db)) { - FDB_INFO("Error: KV (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: KV isn't initialize OK.\n"); return 0; } @@ -1300,7 +1297,7 @@ fdb_err_t fdb_kv_del(fdb_kvdb_t db, const char *key) fdb_err_t result = FDB_NO_ERR; if (!db_init_ok(db)) { - FDB_INFO("Error: KV (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: KV isn't initialize OK.\n"); return FDB_INIT_FAILED; } @@ -1364,7 +1361,7 @@ fdb_err_t fdb_kv_set_blob(fdb_kvdb_t db, const char *key, fdb_blob_t blob) fdb_err_t result = FDB_NO_ERR; if (!db_init_ok(db)) { - FDB_INFO("Error: KV (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: KV isn't initialize OK.\n"); return FDB_INIT_FAILED; } @@ -1512,7 +1509,7 @@ void fdb_kv_print(fdb_kvdb_t db) size_t using_size = 0; if (!db_init_ok(db)) { - FDB_INFO("Error: KV (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: KV isn't initialize OK.\n"); return; } @@ -1816,9 +1813,9 @@ fdb_err_t fdb_kvdb_init(fdb_kvdb_t db, const char *name, const char *path, struc FDB_DEBUG("KVDB size is %" PRIu32 " bytes.\n", db_max_size(db)); db_unlock(db); - + result = _fdb_kv_load(db); - + db_lock(db); #ifdef FDB_KV_AUTO_UPDATE if (result == FDB_NO_ERR) { @@ -1933,7 +1930,7 @@ fdb_err_t fdb_kvdb_check(fdb_kvdb_t db) struct fdb_kv kv; if (!db_init_ok(db)) { - FDB_INFO("Error: KV (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: KV isn't initialize OK.\n"); return FDB_INIT_FAILED; } diff --git a/src/fdb_tsdb.c b/src/fdb_tsdb.c index 2d66c92..ff92753 100644 --- a/src/fdb_tsdb.c +++ b/src/fdb_tsdb.c @@ -19,9 +19,6 @@ #include #define FDB_LOG_TAG "[tsl]" -/* rewrite log prefix */ -#undef FDB_LOG_PREFIX2 -#define FDB_LOG_PREFIX2() FDB_PRINT("[%s][%s] ", db_name(db), _fdb_db_path((fdb_db_t)db)) #if defined(FDB_USING_TSDB) @@ -391,7 +388,7 @@ static fdb_err_t tsl_append(fdb_tsdb_t db, fdb_blob_t blob, fdb_time_t *timestam /* check the append length, MUST less than the db->max_len */ if(blob->size > db->max_len) { - FDB_INFO("Warning: append length (%" PRIdMAX ") is more than the db->max_len (%" PRIdMAX "). This tsl will be dropped.\n", + FDB_INFO("Warning: append length (%" PRIdMAX ") is more than the db->max_len (%" PRIdMAX "). This tsl will be dropped.\n", (intmax_t)blob->size, (intmax_t)(db->max_len)); return FDB_WRITE_ERR; } @@ -439,7 +436,7 @@ fdb_err_t fdb_tsl_append(fdb_tsdb_t db, fdb_blob_t blob) fdb_err_t result = FDB_NO_ERR; if (!db_init_ok(db)) { - FDB_INFO("Error: TSL (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: TSL isn't initialize OK.\n"); return FDB_INIT_FAILED; } @@ -463,7 +460,7 @@ fdb_err_t fdb_tsl_append_with_ts(fdb_tsdb_t db, fdb_blob_t blob, fdb_time_t time fdb_err_t result = FDB_NO_ERR; if (!db_init_ok(db)) { - FDB_INFO("Error: TSL (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: TSL isn't initialize OK.\n"); return FDB_INIT_FAILED; } @@ -488,7 +485,7 @@ void fdb_tsl_iter(fdb_tsdb_t db, fdb_tsl_cb cb, void *arg) struct fdb_tsl tsl; if (!db_init_ok(db)) { - FDB_INFO("Error: TSL (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: TSL isn't initialize OK.\n"); } if (cb == NULL) { @@ -538,7 +535,7 @@ void fdb_tsl_iter_reverse(fdb_tsdb_t db, fdb_tsl_cb cb, void *cb_arg) struct fdb_tsl tsl; if (!db_init_ok(db)) { - FDB_INFO("Error: TSL (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: TSL isn't initialize OK.\n"); } if (cb == NULL) { @@ -627,7 +624,7 @@ void fdb_tsl_iter_by_time(fdb_tsdb_t db, fdb_time_t from, fdb_time_t to, fdb_tsl uint32_t (*get_tsl_addr)(tsdb_sec_info_t , fdb_tsl_t); if (!db_init_ok(db)) { - FDB_INFO("Error: TSL (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: TSL isn't initialize OK.\n"); } if(from <= to) { @@ -722,7 +719,7 @@ size_t fdb_tsl_query_count(fdb_tsdb_t db, fdb_time_t from, fdb_time_t to, fdb_ts arg.status = status; if (!db_init_ok(db)) { - FDB_INFO("Error: TSL (%s) isn't initialize OK.\n", db_name(db)); + FDB_INFO("Error: TSL isn't initialize OK.\n"); return 0; }