Skip to content

Commit da7cf4c

Browse files
fantasy-peakfantasy-peak
committed
Add define FrpcHeader
1 parent 8ca10e9 commit da7cf4c

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

‎out/bi_web/include/fantasy.hpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ class HelloWorldClient final {
242242
return;
243243
}
244244
try {
245-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, HelloWorldClientHelloWorldServer>>(recv_bufs[0].data(), recv_bufs[0].size());
245+
using FrpcHeader = std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
246+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
246247
std::unique_lock lk(m_mtx);
247248
if (m_cb.find(req_id) == m_cb.end())
248249
return;
@@ -397,7 +398,8 @@ class HelloWorldServer final {
397398
return;
398399
}
399400
try {
400-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, HelloWorldClientHelloWorldServer>>(recv_bufs[1].data(), recv_bufs[1].size());
401+
using FrpcHeader = std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
402+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
401403
switch (req_type) {
402404
case HelloWorldClientHelloWorldServer::hello_world: {
403405
auto tp = frpc::unpack<std::tuple<BankInfo, std::string, uint64_t, std::optional<std::string>, frpc::DateTime>>(recv_bufs[2].data(), recv_bufs[2].size());
@@ -944,7 +946,8 @@ class StreamClient final {
944946
return;
945947
}
946948
try {
947-
auto [req_id, req_type, is_close] = frpc::unpack<std::tuple<uint64_t, StreamClientStreamServer, bool>>(recv_bufs[0].data(), recv_bufs[0].size());
949+
using FrpcHeader = std::tuple<uint64_t, StreamClientStreamServer, bool>;
950+
auto [req_id, req_type, is_close] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
948951
if (is_close) {
949952
std::unique_lock lk(m_mtx);
950953
m_cb.erase(req_id);
@@ -1095,7 +1098,8 @@ class StreamServer final {
10951098
return;
10961099
}
10971100
try {
1098-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, StreamClientStreamServer>>(recv_bufs[1].data(), recv_bufs[1].size());
1101+
using FrpcHeader = std::tuple<uint64_t, StreamClientStreamServer>;
1102+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
10991103
switch (req_type) {
11001104
case StreamClientStreamServer::hello_world: {
11011105
auto tp = frpc::unpack<std::tuple<std::string>>(recv_bufs[2].data(), recv_bufs[2].size());

‎out/include/fantasy.hpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ class HelloWorldClient final {
242242
return;
243243
}
244244
try {
245-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, HelloWorldClientHelloWorldServer>>(recv_bufs[0].data(), recv_bufs[0].size());
245+
using FrpcHeader = std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
246+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
246247
std::unique_lock lk(m_mtx);
247248
if (m_cb.find(req_id) == m_cb.end())
248249
return;
@@ -397,7 +398,8 @@ class HelloWorldServer final {
397398
return;
398399
}
399400
try {
400-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, HelloWorldClientHelloWorldServer>>(recv_bufs[1].data(), recv_bufs[1].size());
401+
using FrpcHeader = std::tuple<uint64_t, HelloWorldClientHelloWorldServer>;
402+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
401403
switch (req_type) {
402404
case HelloWorldClientHelloWorldServer::hello_world: {
403405
auto tp = frpc::unpack<std::tuple<BankInfo, std::string, uint64_t, std::optional<std::string>, frpc::DateTime>>(recv_bufs[2].data(), recv_bufs[2].size());
@@ -944,7 +946,8 @@ class StreamClient final {
944946
return;
945947
}
946948
try {
947-
auto [req_id, req_type, is_close] = frpc::unpack<std::tuple<uint64_t, StreamClientStreamServer, bool>>(recv_bufs[0].data(), recv_bufs[0].size());
949+
using FrpcHeader = std::tuple<uint64_t, StreamClientStreamServer, bool>;
950+
auto [req_id, req_type, is_close] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
948951
if (is_close) {
949952
std::unique_lock lk(m_mtx);
950953
m_cb.erase(req_id);
@@ -1095,7 +1098,8 @@ class StreamServer final {
10951098
return;
10961099
}
10971100
try {
1098-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, StreamClientStreamServer>>(recv_bufs[1].data(), recv_bufs[1].size());
1101+
using FrpcHeader = std::tuple<uint64_t, StreamClientStreamServer>;
1102+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
10991103
switch (req_type) {
11001104
case StreamClientStreamServer::hello_world: {
11011105
auto tp = frpc::unpack<std::tuple<std::string>>(recv_bufs[2].data(), recv_bufs[2].size());

‎template/cpp/bi.inja

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ private:
202202
return;
203203
}
204204
try {
205-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, {{value.caller}}{{value.callee}}>>(recv_bufs[0].data(), recv_bufs[0].size());
205+
using FrpcHeader = std::tuple<uint64_t, {{value.caller}}{{value.callee}}>;
206+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
206207
std::unique_lock lk(m_mtx);
207208
if (m_cb.find(req_id) == m_cb.end())
208209
return;
@@ -369,7 +370,8 @@ private:
369370
return;
370371
}
371372
try {
372-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, {{value.caller}}{{value.callee}}>>(recv_bufs[1].data(), recv_bufs[1].size());
373+
using FrpcHeader = std::tuple<uint64_t, {{value.caller}}{{value.callee}}>;
374+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
373375
switch(req_type) {
374376
{% for func in value.definitions %}
375377
case {{value.caller}}{{value.callee}}::{{func.func_name}}: {

‎template/cpp/bi_stream.inja

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ private:
130130
return;
131131
}
132132
try {
133-
auto [req_id, req_type, is_close] = frpc::unpack<std::tuple<uint64_t, {{value.caller}}{{value.callee}}, bool>>(recv_bufs[0].data(), recv_bufs[0].size());
133+
using FrpcHeader = std::tuple<uint64_t, {{value.caller}}{{value.callee}}, bool>;
134+
auto [req_id, req_type, is_close] = frpc::unpack<FrpcHeader>(recv_bufs[0].data(), recv_bufs[0].size());
134135
if (is_close) {
135136
std::unique_lock lk(m_mtx);
136137
m_cb.erase(req_id);
@@ -281,7 +282,8 @@ private:
281282
return;
282283
}
283284
try {
284-
auto [req_id, req_type] = frpc::unpack<std::tuple<uint64_t, {{value.caller}}{{value.callee}}>>(recv_bufs[1].data(), recv_bufs[1].size());
285+
using FrpcHeader = std::tuple<uint64_t, {{value.caller}}{{value.callee}}>;
286+
auto [req_id, req_type] = frpc::unpack<FrpcHeader>(recv_bufs[1].data(), recv_bufs[1].size());
285287
switch(req_type) {
286288
{% for func in value.definitions %}
287289
case {{value.caller}}{{value.callee}}::{{func.func_name}}: {

0 commit comments

Comments
 (0)