diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt index cb213c24cf765bf138f42845a5e21ee87724535b..af392b2ed5c56503810a71eec67b27b6912462bc 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt +++ b/services/distributeddataservice/service/data_share/gaussdb_rd_simple/CMakeLists.txt @@ -136,6 +136,8 @@ cmake_repo("third_party_googletest") # build cJSON cmake_repo("third_party_cJSON" "cJSON") +add_definitions(-DRUNNING_ON_SIMULATED_ENV) + find_package(Threads) enable_testing() 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 index 16e0b0070f1ad9035602c5ce219db0260262a28f..1d534708c8808a5ccc2d4e950ff7482fbe6eb501 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 @@ -16,6 +16,8 @@ #ifndef GRD_RESULTSET_API_H #define GRD_RESULTSET_API_H +#include "grd_base/grd_type_export.h" + #ifdef __cplusplus extern "C" { #endif // __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 index 1a8cf9148604026b804cb6ba1aebb832257f5e72..665cfbe289256f9c4db2465a2c50d3d6a3e3c73d 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 @@ -31,11 +31,10 @@ typedef struct GRD_DB GRD_DB; */ #define GRD_DB_OPEN_ONLY 0x00 #define GRD_DB_OPEN_CREATE 0x01 -#define GRD_DB_OPEN_CHECK_FOR_ABNORMAL \ - 0x02 // check data in database if close abnormally last time, \ - // if data is corrupted, rebuild the database -#define GRD_DB_OPEN_CHECK \ - 0x04 // check data in database when open database, if data is corrupted, rebuild the database. +// check data in database if close abnormally last time, if data is corrupted, rebuild the database +#define GRD_DB_OPEN_CHECK_FOR_ABNORMAL 0x02 +// check data in database when open database, if data is corrupted, rebuild the database. +#define GRD_DB_OPEN_CHECK 0x04 /** * @brief Close database config 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 index fa6e5f7605f3141a774abf438e1baac899c3bd54..1dec89b601b7851429145bed7e742e4de374635d 100644 --- 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 @@ -33,18 +33,18 @@ int GRD_DBOpen(const char *dbPath, const char *configStr, unsigned int flags, GR DocumentStore *store = nullptr; int ret = DocumentStoreManager::GetDocumentStore(path, config, flags, store); if (ret != E_OK || store == nullptr) { - return TrasnferDocErr(ret); + return TransferDocErr(ret); } *db = new (std::nothrow) GRD_DB(); if (*db == nullptr) { (void)DocumentStoreManager::CloseDocumentStore(store, GRD_DB_CLOSE_IGNORE_ERROR); store = nullptr; - ret = -E_OUT_OF_MEMORY; + return TransferDocErr(-E_OUT_OF_MEMORY); } (*db)->store_ = store; - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_DBClose(GRD_DB *db, unsigned int flags) @@ -55,7 +55,7 @@ int GRD_DBClose(GRD_DB *db, unsigned int flags) int ret = DocumentStoreManager::CloseDocumentStore(db->store_, flags); if (ret != E_OK) { - return TrasnferDocErr(ret); + return TransferDocErr(ret); } db->store_ = nullptr; 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 index be6b65eadc8fc40e9e28b109945de676016f3b49..78273d64100883d38486bf82e05c268450ac359b 100644 --- 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 @@ -30,7 +30,7 @@ int GRD_CreateCollection(GRD_DB *db, const char *collectionName, const char *opt std::string name = (collectionName == nullptr ? "" : collectionName); std::string option = (optionStr == nullptr ? "" : optionStr); int ret = db->store_->CreateCollection(name, option, flags); - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_DropCollection(GRD_DB *db, const char *collectionName, unsigned int flags) @@ -41,7 +41,7 @@ int GRD_DropCollection(GRD_DB *db, const char *collectionName, unsigned int flag std::string name = (collectionName == nullptr ? "" : collectionName); int ret = db->store_->DropCollection(name, flags); - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_UpdateDoc(GRD_DB *db, const char *collectionName, const char *filter, const char *update, unsigned int flags) @@ -55,7 +55,7 @@ int GRD_UpdateDoc(GRD_DB *db, const char *collectionName, const char *filter, co } else if (ret == 0) { return 0; } - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_UpsertDoc(GRD_DB *db, const char *collectionName, const char *filter, const char *document, unsigned int flags) @@ -70,7 +70,7 @@ int GRD_UpsertDoc(GRD_DB *db, const char *collectionName, const char *filter, co } else if (ret == 0) { return 0; } - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_InsertDoc(GRD_DB *db, const char *collectionName, const char *document, unsigned int flags) @@ -79,7 +79,7 @@ int GRD_InsertDoc(GRD_DB *db, const char *collectionName, const char *document, return GRD_INVALID_ARGS; } int ret = db->store_->InsertDocument(collectionName, document, flags); - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_DeleteDoc(GRD_DB *db, const char *collectionName, const char *filter, unsigned int flags) @@ -88,7 +88,7 @@ int GRD_DeleteDoc(GRD_DB *db, const char *collectionName, const char *filter, un return GRD_INVALID_ARGS; } int ret = db->store_->DeleteDocument(collectionName, filter, flags); - int errCode = TrasnferDocErr(ret); + int errCode = TransferDocErr(ret); int deleteCount = 0; switch (errCode) { case GRD_OK: @@ -123,8 +123,8 @@ int GRD_FindDoc(GRD_DB *db, const char *collectionName, Query query, unsigned in if (ret != E_OK) { delete grdResultSet; *resultSet = nullptr; - return TrasnferDocErr(ret); + return TransferDocErr(ret); } *resultSet = grdResultSet; - return TrasnferDocErr(ret); + return TransferDocErr(ret); } 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 index b54cc345bede563dab590b9c798ecb93aa5bd5ac..fd3643a34ffc6382ad10fc238637522e3bdf8310 100644 --- 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 @@ -32,7 +32,7 @@ int GRD_Next(GRD_ResultSet *resultSet) std::mutex dbMutex; std::lock_guard lock(dbMutex); int ret = resultSet->resultSet_.GetNext(); - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_GetValue(GRD_ResultSet *resultSet, char **value) @@ -48,7 +48,7 @@ int GRD_GetValue(GRD_ResultSet *resultSet, char **value) return GRD_NOT_AVAILABLE; } *value = val; - return TrasnferDocErr(ret); + return TransferDocErr(ret); } int GRD_FreeValue(char *value) 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 index 0db886c0542cb6472263cf2f9b6c6b686d176822..3a80cf4251a678384ce245cd3d1a1d3d8ee70c08 100644 --- 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 @@ -39,6 +39,6 @@ constexpr int E_JSON_PATH_NOT_EXISTS = E_BASE + 41; constexpr int E_RESOURCE_BUSY = E_BASE + 50; constexpr int E_FAILED_MEMORY_ALLOCATE = E_BASE + 51; -int TrasnferDocErr(int err); +int TransferDocErr(int err); } // namespace DocumentDB #endif // DOC_ERRNO_H \ No newline at end of file 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 index 6dc3712998845d0efaaecd06bc6914f8fda11815..edf9b8d73fd2eadf8ef3257cbaaf4b81a70c0a68 100644 --- 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 @@ -26,7 +26,7 @@ int GetErrorCategory(int errCode) return categoryCode; } -int TrasnferDocErr(int err) +int TransferDocErr(int err) { if (err > 0) { return err; 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 index 5ae0777bb6b2da52bb9ff634d20ff89f388c5e94..b8a2b55221aefec420f5cfe982f22c3501295edf 100644 --- 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 @@ -49,7 +49,11 @@ bool g_configLog = false; void SQLiteUtils::SqliteLogCallback(void *data, int err, const char *msg) { +#ifdef RUNNING_ON_SIMULATED_ENV GLOGD("[SQLite] err=%d sys=%d %s msg=%s", err, errno, sqlite3_errstr(err), msg); +#else + GLOGD("[SQLite] err=%d sys=%d %s", err, errno, sqlite3_errstr(err)); +#endif } int SQLiteUtils::CreateDataBase(const std::string &path, int flag, sqlite3 *&db) @@ -64,7 +68,7 @@ int SQLiteUtils::CreateDataBase(const std::string &path, int flag, sqlite3 *&db) int errCode = sqlite3_open_v2(path.c_str(), &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, nullptr); if (errCode != SQLITE_OK) { - GLOGE("Open database [%s] failed. %d", path.c_str(), errCode); + GLOGE("Open database failed. %d", errCode); if (db != nullptr) { (void)sqlite3_close_v2(db); db = nullptr;