From 328857b3b021bcbae661165cea723c89296f493a Mon Sep 17 00:00:00 2001 From: htt1997 Date: Sat, 18 Mar 2023 11:44:14 +0800 Subject: [PATCH 1/3] update Signed-off-by: htt1997 --- .../distributeddata/include/js_device_kv_store.h | 2 +- .../distributeddata/include/js_field_node.h | 2 +- .../jskitsimpl/distributeddata/include/js_kv_store.h | 2 +- .../distributeddata/include/js_single_kv_store.h | 2 +- .../jskitsimpl/distributeddata/include/napi_queue.h | 11 ++++++++++- .../distributeddata/src/js_device_kv_store.cpp | 2 +- .../jskitsimpl/distributeddata/src/js_field_node.cpp | 2 +- .../jskitsimpl/distributeddata/src/js_kv_manager.cpp | 2 +- .../distributeddata/src/js_kv_store_resultset.cpp | 2 +- .../jskitsimpl/distributeddata/src/js_query.cpp | 2 +- .../jskitsimpl/distributeddata/src/js_schema.cpp | 2 +- .../distributeddata/src/js_single_kv_store.cpp | 2 +- 12 files changed, 21 insertions(+), 12 deletions(-) diff --git a/frameworks/jskitsimpl/distributeddata/include/js_device_kv_store.h b/frameworks/jskitsimpl/distributeddata/include/js_device_kv_store.h index aa016aeb..9b2f7e2b 100644 --- a/frameworks/jskitsimpl/distributeddata/include/js_device_kv_store.h +++ b/frameworks/jskitsimpl/distributeddata/include/js_device_kv_store.h @@ -21,7 +21,7 @@ namespace OHOS::DistributedData { class JsDeviceKVStore : public JsKVStore { public: - JsDeviceKVStore(const std::string& storeId); + explicit JsDeviceKVStore(const std::string& storeId); ~JsDeviceKVStore() = default; static napi_value Constructor(napi_env env); diff --git a/frameworks/jskitsimpl/distributeddata/include/js_field_node.h b/frameworks/jskitsimpl/distributeddata/include/js_field_node.h index 36aa79e2..62cf5a41 100644 --- a/frameworks/jskitsimpl/distributeddata/include/js_field_node.h +++ b/frameworks/jskitsimpl/distributeddata/include/js_field_node.h @@ -23,7 +23,7 @@ namespace OHOS::DistributedData { class JsFieldNode { public: using json = nlohmann::json; - JsFieldNode(const std::string& fName); + explicit JsFieldNode(const std::string& fName); ~JsFieldNode() = default; std::string GetFieldName(); diff --git a/frameworks/jskitsimpl/distributeddata/include/js_kv_store.h b/frameworks/jskitsimpl/distributeddata/include/js_kv_store.h index 545a0f6b..9560698a 100644 --- a/frameworks/jskitsimpl/distributeddata/include/js_kv_store.h +++ b/frameworks/jskitsimpl/distributeddata/include/js_kv_store.h @@ -35,7 +35,7 @@ enum { */ class JsKVStore { public: - JsKVStore(const std::string& storeId); + explicit JsKVStore(const std::string& storeId); virtual ~JsKVStore(); void SetNative(std::shared_ptr& kvStore); diff --git a/frameworks/jskitsimpl/distributeddata/include/js_single_kv_store.h b/frameworks/jskitsimpl/distributeddata/include/js_single_kv_store.h index cff7d9b9..c4421271 100644 --- a/frameworks/jskitsimpl/distributeddata/include/js_single_kv_store.h +++ b/frameworks/jskitsimpl/distributeddata/include/js_single_kv_store.h @@ -21,7 +21,7 @@ namespace OHOS::DistributedData { class JsSingleKVStore : public JsKVStore { public: - JsSingleKVStore(const std::string& storeId); + explicit JsSingleKVStore(const std::string& storeId); ~JsSingleKVStore() = default; static napi_value Constructor(napi_env env); diff --git a/frameworks/jskitsimpl/distributeddata/include/napi_queue.h b/frameworks/jskitsimpl/distributeddata/include/napi_queue.h index afb65f96..d0bb26f5 100644 --- a/frameworks/jskitsimpl/distributeddata/include/napi_queue.h +++ b/frameworks/jskitsimpl/distributeddata/include/napi_queue.h @@ -1,4 +1,4 @@ -/* + /* * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,6 +98,15 @@ private: } \ } while (0) +#define ASSERT_CALL(env, theCall, object) \ + do { \ + if ((theCall) != napi_ok) { \ + delete (object); \ + GET_AND_THROW_LAST_ERROR((env)); \ + return nullptr; \ + } \ + } while (0) + class NapiQueue { public: static napi_value AsyncWork(napi_env env, std::shared_ptr ctxt, const std::string& name, diff --git a/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp b/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp index 15e513ff..d16f7304 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_device_kv_store.cpp @@ -433,7 +433,7 @@ napi_value JsDeviceKVStore::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(kvStore != nullptr, "finalize null!"); delete kvStore; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, kvStore, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, kvStore, finalize, nullptr, nullptr), kvStore); return ctxt->self; } } // namespace OHOS::DistributedData diff --git a/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp b/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp index ea5b8b23..cbc494eb 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_field_node.cpp @@ -93,7 +93,7 @@ napi_value JsFieldNode::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(field != nullptr, "finalize null!"); delete field; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, fieldNode, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, fieldNode, finalize, nullptr, nullptr), fieldNode); return ctxt->self; } diff --git a/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp b/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp index 36eaf5ac..ed742f45 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_kv_manager.cpp @@ -365,7 +365,7 @@ napi_value JsKVManager::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(kvManager != nullptr, "finalize null!"); delete kvManager; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, kvManager, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, kvManager, finalize, nullptr, nullptr), kvManager); return ctxt->self; } diff --git a/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp b/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp index c3c5e76c..33b1557f 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_kv_store_resultset.cpp @@ -68,7 +68,7 @@ napi_value JsKVStoreResultSet::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(resultSet != nullptr, "finalize null!"); delete resultSet; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, resultSet, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, resultSet, finalize, nullptr, nullptr), resultSet); return ctxt->self; } diff --git a/frameworks/jskitsimpl/distributeddata/src/js_query.cpp b/frameworks/jskitsimpl/distributeddata/src/js_query.cpp index 5791a965..5e51afc7 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_query.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_query.cpp @@ -80,7 +80,7 @@ napi_value JsQuery::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(query != nullptr, "finalize null!"); delete query; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, query, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, query, finalize, nullptr, nullptr), query); return ctxt->self; } diff --git a/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp b/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp index 1aaeef14..5ac2add7 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_schema.cpp @@ -75,7 +75,7 @@ napi_value JsSchema::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(schema != nullptr, "finalize null!"); delete schema; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, schema, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, schema, finalize, nullptr, nullptr), schema); return ctxt->self; } diff --git a/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp b/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp index 71f2fc1f..604a986a 100644 --- a/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/js_single_kv_store.cpp @@ -455,7 +455,7 @@ napi_value JsSingleKVStore::New(napi_env env, napi_callback_info info) CHECK_RETURN_VOID(kvStore != nullptr, "finalize null!"); delete kvStore; }; - NAPI_CALL(env, napi_wrap(env, ctxt->self, kvStore, finalize, nullptr, nullptr)); + ASSERT_CALL(env, napi_wrap(env, ctxt->self, kvStore, finalize, nullptr, nullptr), kvStore); return ctxt->self; } } // namespace OHOS::DistributedData -- Gitee From aa1a1e78e1da71d78c7d4f5d6a305ae6c8d383d7 Mon Sep 17 00:00:00 2001 From: htt1997 Date: Sat, 18 Mar 2023 11:45:44 +0800 Subject: [PATCH 2/3] update Signed-off-by: htt1997 --- frameworks/jskitsimpl/distributeddata/include/napi_queue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/jskitsimpl/distributeddata/include/napi_queue.h b/frameworks/jskitsimpl/distributeddata/include/napi_queue.h index d0bb26f5..256a6304 100644 --- a/frameworks/jskitsimpl/distributeddata/include/napi_queue.h +++ b/frameworks/jskitsimpl/distributeddata/include/napi_queue.h @@ -1,4 +1,4 @@ - /* +/* * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- Gitee From c16072f781c4c5cf5814fbaebaae9930cec5c2fb Mon Sep 17 00:00:00 2001 From: htt1997 Date: Sat, 18 Mar 2023 17:49:59 +0800 Subject: [PATCH 3/3] test Signed-off-by: htt1997 --- .../src/distributed_kv_data_manager.cpp | 4 ++-- .../distributeddatafwk/src/kvstore_client.cpp | 14 +++++------ .../src/kvstore_resultset_client.cpp | 4 ++-- .../src/kvstore_snapshot_client.cpp | 6 ++--- .../src/single_kvstore_client.cpp | 24 +++++++++---------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/distributed_kv_data_manager.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/distributed_kv_data_manager.cpp index 58894cf8..22c179f1 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/distributed_kv_data_manager.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/distributed_kv_data_manager.cpp @@ -38,7 +38,7 @@ DistributedKvDataManager::~DistributedKvDataManager() Status DistributedKvDataManager::GetKvStore(const Options &options, const AppId &appId, const StoreId &storeId, std::shared_ptr &kvStore) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); kvStore = nullptr; std::string storeIdTmp = Constant::TrimCopy(storeId.storeId); @@ -81,7 +81,7 @@ Status DistributedKvDataManager::GetKvStore(const Options &options, const AppId Status DistributedKvDataManager::GetSingleKvStore(const Options &options, const AppId &appId, const StoreId &storeId, std::shared_ptr &singleKvStore) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); singleKvStore = nullptr; std::string storeIdTmp = Constant::TrimCopy(storeId.storeId); diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.cpp index 00192e53..70f80f15 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_client.cpp @@ -44,7 +44,7 @@ StoreId KvStoreClient::GetStoreId() const Status KvStoreClient::GetKvStoreSnapshot(std::shared_ptr observer, std::shared_ptr &snapshot) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); snapshot = nullptr; if (kvStoreProxy_ == nullptr) { @@ -102,7 +102,7 @@ Status KvStoreClient::ReleaseKvStoreSnapshot(std::shared_ptr &s Status KvStoreClient::Put(const Key &key, const Value &value) { ZLOGD("key: %zu value: %zu.", key.Size(), value.Size()); - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); std::vector keyData = Constant::TrimCopy>(key.Data()); if (keyData.size() == 0 || keyData.size() > Constant::MAX_KEY_LENGTH || @@ -121,7 +121,7 @@ Status KvStoreClient::Put(const Key &key, const Value &value) Status KvStoreClient::PutBatch(const std::vector &entries) { ZLOGI("entry size: %zu", entries.size()); - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (entries.size() > Constant::MAX_BATCH_SIZE) { ZLOGE("batch size must less than 128."); @@ -136,7 +136,7 @@ Status KvStoreClient::PutBatch(const std::vector &entries) Status KvStoreClient::Delete(const Key &key) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); std::vector keyData = Constant::TrimCopy>(key.Data()); if (keyData.size() == 0 || keyData.size() > Constant::MAX_KEY_LENGTH) { @@ -153,7 +153,7 @@ Status KvStoreClient::Delete(const Key &key) Status KvStoreClient::DeleteBatch(const std::vector &keys) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (keys.size() > Constant::MAX_BATCH_SIZE) { ZLOGE("batch size must less than 128."); @@ -191,7 +191,7 @@ Status KvStoreClient::StartTransaction() Status KvStoreClient::Commit() { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ != nullptr) { return kvStoreProxy_->Commit(); @@ -202,7 +202,7 @@ Status KvStoreClient::Commit() Status KvStoreClient::Rollback() { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ != nullptr) { return kvStoreProxy_->Rollback(); diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_resultset_client.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_resultset_client.cpp index 61c4707a..4c7d7954 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_resultset_client.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_resultset_client.cpp @@ -25,7 +25,7 @@ KvStoreResultSetClient::KvStoreResultSetClient(sptr kvStorePr int KvStoreResultSetClient::GetCount() const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); return kvStoreResultSetProxy_->GetCount(); } @@ -101,7 +101,7 @@ bool KvStoreResultSetClient::IsAfterLast() const Status KvStoreResultSetClient::GetEntry(Entry &entry) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); return kvStoreResultSetProxy_->GetEntry(entry); } diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_snapshot_client.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_snapshot_client.cpp index b20d6615..b346ac2b 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_snapshot_client.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/kvstore_snapshot_client.cpp @@ -38,7 +38,7 @@ KvStoreSnapshotClient::~KvStoreSnapshotClient() Status KvStoreSnapshotClient::GetEntries(const Key &prefixKey, Key &nextKey, std::vector &entries) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); std::vector keyData = Constant::TrimCopy>(prefixKey.Data()); if (keyData.size() > Constant::MAX_KEY_LENGTH) { @@ -66,7 +66,7 @@ Status KvStoreSnapshotClient::GetEntries(const Key &prefixKey, Key &nextKey, std Status KvStoreSnapshotClient::GetEntries(const Key &prefixKey, std::vector &entries) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); std::vector keyData = Constant::TrimCopy>(prefixKey.Data()); if (keyData.size() > Constant::MAX_KEY_LENGTH) { @@ -159,7 +159,7 @@ Status KvStoreSnapshotClient::GetKeys(const Key &prefixKey, std::vector &en Status KvStoreSnapshotClient::Get(const Key &key, Value &value) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); std::vector keyData = Constant::TrimCopy>(key.Data()); if (keyData.size() == 0 || keyData.size() > Constant::MAX_KEY_LENGTH) { diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/single_kvstore_client.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/single_kvstore_client.cpp index 47387a8c..174e7f28 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/single_kvstore_client.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/single_kvstore_client.cpp @@ -45,7 +45,7 @@ StoreId SingleKvStoreClient::GetStoreId() const Status SingleKvStoreClient::GetEntries(const Key &prefixKey, std::vector &entries) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ == nullptr) { ZLOGE("kvstore proxy is nullptr."); @@ -57,7 +57,7 @@ Status SingleKvStoreClient::GetEntries(const Key &prefixKey, std::vector Status SingleKvStoreClient::GetEntriesWithQuery(const std::string &query, std::vector &entries) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ == nullptr) { ZLOGE("kvstore proxy is nullptr."); @@ -74,7 +74,7 @@ Status SingleKvStoreClient::GetEntriesWithQuery(const DataQuery &query, std::vec Status SingleKvStoreClient::GetResultSet(const Key &prefixKey, std::shared_ptr &resultSet) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); resultSet = nullptr; Status statusTmp = Status::SERVER_UNAVAILABLE; if (kvStoreProxy_ == nullptr) { @@ -103,7 +103,7 @@ Status SingleKvStoreClient::GetResultSet(const Key &prefixKey, std::shared_ptr &resultSet) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); resultSet = nullptr; Status statusTmp = Status::SERVER_UNAVAILABLE; @@ -157,7 +157,7 @@ Status SingleKvStoreClient::CloseResultSet(std::shared_ptr &re Status SingleKvStoreClient::GetCountWithQuery(const std::string &query, int &result) const { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ == nullptr) { ZLOGE("kvstore proxy is nullptr."); @@ -174,7 +174,7 @@ Status SingleKvStoreClient::GetCountWithQuery(const DataQuery &query, int &resul Status SingleKvStoreClient::Sync(const std::vector &deviceIds, SyncMode mode, uint32_t allowedDelayMs) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ == nullptr) { ZLOGE("kvstore proxy is nullptr."); return Status::SERVER_UNAVAILABLE; @@ -224,7 +224,7 @@ Status SingleKvStoreClient::Delete(const Key &key) Status SingleKvStoreClient::Put(const Key &key, const Value &value) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); ZLOGI("key: %zu value: %zu.", key.Size(), value.Size()); std::vector keyData = Constant::TrimCopy>(key.Data()); @@ -242,7 +242,7 @@ Status SingleKvStoreClient::Put(const Key &key, const Value &value) Status SingleKvStoreClient::Get(const Key &key, Value &value) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ == nullptr) { ZLOGE("kvstore proxy is nullptr."); @@ -346,7 +346,7 @@ Status SingleKvStoreClient::UnRegisterSyncCallback() Status SingleKvStoreClient::PutBatch(const std::vector &entries) { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); ZLOGI("entry size: %zu", entries.size()); if (entries.size() > Constant::MAX_BATCH_SIZE) { @@ -378,7 +378,7 @@ Status SingleKvStoreClient::DeleteBatch(const std::vector &keys) Status SingleKvStoreClient::StartTransaction() { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ != nullptr) { return kvStoreProxy_->StartTransaction(); @@ -389,7 +389,7 @@ Status SingleKvStoreClient::StartTransaction() Status SingleKvStoreClient::Commit() { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ != nullptr) { return kvStoreProxy_->Commit(); @@ -400,7 +400,7 @@ Status SingleKvStoreClient::Commit() Status SingleKvStoreClient::Rollback() { - DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__), true); + DdsTrace trace(std::string(LOG_TAG "::") + std::string(__FUNCTION__)); if (kvStoreProxy_ != nullptr) { return kvStoreProxy_->Rollback(); -- Gitee