From aabb9bd51b787f85e06db816a00d69c4e6b3d25a Mon Sep 17 00:00:00 2001 From: mazhao Date: Tue, 13 Jun 2023 14:32:05 +0800 Subject: [PATCH] fix fifth white box Signed-off-by: mazhao --- .../gaussdb_rd/src/common/src/db_config.cpp | 2 +- .../gaussdb_rd/src/interface/src/document_key.cpp | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/db_config.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/db_config.cpp index 1ec53e65..5061139e 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/db_config.cpp +++ b/services/distributeddataservice/service/data_share/gaussdb_rd/src/common/src/db_config.cpp @@ -57,7 +57,7 @@ bool CheckAndGetDBConfig(const JsonObject &config, const std::string &name, cons int errCode = E_OK; ValueObject configValue = config.GetObjectByPath(configField, errCode); if (errCode != E_OK) { - GLOGE("Cant find config Value"); + GLOGE("Can not find config Value"); return errCode; } if (configValue.GetValueType() != ValueObject::ValueType::VALUE_NUMBER) { diff --git a/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_key.cpp b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_key.cpp index 5c75bf1a..4d676a49 100644 --- a/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_key.cpp +++ b/services/distributeddataservice/service/data_share/gaussdb_rd/src/interface/src/document_key.cpp @@ -20,7 +20,8 @@ namespace DocumentDB { static uint16_t g_oIdIncNum = 0; - +constexpr uint16_t MAX_NUMBER_OF_AUTOINCREMENTS = 65535; +constexpr uint16_t UINT_ZERO = 0; static int InitDocIdFromOid(DocKey &docKey) { time_t nowTime = time(nullptr); @@ -30,8 +31,8 @@ static int InitDocIdFromOid(DocKey &docKey) uint32_t now = (uint32_t)nowTime; uint16_t iv = g_oIdIncNum++; // The maximum number of autoincrements is 65535, and if it is exceeded, it becomes 0. - if (g_oIdIncNum > (uint16_t)65535) { - g_oIdIncNum = (uint16_t)0; + if (g_oIdIncNum > MAX_NUMBER_OF_AUTOINCREMENTS) { + g_oIdIncNum = UINT_ZERO; } char *idTemp = new char[GRD_DOC_OID_HEX_SIZE + 1]; if (sprintf_s(idTemp, GRD_DOC_OID_HEX_SIZE + 1, "%08x%04x", now, iv) < 0) { @@ -46,11 +47,6 @@ static int InitDocIdFromOid(DocKey &docKey) int DocumentKey::GetOidDocKey(DocKey &key) { int ret = InitDocIdFromOid(key); - { - if (ret != E_OK) { - return ret; - } - } return ret; } -- Gitee