diff --git a/BUILD.gn b/BUILD.gn
index 34a8996a..21cf9845 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -15,11 +15,9 @@ import("//build/ohos.gni")
group("build_native_test") {
testonly = true
deps = [
- "frameworks/innerkitsimpl/distributeddatafwk/test:unittest",
"services/distributeddataservice/adapter/test:unittest",
"services/distributeddataservice/app/test:unittest",
"services/distributeddataservice/framework/test:unittest",
- "services/distributeddataservice/libs/distributeddb/test:unittest",
"services/distributeddataservice/service/test:unittest",
"services/distributeddataservice/test:moduletest",
]
@@ -36,10 +34,4 @@ group("fuzztest") {
"test/fuzztest/kvstoredisksize_fuzzer:fuzztest",
]
}
-
-group("distributedtest") {
- testonly = true
- deps = []
- deps += [ "test/distributedtest/single_kvstore_client:distributedtest" ]
-}
###############################################################################
diff --git a/README.md b/README.md
index 272f470e..1a4d5680 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ You call APIs of DDS to create, access, and subscribe to distributed databases.
## Directory Structure
```
-/foundation/distributeddatamgr/distributeddatamgr
+/foundation/distributeddatamgr/datamgr_service
├── interfaces # APIs
│ └── innerkits # Native APIs
│ └── jskits # JavaScript APIs
diff --git a/README_zh.md b/README_zh.md
index 746bc607..192b2fff 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -43,7 +43,7 @@
## 目录
```
-/foundation/distributeddatamgr/distributeddatamgr
+/foundation/distributeddatamgr/datamgr_service
├── interfaces # 接口层代码
│ └── innerkits # Native接口
│ └── jskits # JavaScript接口
diff --git a/bundle.json b/bundle.json
index afff82a1..17381274 100644
--- a/bundle.json
+++ b/bundle.json
@@ -1,10 +1,10 @@
{
- "name": "@ohos/distributeddatamgr_datamgr",
+ "name": "@ohos/distributeddatamgr_datamgr_service",
"version": "1.0.0",
"description": "Distributed data manager that provides the capability to store data in the databases of different devices",
"homePage": "https://gitee.com/openharmony",
"license": "Apache V2",
- "repository": "https://gitee.com/openharmony/distributeddatamgr_datamgr",
+ "repository": "https://gitee.com/openharmony/distributeddatamgr_datamgr_service",
"domain": "os",
"language": "",
"publishAs": "code-segment",
@@ -15,7 +15,7 @@
],
"keywords": [
"distributeddatamgr",
- "datamgr"
+ "datamgr_service"
],
"envs": [],
"dirs": [],
@@ -32,10 +32,10 @@
}
],
"segment": {
- "destPath": "foundation/distributeddatamgr/distributeddatamgr"
+ "destPath": "foundation/distributeddatamgr/datamgr_service"
},
"component": {
- "name": "distributeddatamgr",
+ "name": "datamgr_service",
"subsystem": "distributeddatamgr",
"syscap": [
"SystemCapability.DistributedDataManager.KVStore.Core",
@@ -49,7 +49,7 @@
"rom": "",
"ram": "",
"hisysevent_config": [
- "//foundation/distributeddatamgr/distributeddatamgr/hisysevent.yaml"
+ "//foundation/distributeddatamgr/datamgr_service/hisysevent.yaml"
],
"deps": {
"components": [
@@ -86,17 +86,14 @@
},
"build": {
"sub_component": [
- "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:build_module",
- "//foundation/distributeddatamgr/distributeddatamgr/interfaces/jskits/distributeddata:build_module",
- "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/app:build_module",
- "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb:build_module",
- "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/framework:build_module",
- "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/service:build_module",
- "//foundation/distributeddatamgr/distributeddatamgr/conf:build_module"
+ "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/app:build_module",
+ "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/framework:build_module",
+ "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service:build_module",
+ "//foundation/distributeddatamgr/datamgr_service/conf:build_module"
],
"inner_kits": [
{
- "name": "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
+ "name": "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata:distributeddata_inner",
"header": {
"header_files": [
"blob.h",
@@ -114,16 +111,14 @@
"device_status_change_listener.h",
"store_errno.h"
],
- "header_base": "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata/include"
+ "header_base": "//foundation/distributeddatamgr/kv_store/interfaces/innerkits/distributeddata/include"
}
}
],
"test": [
- "//foundation/distributeddatamgr/distributeddatamgr:build_native_test",
- "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/libs/distributeddb/test:distributeddatamgr_fuzztest",
- "//foundation/distributeddatamgr/distributeddatamgr:fuzztest",
- "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/test:fuzztest",
- "//foundation/distributeddatamgr/distributeddatamgr:distributedtest"
+ "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/test:fuzztest",
+ "//foundation/distributeddatamgr/datamgr_service:fuzztest",
+ "//foundation/distributeddatamgr/datamgr_service:build_native_test"
]
}
}
diff --git a/conf/BUILD.gn b/conf/BUILD.gn
index ee2d968c..0e9037c6 100644
--- a/conf/BUILD.gn
+++ b/conf/BUILD.gn
@@ -21,5 +21,5 @@ ohos_prebuilt_etc("default_conf") {
source = "config.json"
relative_install_dir = "distributeddata/conf"
subsystem_name = "distributeddatamgr"
- part_name = "distributeddatamgr"
+ part_name = "datamgr_service"
}
diff --git a/distributeddatamgr.gni b/datamgr_service.gni
similarity index 93%
rename from distributeddatamgr.gni
rename to datamgr_service.gni
index e5120c67..d1abd9af 100644
--- a/distributeddatamgr.gni
+++ b/datamgr_service.gni
@@ -12,10 +12,10 @@
# limitations under the License.
declare_args() {
- distributeddatamgr_power = true
+ datamgr_service_power = true
if (!defined(global_parts_info.power_manager_native_powermgr_client) ||
!defined(global_parts_info.battery_manager_native_batterysrv_client)) {
- distributeddatamgr_power = false
+ datamgr_service_power = false
}
if (!defined(global_parts_info) ||
diff --git a/frameworks/common/concurrent_map.h b/frameworks/common/concurrent_map.h
deleted file mode 100644
index 7c9b3921..00000000
--- a/frameworks/common/concurrent_map.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef OHOS_DISTRIBUTED_DATA_FRAMEWORKS_COMMON_CONCURRENT_MAP_H
-#define OHOS_DISTRIBUTED_DATA_FRAMEWORKS_COMMON_CONCURRENT_MAP_H
-#include
-#include