@@ -45,16 +45,13 @@ static void test_fdb_kvdb_init(void)
45
45
{
46
46
mkdir (TEST_TS_PART_NAME , 0 );
47
47
}
48
- #ifndef FDB_USING_FAL_MODE
48
+
49
49
uint32_t sec_size = TEST_KVDB_SECTOR_SIZE , db_size = sec_size * 4 ;
50
50
rt_bool_t file_mode = true;
51
- #endif
52
51
53
- #ifndef FDB_USING_FAL_MODE
54
52
fdb_kvdb_control (& (test_kvdb ), FDB_KVDB_CTRL_SET_SEC_SIZE , & sec_size );
55
53
fdb_kvdb_control (& (test_kvdb ), FDB_KVDB_CTRL_SET_FILE_MODE , & file_mode );
56
54
fdb_kvdb_control (& (test_kvdb ), FDB_KVDB_CTRL_SET_MAX_SIZE , & db_size );
57
- #endif
58
55
59
56
uassert_true (fdb_kvdb_init (& test_kvdb , "test_kv" , TEST_TS_PART_NAME , NULL , NULL ) == FDB_NO_ERR );
60
57
}
@@ -224,7 +221,7 @@ static int iter_all_kv(fdb_kvdb_t db, struct test_kv *kv_tbl)
224
221
return index ;
225
222
}
226
223
227
- static void test_fdb_by_kvs (struct test_kv * kv_tbl , size_t len )
224
+ static void test_fdb_by_kvs (const struct test_kv * kv_tbl , size_t len )
228
225
{
229
226
struct fdb_blob blob_obj , * blob = & blob_obj ;
230
227
static struct test_kv saved_kv_tbl [TEST_KV_NUM ] = { 0 };
@@ -274,16 +271,15 @@ static void test_fdb_gc(void)
274
271
* | | | | |
275
272
* +---------------------------------------------------------+
276
273
*/
277
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
274
+ const struct test_kv kv_tbl [] = {
278
275
{"kv0" , "0" , 0 , 0 , 1 },
279
276
{"kv1" , "1" , 0 , 0 , 1 },
280
277
{"kv2" , "2" , 0 , 0 , 1 },
281
278
{"kv3" , "3" , 1 , 0 , 1 },
282
279
};
283
280
284
- test_fdb_by_kvs (kv_tbl , sizeof (kv_tbl )/ sizeof (kv_tbl [0 ]));
281
+ test_fdb_by_kvs (kv_tbl , sizeof (kv_tbl ) / sizeof (kv_tbl [0 ]));
285
282
uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 0 );
286
-
287
283
}
288
284
289
285
{
@@ -309,7 +305,7 @@ static void test_fdb_gc(void)
309
305
* | | | | |
310
306
* +--------------+-------------+--------------+-------------+
311
307
*/
312
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
308
+ const struct test_kv kv_tbl [] = {
313
309
{"kv1" , "1" , 0 , 0 , 0 },
314
310
{"kv2" , "2" , 0 , 0 , 0 },
315
311
{"kv0" , "00" , 1 , 0 , 1 },
@@ -345,7 +341,7 @@ static void test_fdb_gc(void)
345
341
* +--------------+-------------+--------------+-------------+
346
342
*
347
343
* step2.1: change kv3, start GC, only GC 1 sector on FlashDB V1.2
348
- *
344
+ *
349
345
* +--------------+-------------+--------------+-------------+
350
346
* | sector0 | sector1 | sector2 | sector3 |
351
347
* | empty | using | using | empty |
@@ -364,9 +360,9 @@ static void test_fdb_gc(void)
364
360
* | +----------------------------+ |
365
361
* | | | | |
366
362
* +--------------+-------------+--------------+-------------+
367
- *
363
+ *
368
364
* step2.2: change kv3
369
- *
365
+ *
370
366
* +--------------+-------------+--------------+-------------+
371
367
* | sector0 | sector1 | sector2 | sector3 |
372
368
* | empty | using | using | using |
@@ -387,7 +383,7 @@ static void test_fdb_gc(void)
387
383
* +--------------+-------------+--------------+-------------+
388
384
*
389
385
*/
390
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
386
+ const struct test_kv kv_tbl [] = {
391
387
{"kv0" , "000" , 2 , 0 , 1 },
392
388
{"kv1" , "111" , 2 , 0 , 1 },
393
389
{"kv2" , "222" , 2 , 0 , 1 },
@@ -485,7 +481,7 @@ static void test_fdb_gc(void)
485
481
* | | | | |
486
482
* +--------------+-------------+--------------+-------------+
487
483
*/
488
- struct test_kv kv_tbl [TEST_KV_NUM ] = {
484
+ const struct test_kv kv_tbl [] = {
489
485
{"kv0" , "0000" , 3 , 0 , 1 },
490
486
{"kv1" , "1111" , 3 , 0 , 1 },
491
487
{"kv2" , "2222" , 0 , 0 , 1 },
@@ -496,14 +492,12 @@ static void test_fdb_gc(void)
496
492
uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 2 );
497
493
}
498
494
499
- {
500
- /* check the oldest address is already right when kvdb reinit */
501
- extern void test_fdb_kvdb_deinit (void );
502
- test_fdb_kvdb_deinit ();
503
- test_fdb_kvdb_init ();
495
+ /* check the oldest address is already right when kvdb reinit */
496
+ extern void test_fdb_kvdb_deinit (void );
497
+ test_fdb_kvdb_deinit ();
498
+ test_fdb_kvdb_init ();
504
499
505
- uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 2 );
506
- }
500
+ uassert_true (RT_ALIGN_DOWN (test_kvdb .parent .oldest_addr , TEST_KVDB_SECTOR_SIZE ) == TEST_KVDB_SECTOR_SIZE * 2 );
507
501
}
508
502
509
503
static void test_fdb_kvdb_set_default (void )
0 commit comments