add restore_read

include/dsn/cpp/rpc_stream.h

@@ -121,4 +121,4 @@ class rpc_write_stream : public binary_writer
     int _last_write_next_total_size;
 };
 typedef ::dsn::ref_ptr<rpc_write_stream> rpc_write_stream_ptr;
-}
+} // namespace dsn

include/dsn/tool-api/rpc_message.h

@@ -211,9 +211,9 @@ class message_ex : public ref_counter,
 
     // rpc_read_stream can read a msg many times by restore()
     // rpc_read_stream stream1(msg)
-    // msg->restore()
+    // msg->restore_read()
     // rpc_read_stream stream2(msg)
-    DSN_API void restore();
+    DSN_API void restore_read();
 
     bool is_backup_request() const { return header->context.u.is_backup_request; }
 

src/core/core/rpc_message.cpp

@@ -520,11 +520,11 @@ void message_ex::read_commit(size_t size)
     this->_rw_committed = true;
 }
 
-void message_ex::restore()
+void message_ex::restore_read()
 {
-    this->_rw_index = -1;
-    this->_rw_committed = true;
-    this->_rw_offset = 0;
+    _rw_index = -1;
+    _rw_committed = true;
+    _rw_offset = 0;
 }
 
 void *message_ex::rw_ptr(size_t offset_begin)

src/core/tests/rpc_message.cpp

@@ -36,6 +36,7 @@
 #include <dsn/utility/crc.h>
 #include <dsn/utility/transient_memory.h>
 #include <dsn/tool-api/rpc_message.h>
+#include <core/core/message_utils.cpp>
 #include <gtest/gtest.h>
 
 using namespace ::dsn;
@@ -183,3 +184,14 @@ TEST(core, message_ex)
         request->release_ref();
     }
 }
+
+TEST(rpc_message, restore_read)
+{
+    using namespace dsn;
+    configuration_query_by_index_request request, result;
+    message_ptr msg = from_thrift_request_to_received_message(request, RPC_CODE_FOR_TEST);
+    for (int i = 0; i < 10; i++) {
+        unmarshall(msg, result);
+        msg->restore_read();
+    }
+}