[nrf toup] simplify Key/Value Get function and add

Use settings_load_one function to load one key/value settings entry
instead of settings_load_subtree_direct.
This will avoid loading all the keys for some storage backends.
Add as well internal KeyValueExist function that returns whether a Key
exist in the persistent storage or not and returns the size of its value.
Simplify as well the Delete function by using KeyValueExist function.

Signed-off-by: Riadh Ghaddab <[email protected]>

Author: rghaddab

src/platform/Zephyr/KeyValueStoreManagerImpl.cpp

@@ -34,14 +34,6 @@ namespace DeviceLayer {
 namespace PersistedStorage {
 namespace {
 
-struct ReadEntry
-{
-    void * destination;           // destination address
-    size_t destinationBufferSize; // size of destination buffer
-    size_t readSize;              // [out] size of read entry value
-    CHIP_ERROR result;            // [out] read result
-};
-
 struct DeleteSubtreeEntry
 {
     int result;
@@ -87,43 +79,6 @@ CHIP_ERROR MakeFullKey(char (&fullKey)[SETTINGS_MAX_NAME_LEN + 1], const char *
     return CHIP_NO_ERROR;
 }
 
-int LoadEntryCallback(const char * name, size_t entrySize, settings_read_cb readCb, void * cbArg, void * param)
-{
-    ReadEntry & entry = *static_cast<ReadEntry *>(param);
-
-    // If requested key X, process just node X and ignore all its descendants: X/*
-    if (name != nullptr && *name != '\0')
-        return 0;
-
-    // Found requested key.
-    uint8_t emptyValue[kEmptyValueSize];
-
-    if (entrySize == kEmptyValueSize && readCb(cbArg, emptyValue, kEmptyValueSize) == kEmptyValueSize &&
-        memcmp(emptyValue, kEmptyValue, kEmptyValueSize) == 0)
-    {
-        // Special case - an empty value represented by known magic bytes.
-        entry.result = CHIP_NO_ERROR;
-
-        // Return 1 to stop processing further keys
-        return 1;
-    }
-
-    const ssize_t bytesRead = readCb(cbArg, entry.destination, entry.destinationBufferSize);
-    entry.readSize          = bytesRead > 0 ? bytesRead : 0;
-
-    if (entrySize > entry.destinationBufferSize)
-    {
-        entry.result = CHIP_ERROR_BUFFER_TOO_SMALL;
-    }
-    else
-    {
-        entry.result = bytesRead > 0 ? CHIP_NO_ERROR : CHIP_ERROR_PERSISTED_STORAGE_FAILED;
-    }
-
-    // Return 1 to stop processing further keys
-    return 1;
-}
-
 int DeleteSubtreeCallback(const char * name, size_t /* entrySize */, settings_read_cb /* readCb */, void * /* cbArg */,
                           void * param)
 {
@@ -143,6 +98,7 @@ int DeleteSubtreeCallback(const char * name, size_t /* entrySize */, settings_re
     return 0;
 }
 
+
 } // namespace
 
 KeyValueStoreManagerImpl KeyValueStoreManagerImpl::sInstance;
@@ -152,26 +108,79 @@ void KeyValueStoreManagerImpl::Init()
     VerifyOrDie(settings_subsys_init() == 0);
 }
 
+void LoadOneAndVerifyResult(const char * fullkey, void * dest_buf, size_t dest_size, size_t * readSize,
+                               CHIP_ERROR * result)
+{
+    const ssize_t bytesRead = settings_load_one(fullKey, dest_buf, dest_size);
+    // If the return code is -ENOENT the key is not found
+        if (bytesRead == -ENOENT)
+        {
+            *result = CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND;
+            *readSize = 0;
+            return;
+        }
+        if ((bytesRead == kEmptyValueSize) && !memcmp(dest_buf, kEmptyValue, kEmptyValueSize))
+        {
+            *result = CHIP_NO_ERROR;
+            *readSize = 0;
+            return;
+        }
+        if (bytesRead > dest_size)
+        {
+            *result = CHIP_ERROR_BUFFER_TOO_SMALL;
+        }
+        else if (bytesRead >= 0)
+        {
+            *result = CHIP_NO_ERROR;
+        }
+        else
+        {
+            *result = CHIP_ERROR_PERSISTED_STORAGE_FAILED;
+        }
+
+    *readSize = (bytesRead > 0) ? bytesRead : 0;
+
+    return;
+}
+
 CHIP_ERROR KeyValueStoreManagerImpl::_Get(const char * key, void * value, size_t value_size, size_t * read_bytes_size,
                                           size_t offset_bytes) const
 {
+    CHIP_ERROR result;
+    size_t readSize = 0;
+    uint8_t emptyValue[kEmptyValueSize];
     // Offset and partial reads are not supported, for now just return NOT_IMPLEMENTED.
     // Support can be added in the future if this is needed.
     VerifyOrReturnError(offset_bytes == 0, CHIP_ERROR_NOT_IMPLEMENTED);
 
     char fullKey[SETTINGS_MAX_NAME_LEN + 1];
     ReturnErrorOnFailure(MakeFullKey(fullKey, key));
 
-    ReadEntry entry{ value, value_size, 0, CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND };
-    settings_load_subtree_direct(fullKey, LoadEntryCallback, &entry);
+    // Found requested key.
+    if (value_size < kEmptyValueSize)
+    {
+        LoadOneAndVerifyResult(fullKey, emptyValue, kEmptyValueSize, &readSize, &result);
+        if (readSize)
+        {
+            memcpy(value, emptyValue, value_size);
+        }
+        if (readSize > value_size)
+        {
+            result = CHIP_ERROR_BUFFER_TOO_SMALL;
+        }
+    }
+    else
+    {
+        LoadOneAndVerifyResult(fullKey, value, value_size, &readSize, &result);
+    }
 
     // Assign readSize only in case read_bytes_size is not nullptr, as it is optional argument
     if (read_bytes_size)
     {
-        *read_bytes_size = entry.readSize;
+        *read_bytes_size = readSize;
     }
 
-    return entry.result;
+    return result;
 }
 
 CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value, size_t value_size)
@@ -190,13 +199,29 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Put(const char * key, const void * value,
     return CHIP_NO_ERROR;
 }
 
+bool KeyValueExist(const char * fullkey, size_t * val_len)
+{
+    ssize_t len;
+
+    len = settings_get_val_len(fullKey);
+
+    if (len > 0)
+    {
+        *val_len = len;
+        return true;;
+    }
+
+    return false;
+}
+
 CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 {
     char fullKey[SETTINGS_MAX_NAME_LEN + 1];
+    size_t val_len;
+
     ReturnErrorOnFailure(MakeFullKey(fullKey, key));
 
-    ReturnErrorCodeIf(Get(key, nullptr, 0) == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND,
-                      CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
+    ReturnErrorCodeIf(!KeyValueExist(fullkey, &val_len), CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND);
     ReturnErrorCodeIf(settings_delete(fullKey) != 0, CHIP_ERROR_PERSISTED_STORAGE_FAILED);
 
     return CHIP_NO_ERROR;