From 7c29b831697f0cee9481c7136648a22f4038a398 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Thu, 6 Jul 2023 14:59:00 +0800 Subject: [PATCH 1/5] add progress Code Signed-off-by: zuojiangjiang --- .../js/napi/relationalstore/include/napi_rdb_store.h | 8 -------- .../js/napi/relationalstore/src/napi_rdb_js_utils.cpp | 2 +- .../js/napi/relationalstore/src/napi_rdb_store.cpp | 9 --------- interfaces/inner_api/rdb/include/rdb_types.h | 10 ++++++++++ 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/frameworks/js/napi/relationalstore/include/napi_rdb_store.h b/frameworks/js/napi/relationalstore/include/napi_rdb_store.h index 7a02f0522..2fb423782 100644 --- a/frameworks/js/napi/relationalstore/include/napi_rdb_store.h +++ b/frameworks/js/napi/relationalstore/include/napi_rdb_store.h @@ -78,14 +78,6 @@ private: static constexpr int MIN_ON_EVENT_ARG_NUM = 2; static constexpr int MAX_ON_EVENT_ARG_NUM = 5; - class NapiCoudSyncCallback : public NapiUvQueue { - public: - explicit NapiCoudSyncCallback(napi_env env, napi_value callback) : NapiUvQueue(env, callback) {} - virtual ~NapiCoudSyncCallback() = default; - - void OnSyncCompelete(const DistributedRdb::Details &details); - }; - napi_value OnDataChangeEvent(napi_env env, size_t argc, napi_value *argv); napi_value OffDataChangeEvent(napi_env env, size_t argc, napi_value *argv); diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp index 56e9cf5ef..67a32421e 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp @@ -122,7 +122,7 @@ napi_value Convert2JSValue(napi_env env, const DistributedRdb::Statistic &statis napi_set_named_property(env, jsValue, "total", total); napi_set_named_property(env, jsValue, "success", success); napi_set_named_property(env, jsValue, "failed", failed); - napi_set_named_property(env, jsValue, "untreated", untreated); + napi_set_named_property(env, jsValue, "remained", untreated); return jsValue; } diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp index 6f587ea70..39c431d93 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp @@ -1360,15 +1360,6 @@ napi_value RdbStoreProxy::OffEvent(napi_env env, napi_callback_info info) } return nullptr; } - -void RdbStoreProxy::NapiCoudSyncCallback::OnSyncCompelete(const DistributedRdb::Details &details) -{ - LOG_DEBUG("NapiCoudSyncCallback::OnSyncCompelete begin"); - CallFunction([details](napi_env env, int &argc, napi_value *argv) { - argc = 1; - argv[0] = details.empty() ? nullptr : JSUtils::Convert2JSValue(env, details.begin()->second); - }); -} #endif } // namespace RelationalStoreJsKit } // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_api/rdb/include/rdb_types.h b/interfaces/inner_api/rdb/include/rdb_types.h index 44ecbdfe5..b79551547 100644 --- a/interfaces/inner_api/rdb/include/rdb_types.h +++ b/interfaces/inner_api/rdb/include/rdb_types.h @@ -81,6 +81,16 @@ enum Progress { SYNC_FINISH, }; +enum ProgressCode { + SUCCESS, + UNKNOWN_ERROR, + NETWORK_ERROR, + CLOUD_DISABLED, + LOCKED_BY_OTHERS, + RECORD_LIMIT_EXCEEDED, + NO_SPACE_FOR_ASSET, +}; + struct Statistic { uint32_t total; uint32_t success; -- Gitee From d9d3aaea3d5b939d00e5ed42446c9919813a34a9 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Thu, 6 Jul 2023 15:56:23 +0800 Subject: [PATCH 2/5] udpate Signed-off-by: zuojiangjiang --- interfaces/inner_api/rdb/include/rdb_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/inner_api/rdb/include/rdb_types.h b/interfaces/inner_api/rdb/include/rdb_types.h index b79551547..704efee0a 100644 --- a/interfaces/inner_api/rdb/include/rdb_types.h +++ b/interfaces/inner_api/rdb/include/rdb_types.h @@ -82,7 +82,7 @@ enum Progress { }; enum ProgressCode { - SUCCESS, + SUCCESS = 0, UNKNOWN_ERROR, NETWORK_ERROR, CLOUD_DISABLED, -- Gitee From 2b01f925593544c968303f01ac542513bbc74330 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Mon, 10 Jul 2023 14:01:49 +0800 Subject: [PATCH 3/5] update Signed-off-by: zuojiangjiang --- .../src/napi_rdb_const_properties.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp index 5091991e2..3c7798cbd 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp @@ -99,6 +99,22 @@ static napi_value ExportProgress(napi_env env) return progress; } +static napi_value ExportProgressCode(napi_env env) +{ + napi_value progressCode = nullptr; + napi_create_object(env, &progressCode); + + SET_NAPI_PROPERTY(progressCode, "SUCCESS", 0); + SET_NAPI_PROPERTY(progressCode, "UNKNOWN_ERROR", 1); + SET_NAPI_PROPERTY(progressCode, "NETWORK_ERROR", 2); + SET_NAPI_PROPERTY(progressCode, "CLOUD_DISABLED", 3); + SET_NAPI_PROPERTY(progressCode, "LOCKED_BY_OTHERS", 4); + SET_NAPI_PROPERTY(progressCode, "RECORD_LIMIT_EXCEEDED", 5); + SET_NAPI_PROPERTY(progressCode, "NO_SPACE_FOR_ASSET", 6); + napi_object_freeze(env, progressCode); + return progressCode; +} + static napi_value ExportDistributedType(napi_env env) { napi_value distributedType = nullptr; -- Gitee From 54d9b184d55b0429f254deac8c3cda8cc32e3c48 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Mon, 10 Jul 2023 14:11:35 +0800 Subject: [PATCH 4/5] update Signed-off-by: zuojiangjiang --- .../js/napi/relationalstore/src/napi_rdb_const_properties.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp index 3c7798cbd..a40206bc5 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp @@ -178,6 +178,7 @@ napi_status InitConstProperties(napi_env env, napi_value exports) DECLARE_NAPI_PROPERTY("SecurityLevel", ExportSecurityLevel(env)), #endif DECLARE_NAPI_PROPERTY("Progress", ExportProgress(env)), + DECLARE_NAPI_PROPERTY("ProgressCode", ExportProgressCode(env)), DECLARE_NAPI_PROPERTY("DistributedType", ExportDistributedType(env)), DECLARE_NAPI_PROPERTY("AssetStatus", ExportAssetStatus(env)), DECLARE_NAPI_PROPERTY("ChangeType", ExportChangeType(env)), -- Gitee From 8f570ddce555008f161c92a41274375f4563ac9d Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Tue, 11 Jul 2023 14:10:08 +0000 Subject: [PATCH 5/5] update frameworks/js/napi/relationalstore/include/napi_rdb_store.h. Signed-off-by: zuojiangjiang --- frameworks/js/napi/relationalstore/include/napi_rdb_store.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/frameworks/js/napi/relationalstore/include/napi_rdb_store.h b/frameworks/js/napi/relationalstore/include/napi_rdb_store.h index ba894dd3d..b9b8408d8 100644 --- a/frameworks/js/napi/relationalstore/include/napi_rdb_store.h +++ b/frameworks/js/napi/relationalstore/include/napi_rdb_store.h @@ -79,9 +79,6 @@ private: static constexpr int MIN_ON_EVENT_ARG_NUM = 2; static constexpr int MAX_ON_EVENT_ARG_NUM = 5; - napi_value OnDataChangeEvent(napi_env env, size_t argc, napi_value *argv); - napi_value OffDataChangeEvent(napi_env env, size_t argc, napi_value *argv); - napi_value OnRemote(napi_env env, size_t argc, napi_value *argv); napi_value OnLocal(napi_env env, const DistributedRdb::SubscribeOption &option, napi_value callback); napi_value RegisteredObserver(napi_env env, const DistributedRdb::SubscribeOption &option, -- Gitee