From c57770369bd0c91db793d0148de28eca76f69f65 Mon Sep 17 00:00:00 2001 From: lianhuix Date: Wed, 26 Apr 2023 06:26:32 +0000 Subject: [PATCH] fix document db compile Signed-off-by: lianhuix --- BUILD.gn | 1 + bundle.json | 3 +- .../BUILD.gn | 15 +++-- .../CMakeLists.txt | 0 .../README.md | 0 .../include/grd_base/grd_db_api.h | 6 +- .../include/grd_base/grd_error.h | 0 .../include/grd_base/grd_resultset_api.h | 8 +-- .../include/grd_base/grd_type_export.h | 4 ++ .../include/grd_document/grd_document_api.h | 17 +++-- .../src/common/include/collection_option.h | 0 .../src/common/include/db_config.h | 0 .../src/common/include/doc_limit.h | 0 .../src/common/include/json_common.h | 0 .../src/common/include/log_print.h | 0 .../src/common/include/os_api.h | 0 .../src/common/src/collection_option.cpp | 0 .../src/common/src/db_config.cpp | 0 .../src/common/src/json_common.cpp | 9 ++- .../src/common/src/log_print.cpp | 0 .../src/common/src/os_api.cpp | 0 .../src/executor/base/grd_db_api.cpp | 0 .../src/executor/document/document_check.cpp | 0 .../src/executor/document/document_check.h | 0 .../executor/document/grd_document_api.cpp | 0 .../executor/document/grd_resultset_api.cpp | 0 .../src/executor/include/grd_format_config.h | 0 .../executor/include/grd_resultset_inner.h | 0 .../src/executor/include/grd_type_inner.h | 0 .../src/interface/include/collection.h | 0 .../src/interface/include/doc_errno.h | 0 .../src/interface/include/document_store.h | 2 +- .../include/document_store_manager.h | 0 .../src/interface/include/projection_tree.h | 0 .../src/interface/include/result_set.h | 0 .../src/interface/include/result_set_common.h | 0 .../src/interface/src/collection.cpp | 0 .../src/interface/src/doc_errno.cpp | 0 .../src/interface/src/document_store.cpp | 6 +- .../interface/src/document_store_manager.cpp | 0 .../src/interface/src/projection_tree.cpp | 0 .../src/interface/src/result_set.cpp | 0 .../src/interface/src/result_set_common.cpp | 0 .../src/oh_adapter/include/json_object.h | 0 .../oh_adapter/include/kv_store_executor.h | 0 .../src/oh_adapter/include/kv_store_manager.h | 0 .../src/oh_adapter/src/json_object.cpp | 4 -- .../src/oh_adapter/src/kv_store_manager.cpp | 0 .../src/sqlite_store_executor_impl.cpp | 0 .../src/sqlite_store_executor_impl.h | 0 .../src/oh_adapter/src/sqlite_utils.cpp | 0 .../src/oh_adapter/src/sqlite_utils.h | 2 +- .../test/unittest/BUILD.gn | 64 +++++++++++-------- .../test/unittest/api/documentdb_api_test.cpp | 0 .../api/documentdb_collection_test.cpp | 0 .../unittest/api/documentdb_data_test.cpp | 0 .../unittest/api/documentdb_delete_test.cpp | 0 .../unittest/api/documentdb_find_test.cpp | 0 .../unittest/api/documentdb_insert_test.cpp | 10 +-- .../test/unittest/api/documentdb_test_utils.h | 0 .../unittest/common/documentdb_test_utils.cpp | 0 .../unittest/common/documentdb_test_utils.h | 0 .../documentdb_json_common_test.cpp | 0 .../oh_adapter/documentdb_jsonobject_test.cpp | 0 64 files changed, 83 insertions(+), 68 deletions(-) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/BUILD.gn (84%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/CMakeLists.txt (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/README.md (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/include/grd_base/grd_db_api.h (78%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/include/grd_base/grd_error.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/include/grd_base/grd_resultset_api.h (79%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/include/grd_base/grd_type_export.h (95%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/include/grd_document/grd_document_api.h (50%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/include/collection_option.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/include/db_config.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/include/doc_limit.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/include/json_common.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/include/log_print.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/include/os_api.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/src/collection_option.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/src/db_config.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/src/json_common.cpp (98%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/src/log_print.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/common/src/os_api.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/base/grd_db_api.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/document/document_check.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/document/document_check.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/document/grd_document_api.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/document/grd_resultset_api.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/include/grd_format_config.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/include/grd_resultset_inner.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/executor/include/grd_type_inner.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/collection.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/doc_errno.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/document_store.h (98%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/document_store_manager.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/projection_tree.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/result_set.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/include/result_set_common.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/collection.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/doc_errno.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/document_store.cpp (98%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/document_store_manager.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/projection_tree.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/result_set.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/interface/src/result_set_common.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/include/json_object.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/include/kv_store_executor.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/include/kv_store_manager.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/src/json_object.cpp (99%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/src/kv_store_manager.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/src/sqlite_store_executor_impl.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/src/sqlite_store_executor_impl.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/src/sqlite_utils.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/src/oh_adapter/src/sqlite_utils.h (98%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/BUILD.gn (68%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_api_test.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_collection_test.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_data_test.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_delete_test.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_find_test.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_insert_test.cpp (99%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/api/documentdb_test_utils.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/common/documentdb_test_utils.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/common/documentdb_test_utils.h (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/oh_adapter/documentdb_json_common_test.cpp (100%) rename services/distributeddataservice/service/data_share/{gaussdb_rd_Simple => gaussdb_rd_simple}/test/unittest/oh_adapter/documentdb_jsonobject_test.cpp (100%) diff --git a/BUILD.gn b/BUILD.gn index 8c8a8314..74fbc995 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -19,6 +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", ] } diff --git a/bundle.json b/bundle.json index 79367b70..ba8c8bd8 100644 --- a/bundle.json +++ b/bundle.json @@ -89,7 +89,8 @@ "//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" + "//foundation/distributeddatamgr/datamgr_service/conf:build_module", + "//foundation/distributeddatamgr/datamgr_service/services/distributeddataservice/service/data_share/gaussdb_rd_simple: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_simple/BUILD.gn similarity index 84% rename from services/distributeddataservice/service/data_share/gaussdb_rd_Simple/BUILD.gn rename to services/distributeddataservice/service/data_share/gaussdb_rd_simple/BUILD.gn index 6536f805..53e16705 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/BUILD.gn +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/BUILD.gn @@ -12,11 +12,12 @@ # limitations under the License. import("//build/ohos.gni") -config("distrdb_config") { +config("documentdb_config") { visibility = [ ":*" ] include_dirs = [ "src/common/include", "src/executor/include", + "src/executor/document", "src/oh_adapter/include", "src/oh_adapter/src", "src/interface/include", @@ -35,7 +36,7 @@ config("distrdb_config") { } } -config("distrdb_public_config") { +config("documentdb_public_config") { visibility = [ "*:*" ] include_dirs = [ "include" ] } @@ -48,24 +49,28 @@ ohos_shared_library("documentdb") { sources = [ "src/common/src/collection_option.cpp", "src/common/src/db_config.cpp", - "src/common/src/doc_common.cpp", "src/common/src/json_common.cpp", "src/common/src/log_print.cpp", "src/common/src/os_api.cpp", "src/executor/base/grd_db_api.cpp", + "src/executor/document/document_check.cpp", "src/executor/document/grd_document_api.cpp", + "src/executor/document/grd_resultset_api.cpp", "src/interface/src/collection.cpp", "src/interface/src/doc_errno.cpp", "src/interface/src/document_store.cpp", "src/interface/src/document_store_manager.cpp", + "src/interface/src/projection_tree.cpp", + "src/interface/src/result_set.cpp", + "src/interface/src/result_set_common.cpp", "src/oh_adapter/src/json_object.cpp", "src/oh_adapter/src/kv_store_manager.cpp", "src/oh_adapter/src/sqlite_store_executor_impl.cpp", "src/oh_adapter/src/sqlite_utils.cpp", ] - configs = [ ":distrdb_config" ] - public_configs = [ ":distrdb_public_config" ] + configs = [ ":documentdb_config" ] + public_configs = [ ":documentdb_public_config" ] deps = [ "//third_party/sqlite:sqlite" ] diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/CMakeLists.txt b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt similarity index 100% rename from services/distributeddataservice/service/data_share/gaussdb_rd_Simple/CMakeLists.txt rename to services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/README.md b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/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_simple/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_simple/include/grd_base/grd_db_api.h similarity index 78% 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_simple/include/grd_base/grd_db_api.h index 4ec0fc88..323c487d 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/include/grd_base/grd_db_api.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_db_api.h @@ -22,11 +22,11 @@ extern "C" { #endif // __cplusplus -int GRD_DBOpen(const char *dbPath, const char *configStr, unsigned int flags, GRD_DB **db); +DOC_API int GRD_DBOpen(const char *dbPath, const char *configStr, unsigned int flags, GRD_DB **db); -int GRD_DBClose(GRD_DB *db, unsigned int flags); +DOC_API int GRD_DBClose(GRD_DB *db, unsigned int flags); -int GRD_Flush(GRD_DB *db, unsigned int flags); +DOC_API int GRD_Flush(GRD_DB *db, unsigned int flags); #ifdef __cplusplus } 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_simple/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_simple/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_simple/include/grd_base/grd_resultset_api.h similarity index 79% 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_simple/include/grd_base/grd_resultset_api.h index 27a64277..16e0b007 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/include/grd_base/grd_resultset_api.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_resultset_api.h @@ -22,13 +22,13 @@ extern "C" { typedef struct GRD_ResultSet GRD_ResultSet; -int GRD_Next(GRD_ResultSet *resultSet); +DOC_API int GRD_Next(GRD_ResultSet *resultSet); -int GRD_GetValue(GRD_ResultSet *resultSet, char **value); +DOC_API int GRD_GetValue(GRD_ResultSet *resultSet, char **value); -int GRD_FreeValue(char *value); +DOC_API int GRD_FreeValue(char *value); -int GRD_FreeResultSet(GRD_ResultSet *resultSet); +DOC_API int GRD_FreeResultSet(GRD_ResultSet *resultSet); #ifdef __cplusplus } 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_simple/include/grd_base/grd_type_export.h similarity index 95% 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_simple/include/grd_base/grd_type_export.h index b8b3000a..201000ec 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/include/grd_base/grd_type_export.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_base/grd_type_export.h @@ -20,6 +20,10 @@ extern "C" { #endif // __cplusplus +#ifndef _WIN32 + #define DOC_API __attribute__ ((visibility ("default"))) +#endif + typedef struct GRD_DB GRD_DB; /** 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_simple/include/grd_document/grd_document_api.h similarity index 50% 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_simple/include/grd_document/grd_document_api.h index 64ae1e82..b4df9c6b 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/include/grd_document/grd_document_api.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/include/grd_document/grd_document_api.h @@ -23,19 +23,22 @@ extern "C" { #endif -int GRD_CreateCollection(GRD_DB *db, const char *collectionName, const char *optionStr, unsigned int flags); +DOC_API int GRD_CreateCollection(GRD_DB *db, const char *collectionName, const char *optionStr, unsigned int flags); -int GRD_DropCollection(GRD_DB *db, const char *collectionName, unsigned int flags); +DOC_API int GRD_DropCollection(GRD_DB *db, const char *collectionName, unsigned int flags); -int GRD_InsertDoc(GRD_DB *db, const char *collectionName, const char *document, unsigned int flags); +DOC_API int GRD_InsertDoc(GRD_DB *db, const char *collectionName, const char *document, unsigned int flags); -int GRD_FindDoc(GRD_DB *db, const char *collectionName, Query query, unsigned int flags, GRD_ResultSet **resultSet); +DOC_API int GRD_FindDoc(GRD_DB *db, const char *collectionName, Query query, unsigned int flags, + GRD_ResultSet **resultSet); -int GRD_UpdateDoc(GRD_DB *db, const char *collectionName, const char *filter, const char *update, unsigned int flags); +DOC_API int GRD_UpdateDoc(GRD_DB *db, const char *collectionName, const char *filter, const char *update, + unsigned int flags); -int GRD_UpsertDoc(GRD_DB *db, const char *collectionName, const char *filter, const char *document, unsigned int flags); +DOC_API int GRD_UpsertDoc(GRD_DB *db, const char *collectionName, const char *filter, const char *document, + unsigned int flags); -int GRD_DeleteDoc(GRD_DB *db, const char *collectionName, const char *filter, unsigned int flags); +DOC_API int GRD_DeleteDoc(GRD_DB *db, const char *collectionName, const char *filter, unsigned int flags); #ifdef __cplusplus } 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/src/common/src/json_common.cpp similarity index 98% 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_simple/src/common/src/json_common.cpp index 3fce2b4f..626216ad 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/src/common/src/json_common.cpp +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/common/src/json_common.cpp @@ -103,7 +103,7 @@ bool JsonCommon::CheckNode(JsonObject &node, std::set filedSet, boo errFlag = false; return false; } - for (int i = 0; i < fieldName.size(); i++) { + for (size_t i = 0; i < fieldName.size(); i++) { if (!((isalpha(fieldName[i])) || (isdigit(fieldName[i])) || '_' == fieldName[i])) { errFlag = false; return false; @@ -153,7 +153,7 @@ bool JsonCommon::CheckProjectionNode(JsonObject &node, std::set fil errFlag = false; return false; } - for (int i = 0; i < fieldName.size(); i++) { + for (size_t i = 0; i < fieldName.size(); i++) { if (!((isalpha(fieldName[i])) || (isdigit(fieldName[i])) || ('_' == fieldName[i]) || (isFirstFloor && '.' == fieldName[i]))) { errFlag = false; @@ -193,7 +193,7 @@ int JsonCommon::ParseNode(JsonObject &node, std::vector singlePath, std::string tempParseName; std::vector allFiledsName; std::string priFieldName = node.GetItemFiled(); - for (int j = 0; j < priFieldName.size(); j++) { + for (size_t j = 0; j < priFieldName.size(); j++) { if (priFieldName[j] != '.') { tempParseName = tempParseName + priFieldName[j]; } @@ -276,7 +276,6 @@ void JsonObjectIterator(const JsonObject &obj, JsonFieldPath path, { JsonObject child = obj.GetChild(); while (!child.IsNull()) { - bool isCollapse = false; JsonFieldPath childPath = path; childPath.push_back(child.GetItemFiled()); if (MatchFoo != nullptr && MatchFoo(childPath, child)) { @@ -351,7 +350,7 @@ bool JsonCommon::IsArrayMathch(const JsonObject &src, const JsonObject &target, bool isMatch = false; int errCode = 0; while (!srcChild.IsNull()) { - if (srcChild.GetType() == JsonObject::Type::JSON_OBJECT && target.GetType() == + if (srcChild.GetType() == JsonObject::Type::JSON_OBJECT && target.GetType() == JsonObject::Type::JSON_OBJECT && (IsJsonNodeMatch(srcChild, target, errCode))) { isMatch = true; isAlreadyMatched = 1; 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/src/interface/include/document_store.h similarity index 98% 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_simple/src/interface/include/document_store.h index 6d374782..d01360a1 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/src/interface/include/document_store.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/include/document_store.h @@ -23,7 +23,7 @@ #include "kv_store_executor.h" #include "collection.h" -class GRD_ResultSet; +struct GRD_ResultSet; namespace DocumentDB { class DocumentStore { public: 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/src/interface/src/document_store.cpp similarity index 98% 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_simple/src/interface/src/document_store.cpp index 6e8ad25d..dd4055b4 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/src/interface/src/document_store.cpp +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/interface/src/document_store.cpp @@ -23,9 +23,7 @@ #include "grd_resultset_inner.h" namespace DocumentDB { -const int COLLECTION_LENS_MAX = 512 * 1024; const int JSON_LENS_MAX = 512 * 1024; -const int JSON_DEEP_MAX = 4; constexpr const char *KEY_ID = "_id"; const bool caseSensitive = true; @@ -421,7 +419,7 @@ int DocumentStore::GetViewType(JsonObject &jsonObj, bool &viewType) if (leafValue.size() == 0) { return E_INVALID_ARGS; } - for (int i = 0; i < leafValue.size(); i++) { + for (size_t i = 0; i < leafValue.size(); i++) { switch (leafValue[i].GetValueType()) { case ValueObject::ValueType::VALUE_BOOL: if (leafValue[i].GetBoolValue()) { @@ -433,7 +431,7 @@ int DocumentStore::GetViewType(JsonObject &jsonObj, bool &viewType) if (i != 0 && viewType) { return E_INVALID_ARGS; } - viewType == false; + viewType = false; } break; case ValueObject::ValueType::VALUE_STRING: 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/src/oh_adapter/src/json_object.cpp similarity index 99% 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_simple/src/oh_adapter/src/json_object.cpp index d5ddb759..0c3de7c9 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/src/oh_adapter/src/json_object.cpp +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/json_object.cpp @@ -21,9 +21,6 @@ namespace DocumentDB { namespace { -const int COLLECTION_LENS_MAX = 512 * 1024; -const int JSON_LENS_MAX = 512 * 1024; - bool IsNumber(const std::string &str) { return std::all_of(str.begin(), str.end(), [](char c) { @@ -590,7 +587,6 @@ int JsonObject::DeleteItemDeeplyOnTarget(const JsonFieldPath &path) JsonFieldPath patherPath = path; patherPath.pop_back(); - int errCode = E_OK; cJSON *nodeFather = MoveToPath(cjson_, patherPath, caseSensitive_); if (nodeFather == nullptr) { GLOGE("Delete item failed, json field path not found."); 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/src/oh_adapter/src/sqlite_utils.h similarity index 98% 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_simple/src/oh_adapter/src/sqlite_utils.h index 4dcf5b1b..597a576e 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/src/oh_adapter/src/sqlite_utils.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/src/oh_adapter/src/sqlite_utils.h @@ -20,7 +20,7 @@ #include #include -#include "sqlite3.h" +#include "sqlite3sym.h" namespace DocumentDB { enum class TransactType { diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/test/unittest/BUILD.gn b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/BUILD.gn similarity index 68% rename from services/distributeddataservice/service/data_share/gaussdb_rd_Simple/test/unittest/BUILD.gn rename to services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/BUILD.gn index 6c6ff3c6..51d0a307 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/test/unittest/BUILD.gn +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/BUILD.gn @@ -19,12 +19,15 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "../src/common/include", - "../src/executor/include", - "../src/oh_adapter/include", - "../src/oh_adapter/src", - "../src/interface/include", - "unittest/common", + "../../include", + "../../src/common/include", + "../../src/executor/include", + "../../src/executor/document", + "../../src/oh_adapter/include", + "../../src/oh_adapter/src", + "../../src/interface/include", + + "common", ] defines = [ @@ -42,23 +45,28 @@ ohos_source_set("src_file") { testonly = true sources = [ - "../src/common/src/collection_option.cpp", - "../src/common/src/db_config.cpp", - "../src/common/src/doc_common.cpp", - "../src/common/src/json_common.cpp", - "../src/common/src/log_print.cpp", - "../src/common/src/os_api.cpp", - "../src/executor/base/grd_db_api.cpp", - "../src/executor/document/grd_document_api.cpp", - "../src/interface/src/collection.cpp", - "../src/interface/src/doc_errno.cpp", - "../src/interface/src/document_store.cpp", - "../src/interface/src/document_store_manager.cpp", - "../src/oh_adapter/src/json_object.cpp", - "../src/oh_adapter/src/kv_store_manager.cpp", - "../src/oh_adapter/src/sqlite_store_executor_impl.cpp", - "../src/oh_adapter/src/sqlite_utils.cpp", - "unittest/common/documentdb_test_utils.cpp", + "../../src/common/src/collection_option.cpp", + "../../src/common/src/db_config.cpp", + "../../src/common/src/json_common.cpp", + "../../src/common/src/log_print.cpp", + "../../src/common/src/os_api.cpp", + "../../src/executor/base/grd_db_api.cpp", + "../../src/executor/document/document_check.cpp", + "../../src/executor/document/grd_document_api.cpp", + "../../src/executor/document/grd_resultset_api.cpp", + "../../src/interface/src/collection.cpp", + "../../src/interface/src/doc_errno.cpp", + "../../src/interface/src/document_store.cpp", + "../../src/interface/src/document_store_manager.cpp", + "../../src/interface/src/projection_tree.cpp", + "../../src/interface/src/result_set.cpp", + "../../src/interface/src/result_set_common.cpp", + "../../src/oh_adapter/src/json_object.cpp", + "../../src/oh_adapter/src/kv_store_manager.cpp", + "../../src/oh_adapter/src/sqlite_store_executor_impl.cpp", + "../../src/oh_adapter/src/sqlite_utils.cpp", + + "common/documentdb_test_utils.cpp", ] configs = [ ":module_private_config" ] @@ -113,23 +121,23 @@ template("documentdb_unittest") { } documentdb_unittest("DocumentDBApiTest") { - sources = [ "unittest/api/documentdb_api_test.cpp" ] + sources = [ "api/documentdb_api_test.cpp" ] } documentdb_unittest("DocumentDBCollectionTest") { - sources = [ "unittest/api/documentdb_collection_test.cpp" ] + sources = [ "api/documentdb_collection_test.cpp" ] } documentdb_unittest("DocumentDBDataTest") { - sources = [ "unittest/api/documentdb_data_test.cpp" ] + sources = [ "api/documentdb_data_test.cpp" ] } documentdb_unittest("DocumentDBJsonCommonTest") { - sources = [ "unittest/oh_adapter/documentdb_json_common_test.cpp" ] + sources = [ "oh_adapter/documentdb_json_common_test.cpp" ] } documentdb_unittest("DocumentDBJsonObjectTest") { - sources = [ "unittest/oh_adapter/documentdb_jsonobject_test.cpp" ] + sources = [ "oh_adapter/documentdb_jsonobject_test.cpp" ] } ############################################################################### 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/test/unittest/api/documentdb_insert_test.cpp similarity index 99% 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_simple/test/unittest/api/documentdb_insert_test.cpp index 393c4bbc..5f75c674 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_Simple/test/unittest/api/documentdb_insert_test.cpp +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/test/unittest/api/documentdb_insert_test.cpp @@ -29,7 +29,7 @@ const int INT_MIN = -2147483648; const int MAX_COLLECTION_LENS = 511; const int MAX_ID_LENS = 899; -static void TestInsertDocIntoCertainColl(const char *collectionName, const char *projection, int expectedResult) +static void TestInsertDocIntoCertainColl(const char *collectionName, const char *projection, int expectedResult) { /** * @tc.steps: step1. Create Collection * @tc.expected: step1. GRD_OK @@ -109,7 +109,7 @@ HWTEST_F(DocumentInsertApiTest, DocumentInsertApiTest001, TestSize.Level1) /** * @tc.name: DocumentInsertApiTest002 - * @tc.desc: Insert documents into collection which _id is not string + * @tc.desc: Insert documents into collection which _id is not string * @tc.type: FUNC * @tc.require: * @tc.author: mazhao @@ -164,7 +164,7 @@ HWTEST_F(DocumentInsertApiTest, DocumentInsertApiTest003, TestSize.Level1) */ const char *document1 = "{\"_id\" : \"3\", \"name\" : \"Ori\"}"; EXPECT_EQ(GRD_InsertDoc(g_db, RIGHT_COLLECTION_NAME, document1, 0), GRD_OK); - + /** * @tc.steps:step2.Insert a document whose _id has appeared before * @tc.expected:step2.GRD_DATA_CONFLICT @@ -414,7 +414,7 @@ HWTEST_F(DocumentInsertApiTest, DocumentInsertApiTest017, TestSize.Level1) * @tc.expected:step1.GRD_INVALID_FORMAT. */ const char *document = "{\"_id\" : \"17\", \"level1\" : {\"level2\" : {\"level3\" : {\"level4\" : x'1234'\ - } } }, \"level1_2\" : \"level1_2Val\"}"; + } } }, \"level1_2\" : \"level1_2Val\"}"; EXPECT_EQ(GRD_InsertDoc(g_db, RIGHT_COLLECTION_NAME, document, 0), GRD_INVALID_FORMAT); } @@ -622,7 +622,7 @@ HWTEST_F(DocumentInsertApiTest, DocumentInsertApiTest, TestSize.Level1) string document4 = "\""; string document5 = ", \"name\" : \"Ori\"}"; for (int i = 0; i < 5; i++) { - string document_midlle = {'2','6' + i}; + string document_midlle = "26" + std::to_string(i); string document = document1 + document2 + document_midlle + document4 + document5; EXPECT_EQ(GRD_InsertDoc(g_db, RIGHT_COLLECTION_NAME, document.c_str(), 0), GRD_OK); } 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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/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_simple/test/unittest/oh_adapter/documentdb_jsonobject_test.cpp -- Gitee