Merge branch 'master' of github.com:brpc/brpc

README.md

@@ -12,7 +12,7 @@ You can use it to:
   * [redis](docs/en/redis_client.md) and [memcached](docs/en/memcache_client.md), thread-safe, more friendly and performant than the official clients
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), for building [live-streaming services](docs/cn/live_streaming.md).
   * hadoop_rpc(not opensourced yet)
-  * [rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access) support via [openucx](https://github.com/openucx/ucx) (will be opensourced)
+  * [rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access) support
   * all sorts of protocols used in Baidu: [baidu_std](docs/cn/baidu_std.md), [streaming_rpc](docs/en/streaming_rpc.md), hulu_pbrpc, [sofa_pbrpc](https://github.com/baidu/sofa-pbrpc), nova_pbrpc, public_pbrpc, ubrpc, and nshead-based ones.
   * Access protobuf-based protocols with HTTP+json, probably from another language.
   * Build [HA](https://en.wikipedia.org/wiki/High_availability) distributed services using an industrial-grade implementation of [RAFT consensus algorithm](https://raft.github.io) (will be opensourced at [braft](https://github.com/brpc/braft))
@@ -99,7 +99,7 @@ brpc welcomes contributions, especially those on adapting different platforms an
 
 Make sure the code meets following requirements before submitting your PR:
 
-- Conforms to [google C++ coding style](https://google.github.io/styleguide/cppguide.html)
+- Conforms to [google C++ coding style](https://google.github.io/styleguide/cppguide.html) and set 1 tab to 4 spaces.
 - The code appears where it should be. For example the code to support an extra protocol should not be put in general classes like server.cpp, channel.cpp, while a general modification would better not be hidden inside a very specific protocol.
 - Has unittests.
 

README_cn.md

@@ -13,7 +13,7 @@
   * [redis](docs/cn/redis_client.md)和[memcached](docs/cn/memcache_client.md), 线程安全，比官方client更方便。
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), 可用于搭建[直播服务](docs/cn/live_streaming.md).
   * hadoop_rpc(仍未开源)
-  * 基于[openucx](https://github.com/openucx/ucx)支持[rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access)(即将开源)
+  * 支持[rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access)(即将开源)
   * 各种百度内使用的协议: [baidu_std](docs/cn/baidu_std.md), [streaming_rpc](docs/cn/streaming_rpc.md), hulu_pbrpc, [sofa_pbrpc](https://github.com/baidu/sofa-pbrpc), nova_pbrpc, public_pbrpc, ubrpc和使用nshead的各种协议.
   * 从其他语言通过HTTP+json访问基于protobuf的协议.
   * 基于工业级的[RAFT算法](https://raft.github.io)实现搭建[高可用](https://en.wikipedia.org/wiki/High_availability)分布式系统 (即将在[braft](https://github.com/brpc/braft)开源)
@@ -100,7 +100,7 @@ brpc欢迎贡献代码，特别是对不同平台，协议的扩展代码。
 
 提交PR前请确认你的代码符合如下要求：
 
-* 符合[google C++代码规范](https://google.github.io/styleguide/cppguide.html)
+* 符合[google C++代码规范](https://google.github.io/styleguide/cppguide.html), 并把1个tab设置为4个空格。
 * 代码出现的位置和其定位相符。比如对于某特定协议的扩展代码不该出现在server.cpp, channel.cpp这些较为通用的类中，而一些非常通用的改动也不该深藏在某个特定协议的cpp中。
 * 有对应的单测代码。
 

docs/cn/overview.md

@@ -45,7 +45,7 @@ RPC不是万能的抽象，否则我们也不需要TCP/IP这一层了。但是
   * [redis](redis_client.md)和[memcached](memcache_client.md), 线程安全，比官方client更方便。
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), 可用于搭建[直播服务](live_streaming.md).
   * hadoop_rpc(仍未开源)
-  * 基于[openucx](https://github.com/openucx/ucx)支持[rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access)(即将开源)
+  * 支持[rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access)(即将开源)
   * 各种百度内使用的协议: [baidu_std](baidu_std.md), [streaming_rpc](streaming_rpc.md), hulu_pbrpc, [sofa_pbrpc](https://github.com/baidu/sofa-pbrpc), nova_pbrpc, public_pbrpc, ubrpc和使用nshead的各种协议.
   * 从其他语言通过HTTP+json访问基于protobuf的协议.
   * 基于工业级的[RAFT算法](https://raft.github.io)实现搭建[高可用](https://en.wikipedia.org/wiki/High_availability)分布式系统 (即将在[braft](https://github.com/brpc/braft)开源)

docs/en/overview.md

@@ -42,7 +42,7 @@ You can use it to:
   * [redis](redis_client.md) and [memcached](memcache_client.md), thread-safe, more friendly and performant than the official clients
   * [rtmp](https://github.com/brpc/brpc/blob/master/src/brpc/rtmp.h)/[flv](https://en.wikipedia.org/wiki/Flash_Video)/[hls](https://en.wikipedia.org/wiki/HTTP_Live_Streaming), for building [live-streaming services](../cn/live_streaming.md).
   * hadoop_rpc(not opensourced yet)
-  * [rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access) support via [openucx](https://github.com/openucx/ucx) (will be opensourced)
+  * [rdma](https://en.wikipedia.org/wiki/Remote_direct_memory_access) support
   * all sorts of protocols used in Baidu: [baidu_std](../cn/baidu_std.md), [streaming_rpc](streaming_rpc.md), hulu_pbrpc, [sofa_pbrpc](https://github.com/baidu/sofa-pbrpc), nova_pbrpc, public_pbrpc, ubrpc, and nshead-based ones.
   * Access protobuf-based protocols with HTTP+json, probably from another language.
   * Build [HA](https://en.wikipedia.org/wiki/High_availability) distributed services using an industrial-grade implementation of [RAFT consensus algorithm](https://raft.github.io) (will be opensourced at [braft](https://github.com/brpc/braft))

src/brpc/controller.h

@@ -116,7 +116,7 @@ friend void policy::ProcessMongoRequest(InputMessageBase*);
     static const uint32_t FLAGS_PB_BYTES_TO_BASE64 = (1 << 11);
     static const uint32_t FLAGS_ALLOW_DONE_TO_RUN_IN_PLACE = (1 << 12);
     static const uint32_t FLAGS_USED_BY_RPC = (1 << 13);
-    static const uint32_t FLAGS_REQUEST_WITH_AUTH = (1 << 14);
+    static const uint32_t FLAGS_REQUEST_WITH_AUTH = (1 << 15);
     
 public:
     Controller();

src/brpc/details/controller_private_accessor.h

@@ -125,11 +125,9 @@ public:
     void set_readable_progressive_attachment(ReadableProgressiveAttachment* s)
     { _cntl->_rpa.reset(s); }
 
-    ControllerPrivateAccessor &set_with_auth(bool with_auth) {
-        _cntl->set_flag(Controller::FLAGS_REQUEST_WITH_AUTH, with_auth);
-        return *this;
+    void add_with_auth() {
+        _cntl->add_flag(Controller::FLAGS_REQUEST_WITH_AUTH);
     }
-    bool with_auth() const { return _cntl->has_flag(Controller::FLAGS_REQUEST_WITH_AUTH); }
 private:
     Controller* _cntl;
 };

src/brpc/policy/redis_authenticator.h

@@ -24,19 +24,19 @@ namespace policy {
 
 // Request to redis for authentication.
 class RedisAuthenticator : public Authenticator {
- public:
-  RedisAuthenticator(const std::string& passwd)
-      : passwd_(passwd) {}
+public:
+    RedisAuthenticator(const std::string& passwd)
+        : passwd_(passwd) {}
 
-  int GenerateCredential(std::string* auth_str) const;
+    int GenerateCredential(std::string* auth_str) const;
 
-  int VerifyCredential(const std::string&, const butil::EndPoint&,
-                       brpc::AuthContext*) const {
-    return 0;
-  }
+    int VerifyCredential(const std::string&, const butil::EndPoint&,
+                         brpc::AuthContext*) const {
+        return 0;
+    }
 
- private:
-  const std::string passwd_;
+private:
+    const std::string passwd_;
 };
 
 }  // namespace policy

src/brpc/policy/redis_protocol.cpp

@@ -188,9 +188,7 @@ void PackRedisRequest(butil::IOBuf* buf,
             return cntl->SetFailed(EREQUEST, "Fail to generate credential");
         }
         buf->append(auth_str);
-        ControllerPrivateAccessor(cntl).set_with_auth(true);
-    } else {
-        ControllerPrivateAccessor(cntl).set_with_auth(false);
+        ControllerPrivateAccessor(cntl).add_with_auth();
     }
 
     buf->append(request);

src/brpc/socket.cpp

@@ -86,7 +86,6 @@ BRPC_VALIDATE_GFLAG(connect_timeout_as_unreachable,
                          validate_connect_timeout_as_unreachable);
 
 const int WAIT_EPOLLOUT_TIMEOUT_MS = 50;
-static const uint32_t REDIS_AUTH_FLAG = (1ul << 15);
 
 #ifdef BAIDU_INTERNAL
 #define BRPC_AUXTHREAD_ATTR                                        \
@@ -305,9 +304,12 @@ struct BAIDU_CACHELINE_ALIGNMENT Socket::WriteRequest {
     Socket* socket;
     
     uint32_t pipelined_count() const {
-        return (_pc_and_udmsg >> 48) & 0xFFFF;
+        return (_pc_and_udmsg >> 48) & 0x7FFF;
     }
-    void clear_pipelined_count() {
+    bool is_with_auth() const {
+        return _pc_and_udmsg & 0x8000000000000000ULL;
+    }
+    void clear_pipelined_count_and_with_auth() {
         _pc_and_udmsg &= 0xFFFFFFFFFFFFULL;
     }
     SocketMessage* user_message() const {
@@ -318,8 +320,8 @@ struct BAIDU_CACHELINE_ALIGNMENT Socket::WriteRequest {
     }
     void set_pipelined_count_and_user_message(
         uint32_t pc, SocketMessage* msg, bool with_auth) {
-        if (pc != 0 && with_auth) {
-          pc |= REDIS_AUTH_FLAG;
+        if (with_auth) {
+          pc |= (1 << 15);
         }
         _pc_and_udmsg = ((uint64_t)pc << 48) | (uint64_t)(uintptr_t)msg;
     }
@@ -371,10 +373,10 @@ void Socket::WriteRequest::Setup(Socket* s) {
         // which is common in cache servers: memcache, redis...
         // The struct will be popped when reading a message from the socket.
         PipelinedInfo pi;
-        pi.count = pc & (~REDIS_AUTH_FLAG);
-        pi.with_auth = pc & REDIS_AUTH_FLAG;
+        pi.count = pc;
+        pi.with_auth = is_with_auth();
         pi.id_wait = id_wait;
-        clear_pipelined_count(); // avoid being pushed again
+        clear_pipelined_count_and_with_auth(); // avoid being pushed again
         s->PushPipelinedInfo(pi);
     }
 }

src/brpc/socket.h

@@ -214,16 +214,21 @@ public:
         // Will be queued to implement positional correspondence with responses
         // Default: 0
         uint32_t pipelined_count;
+
+        // [Only effective when pipelined_count is non-zero]
+        // The request contains authenticating information which will be
+        // responded by the server and processed specially when dealing
+        // with the response.
+        bool with_auth;
         
         // Do not return EOVERCROWDED
         // Default: false
         bool ignore_eovercrowded;
 
-        bool with_auth;
-
         WriteOptions()
             : id_wait(INVALID_BTHREAD_ID), abstime(NULL)
-            , pipelined_count(0), ignore_eovercrowded(false), with_auth(false) {}
+            , pipelined_count(0), with_auth(false)
+            , ignore_eovercrowded(false) {}
     };
     int Write(butil::IOBuf *msg, const WriteOptions* options = NULL);
     

test/brpc_redis_unittest.cpp

 // Copyright (c) 2014 Baidu, Inc.
 // Date: Thu Jun 11 14:30:07 CST 2015
 
-#ifdef BAIDU_INTERNAL
+#if defined(BAIDU_INTERNAL)
 
 #include <iostream>
 #include "butil/time.h"