mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

Update redis.h

Browse Source
This commit is contained in:
Victor Stewart 2020-07-09 14:00:49 -04:00 committed by GitHub
parent fc48417e9e
commit c5af03ee09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/ulib/net/client/redis.h
View File

@ -832,11 +832,7 @@ protected:
bool processRequest(char recvtype); bool processRequest(char recvtype);
#if defined(U_STDCPP_ENABLE) && defined(HAVE_CXX20) && defined(U_LINUX) && !defined(__clang__) && GCC_VERSION_NUM < 100100
bool sendRequest(UStringType&& pipeline)
#else
bool sendRequest(const UString& pipeline) bool sendRequest(const UString& pipeline)
#endif
{ {
U_TRACE_NO_PARAM(0, "UREDISClient_Base::sendRequest()"); U_TRACE_NO_PARAM(0, "UREDISClient_Base::sendRequest()");
@ -1002,7 +998,7 @@ private:
// by Victor Stewart // by Victor Stewart
#if defined(U_STDCPP_ENABLE) && defined(HAVE_CXX20) && defined(U_LINUX) && !defined(__clang__) && GCC_VERSION_NUM < 100100 #if defined(U_STDCPP_ENABLE) && defined(HAVE_CXX20) && defined(U_LINUX) && !defined(__clang__)
enum class RedisOptions : uint8_t { enum class RedisOptions : uint8_t {
@ -1401,7 +1397,7 @@ public:
///// CLUSTER ///// ///// CLUSTER /////
static uint16_t hashslotForKey(UStringType&& hashableKey) static uint16_t hashslotForKey(UStringType auto&& hashableKey)
{ {
return u_crc16(U_STRING_TO_PARAM(hashableKey)) % 16384; return u_crc16(U_STRING_TO_PARAM(hashableKey)) % 16384;
} }
@ -1428,9 +1424,10 @@ public:
pipeline.setEmpty(); pipeline.setEmpty();
} }
void setHashslot(UStringType&& hashableKey) template <UStringType T>
void setHashslot(T&& hashableKey)
{ {
hashslot = hashslotForKey(std::forward<UStringType>(hashableKey)); hashslot = hashslotForKey(std::forward<T>(hashableKey));
} }
void append(const UString& command, uint8_t count) void append(const UString& command, uint8_t count)
@ -1673,7 +1670,7 @@ private:
return report; return report;
} }
bool handleErrors(RedisReadReport& report, uint16_t hashslot, UStringType&& pipeline, size_t commandCount, bool skipRecloning = false) bool handleErrors(RedisReadReport& report, uint16_t hashslot, UStringType auto&& pipeline, size_t commandCount, bool skipRecloning = false)
{ {
bool recloned = skipRecloning; bool recloned = skipRecloning;