diff --git a/BUILD.gn b/BUILD.gn index 74fbc9952cf325e25efa20ba140ad0396ef2b1df..29e9f9038586d428744fba754c9a01f085df7baf 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -19,7 +19,7 @@ group("build_native_test") { "services/distributeddataservice/app/test:unittest", "services/distributeddataservice/framework/test:unittest", "services/distributeddataservice/service/test:unittest", - "services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest:unittest", + "services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest:unittest", ] } diff --git a/bundle.json b/bundle.json index ba8c8bd8c7864843ca0ff3eca5c22eb5fdd7fc43..a5d2bd57f46cd728cf4daf6c2b3815ea71863c93 100644 --- a/bundle.json +++ b/bundle.json @@ -90,7 +90,7 @@ "//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", - "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/data_share/gaussdb_rd_simple:build_module" + "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/data_share/gaussdb_rd:build_module" ], "inner_kits": [], "test": [ diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/BUILD.gn b/services/distributeddataservice/service/data_share/gaussdb_rd/BUILD.gn similarity index 97% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/BUILD.gn rename to services/distributeddataservice/service/data_share/gaussdb_rd/BUILD.gn index 6eab0b5d795e4c4e5210cc456c16699e1f609cfc..8282d4b37b8f8c21c546a79140ea0227db09e906 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/BUILD.gn +++ b/services/distributeddataservice/service/data_share/gaussdb_rd/BUILD.gn @@ -42,10 +42,10 @@ config("documentdb_public_config") { } group("build_module") { - deps = [ ":documentdb" ] + deps = [ ":gaussdb_rd" ] } -ohos_shared_library("documentdb") { +ohos_shared_library("gaussdb_rd") { sources = [ "src/common/src/collection_option.cpp", "src/common/src/db_config.cpp", diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt b/services/distributeddataservice/service/data_share/gaussdb_rd/CMakeLists.txt similarity index 99% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt rename to services/distributeddataservice/service/data_share/gaussdb_rd/CMakeLists.txt index 35127fc40bc6efcdc9a99154c897151fe4833579..aa99750857ef6129b626379550264f6035f66b6f 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt +++ b/services/distributeddataservice/service/data_share/gaussdb_rd/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) -project(grd_simple VERSION 1.0.0) +project(gaussdb_rd VERSION 1.0.0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -std=c++17 -pthread") diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/README.md b/services/distributeddataservice/service/data_share/gaussdb_rd/README.md similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/README.md rename to services/distributeddataservice/service/data_share/gaussdb_rd/README.md diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_db_api.h b/services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_db_api.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_db_api.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_db_api.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_error.h b/services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_error.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_error.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_error.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_resultset_api.h b/services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_resultset_api.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_resultset_api.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_resultset_api.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_type_export.h b/services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_type_export.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_type_export.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_base/grd_type_export.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_document/grd_document_api.h b/services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_document/grd_document_api.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_document/grd_document_api.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/include/grd_document/grd_document_api.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/collection_option.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/collection_option.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/collection_option.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/collection_option.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/db_config.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/db_config.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/db_config.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/db_config.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/doc_limit.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/doc_limit.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/doc_limit.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/doc_limit.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/json_common.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/json_common.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/json_common.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/json_common.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/log_print.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/log_print.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/log_print.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/log_print.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/os_api.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/os_api.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/include/os_api.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/include/os_api.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/collection_option.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/collection_option.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/collection_option.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/collection_option.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/db_config.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/db_config.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/db_config.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/db_config.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/json_common.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/json_common.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/json_common.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/json_common.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/log_print.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/log_print.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/log_print.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/log_print.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/os_api.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/os_api.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/os_api.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/os_api.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/base/grd_db_api.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/base/grd_db_api.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/base/grd_db_api.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/base/grd_db_api.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/document_check.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/document_check.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/document_check.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/document_check.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/document_check.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/grd_document_api.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/grd_document_api.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/grd_document_api.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/grd_document_api.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/grd_resultset_api.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/grd_resultset_api.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/document/grd_resultset_api.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/grd_resultset_api.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/include/grd_format_config.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/include/grd_format_config.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/include/grd_format_config.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/include/grd_format_config.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/include/grd_resultset_inner.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/include/grd_resultset_inner.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/include/grd_resultset_inner.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/include/grd_resultset_inner.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/include/grd_type_inner.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/include/grd_type_inner.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/executor/include/grd_type_inner.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/include/grd_type_inner.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/collection.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/collection.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/collection.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/collection.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/doc_errno.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/doc_errno.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/doc_errno.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/doc_errno.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/document_store.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/document_store.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/document_store.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/document_store.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/document_store_manager.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/document_store_manager.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/document_store_manager.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/document_store_manager.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/projection_tree.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/projection_tree.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/projection_tree.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/projection_tree.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/result_set.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/result_set.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/result_set.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/result_set.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/result_set_common.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/result_set_common.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/result_set_common.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/include/result_set_common.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/collection.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/collection.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/collection.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/collection.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/doc_errno.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/doc_errno.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/doc_errno.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/doc_errno.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/document_store.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_store.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/document_store.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_store.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/document_store_manager.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_store_manager.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/document_store_manager.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_store_manager.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/projection_tree.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/projection_tree.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/projection_tree.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/projection_tree.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/result_set.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/result_set.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/result_set_common.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set_common.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/result_set_common.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/result_set_common.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/include/json_object.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/include/json_object.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/include/json_object.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/include/json_object.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/include/kv_store_executor.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/include/kv_store_executor.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/include/kv_store_executor.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/include/kv_store_executor.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/include/kv_store_manager.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/include/kv_store_manager.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/include/kv_store_manager.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/include/kv_store_manager.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/json_object.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/json_object.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/json_object.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/json_object.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/kv_store_manager.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/kv_store_manager.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/kv_store_manager.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/kv_store_manager.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_store_executor_impl.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_store_executor_impl.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_store_executor_impl.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_store_executor_impl.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_store_executor_impl.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_store_executor_impl.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_store_executor_impl.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_store_executor_impl.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_utils.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_utils.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_utils.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_utils.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/src/oh_adapter/src/sqlite_utils.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/BUILD.gn b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/BUILD.gn similarity index 99% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/BUILD.gn rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/BUILD.gn index 6b482aba5d906320d336ebf49b00c457a48dad8c..42adb4b994e5a6b638e253a5436bbac8bbb46cf0 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/BUILD.gn +++ b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/test.gni") -module_output_path = "datamgr_service/documentdb" +module_output_path = "datamgr_service/gaussdb_rd" ############################################################################### config("module_private_config") { diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_api_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_api_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_api_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_api_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_collection_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_collection_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_collection_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_collection_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_data_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_data_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_data_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_data_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_delete_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_delete_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_delete_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_delete_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_find_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_find_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_find_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_find_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_insert_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_insert_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_insert_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_insert_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_test_utils.h b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_test_utils.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_test_utils.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/api/documentdb_test_utils.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/common/documentdb_test_utils.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/common/documentdb_test_utils.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/common/documentdb_test_utils.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/common/documentdb_test_utils.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/common/documentdb_test_utils.h b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/common/documentdb_test_utils.h similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/common/documentdb_test_utils.h rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/common/documentdb_test_utils.h diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/oh_adapter/documentdb_json_common_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/oh_adapter/documentdb_json_common_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/oh_adapter/documentdb_json_common_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/oh_adapter/documentdb_json_common_test.cpp diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/oh_adapter/documentdb_jsonobject_test.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/oh_adapter/documentdb_jsonobject_test.cpp similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/oh_adapter/documentdb_jsonobject_test.cpp rename to services/distributeddataservice/service/data_share/gaussdb_rd/test/unittest/oh_adapter/documentdb_jsonobject_test.cpp