set wbuf to 256k by default, support auto expand & shrink

hahahashen · Sep 7, 2017 · 9ca0508 · 9ca0508
1 parent ff62c4c
commit 9ca0508
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/pika_client_conn.cc b/src/pika_client_conn.cc
@@ -159,11 +159,11 @@ int PikaClientConn::DealMessage() {
   slash::StringToLower(opt);
   std::string res = DoCmd(opt);
 
-  while ((wbuf_size_ - wbuf_len_ <= res.size())) {
-    if (!ExpandWbuf()) {
-      LOG(WARNING) << "wbuf is too large";
-      memcpy(wbuf_, "-ERR buf is too large\r\n", 23);
-      wbuf_len_ = 23;
+  if ((wbuf_size_ - wbuf_len_ < res.size())) {
+    if (!ExpandWbufTo(wbuf_len_ + res.size())) {
+      LOG(WARNING) << "ExpandWbufTo " << wbuf_len_ + res.size() << " Failed";
+      memcpy(wbuf_, "-ERR expand writer buffer failed\r\n", 34);
+      wbuf_len_ = 34;
       set_is_reply(true);
       return 0;
     }

diff --git a/third/pink b/third/pink
+1 −0		pink/include/pink_define.h
+1 −1		pink/include/redis_conn.h
+18 −7		pink/src/redis_conn.cc