diff --git a/NFComm/NFPluginModule/NFICommonRedisModule.h b/NFComm/NFPluginModule/NFICommonRedisModule.h index f6bdb0887d..7b52765a18 100644 --- a/NFComm/NFPluginModule/NFICommonRedisModule.h +++ b/NFComm/NFPluginModule/NFICommonRedisModule.h @@ -31,12 +31,12 @@ class NFICommonRedisModule virtual bool SaveCacheRecordInfo(const NFGUID& self, NF_SHARE_PTR pRecordManager) = 0; //support hset - virtual bool ConvertPBToPropertyManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR& pPropertyManager) = 0; - virtual bool ConvertPBToRecordManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR& pRecordManager) = 0; + virtual bool ConvertPBToPropertyManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR pPropertyManager) = 0; + virtual bool ConvertPBToRecordManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR pRecordManager) = 0; //support hmset - virtual bool ConvertPropertyManagerToPB(const NF_SHARE_PTR& pPropertyManager, std::vector& vKeyList, std::vector& vValueList) = 0; - virtual bool ConvertRecordManagerToPB(const NF_SHARE_PTR& pRecordManager, std::vector& vKeyList, std::vector& vValueList) = 0; + virtual bool ConvertPropertyManagerToPB(NF_SHARE_PTR pPropertyManager, std::vector& vKeyList, std::vector& vValueList) = 0; + virtual bool ConvertRecordManagerToPB(NF_SHARE_PTR pRecordManager, std::vector& vKeyList, std::vector& vValueList) = 0; }; diff --git a/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.cpp b/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.cpp index f39a2cdb79..8fe5bcb1a7 100644 --- a/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.cpp +++ b/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.cpp @@ -272,7 +272,7 @@ bool NFCCommonRedisModule::SaveCacheRecordInfo(const NFGUID& self, NF_SHARE_PTR< return true; } -bool NFCCommonRedisModule::ConvertPBToPropertyManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR& pPropertyManager) +bool NFCCommonRedisModule::ConvertPBToPropertyManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR pPropertyManager) { if (vKeyList.size() == vValueList.size()) { @@ -302,7 +302,7 @@ bool NFCCommonRedisModule::ConvertPBToPropertyManager(std::vector& return true; } -bool NFCCommonRedisModule::ConvertPBToRecordManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR& pRecordManager) +bool NFCCommonRedisModule::ConvertPBToRecordManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR pRecordManager) { if (vKeyList.size() == vValueList.size()) { @@ -337,7 +337,7 @@ bool NFCCommonRedisModule::ConvertPBToRecordManager(std::vector& vK return true; } -bool NFCCommonRedisModule::ConvertPropertyManagerToPB(const NF_SHARE_PTR& pPropertyManager, std::vector& vKeyList, std::vector& vValueList) +bool NFCCommonRedisModule::ConvertPropertyManagerToPB(NF_SHARE_PTR pPropertyManager, std::vector& vKeyList, std::vector& vValueList) { for (NF_SHARE_PTR pProperty = pPropertyManager->First(); pProperty != NULL; pProperty = pPropertyManager->Next()) { @@ -357,7 +357,7 @@ bool NFCCommonRedisModule::ConvertPropertyManagerToPB(const NF_SHARE_PTR& pRecordManager, std::vector& vKeyList, std::vector& vValueList) +bool NFCCommonRedisModule::ConvertRecordManagerToPB(NF_SHARE_PTR pRecordManager, std::vector& vKeyList, std::vector& vValueList) { for (NF_SHARE_PTR pRecord = pRecordManager->First(); pRecord != NULL; pRecord = pRecordManager->Next()) { diff --git a/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.h b/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.h index e20dd97d5d..f9ad1b1a36 100644 --- a/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.h +++ b/NFServer/NFDataAgent_NosqlPlugin/NFCCommonRedisModule.h @@ -42,12 +42,12 @@ class NFCCommonRedisModule : public NFICommonRedisModule virtual bool SaveCacheRecordInfo(const NFGUID& self, NF_SHARE_PTR pRecordManager); //support hmset - virtual bool ConvertPBToPropertyManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR& pPropertyManager); - virtual bool ConvertPBToRecordManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR& pRecordManager); + virtual bool ConvertPBToPropertyManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR pPropertyManager); + virtual bool ConvertPBToRecordManager(std::vector& vKeyList, std::vector& vValueList, NF_SHARE_PTR pRecordManager); //support hmset - virtual bool ConvertPropertyManagerToPB(const NF_SHARE_PTR& pPropertyManager, std::vector& vKeyList, std::vector& vValueList); - virtual bool ConvertRecordManagerToPB(const NF_SHARE_PTR& pRecordManager, std::vector& vKeyList, std::vector& vValueList); + virtual bool ConvertPropertyManagerToPB(const NF_SHARE_PTR pPropertyManager, std::vector& vKeyList, std::vector& vValueList); + virtual bool ConvertRecordManagerToPB(const NF_SHARE_PTR pRecordManager, std::vector& vKeyList, std::vector& vValueList); protected: virtual bool ConvertRecordToPB(const NF_SHARE_PTR& pRecord, NFMsg::ObjectRecordBase* pRecordData);