From 35545d89601f000962423a88b54fb8f4be7727af Mon Sep 17 00:00:00 2001 From: mazhao Date: Tue, 18 Jul 2023 15:53:32 +0800 Subject: [PATCH] fix conflict Signed-off-by: mazhao --- .../data_share/gaussdb_rd/src/executor/document/check_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/check_common.h b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/check_common.h index 3ace4198..df29ecee 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/check_common.h +++ b/services/distributeddataservice/service/data_share/gaussdb_rd/src/executor/document/check_common.h @@ -31,7 +31,7 @@ public: static bool CheckCollectionName(const std::string &collectionName, std::string &formattedName, int &errCode); static int CheckFilter(JsonObject &document, std::vector> &filterPath, bool &isIdExist); static int CheckIdFormat(JsonObject &data, bool &isIdExisit); - static int CheckDocument(JsonObject &document, bool &isIdExist); + static int CheckDocument(JsonObject &documentObj, bool &isIdExist); static int CheckUpdata(JsonObject &updataObj); static int CheckProjection(JsonObject &projectionObj, std::vector> &path); }; -- Gitee