Skip to content

Commit dc13b32

Browse files
yph025869yph025869
committed
fix
1 parent d4b02c3 commit dc13b32

7 files changed

+364
-105
lines changed

‎include/cppredis/client_interface.hpp

+61-18
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ namespace cpp_redis {
6363
check_args();
6464

6565
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::auth), std::forward<std::string>(password));
66-
socket_->send_msg(std::move(msg));
66+
if (!socket_->send_msg(std::move(msg))){
67+
return false;
68+
}
69+
6770
const auto res = socket_->get_responese();
6871

6972
if (res->get_result_code() == status::unconnected_ ||
@@ -79,7 +82,10 @@ namespace cpp_redis {
7982
check_args();
8083

8184
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::del), std::forward<std::string>(key));
82-
socket_->send_msg(std::move(msg));
85+
if (!socket_->send_msg(std::move(msg))){
86+
return false;
87+
}
88+
8389
const auto res = socket_->get_responese();
8490

8591
if (res->get_result_code() == status::errors_) {
@@ -103,7 +109,10 @@ namespace cpp_redis {
103109
check_args();
104110

105111
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::exists), std::forward<std::string>(key));
106-
socket_->send_msg(std::move(msg));
112+
if (!socket_->send_msg(std::move(msg))){
113+
return false;
114+
}
115+
107116
const auto res = socket_->get_responese();
108117

109118
if (res->get_result_code() == status::errors_) {
@@ -127,7 +136,10 @@ namespace cpp_redis {
127136
check_args();
128137

129138
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::expire), std::forward<std::string>(key), unit::int_to_string(seconds));
130-
socket_->send_msg(std::move(msg));
139+
if (!socket_->send_msg(std::move(msg))){
140+
return false;
141+
}
142+
131143
const auto res = socket_->get_responese();
132144

133145
if (res->get_result_code() != status::int_result_) {
@@ -144,7 +156,10 @@ namespace cpp_redis {
144156
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::pexpire),
145157
std::forward<std::string>(key), unit::int_to_string(milliseconds));
146158

147-
socket_->send_msg(std::move(msg));
159+
if (!socket_->send_msg(std::move(msg))){
160+
return false;
161+
}
162+
148163
const auto res = socket_->get_responese();
149164

150165
if (res->get_result_code() != status::int_result_) {
@@ -160,8 +175,12 @@ namespace cpp_redis {
160175
{
161176
check_args();
162177

163-
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::expire_at), std::forward<std::string>(key), unit::int_to_string(unix_timestamp));
164-
socket_->send_msg(std::move(msg));
178+
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::expire_at),
179+
std::forward<std::string>(key), unit::int_to_string(unix_timestamp));
180+
if (!socket_->send_msg(std::move(msg))){
181+
return false;
182+
}
183+
165184
const auto res = socket_->get_responese();
166185

167186
if (res->get_result_code() != status::int_result_) {
@@ -180,7 +199,10 @@ namespace cpp_redis {
180199
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::pexpire_at),
181200
std::forward<std::string>(key), unit::int_to_string(unix_milli_timestamp));
182201

183-
socket_->send_msg(std::move(msg));
202+
if (!socket_->send_msg(std::move(msg))){
203+
return false;
204+
}
205+
184206
const auto res = socket_->get_responese();
185207

186208
if (res->get_result_code() != status::int_result_) {
@@ -197,7 +219,10 @@ namespace cpp_redis {
197219
check_args();
198220

199221
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::ttl), std::forward<std::string>(key));
200-
socket_->send_msg(std::move(msg));
222+
if (!socket_->send_msg(std::move(msg))){
223+
return -2;
224+
}
225+
201226
const auto res = socket_->get_responese();
202227

203228
if (res->get_result_code() != status::int_result_) {
@@ -220,7 +245,10 @@ namespace cpp_redis {
220245
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::pttl),
221246
std::forward<std::string>(key));
222247

223-
socket_->send_msg(std::move(msg));
248+
if (!socket_->send_msg(std::move(msg))){
249+
return -2;
250+
}
251+
224252
const auto res = socket_->get_responese();
225253

226254
if (res->get_result_code() != status::int_result_) {
@@ -243,7 +271,9 @@ namespace cpp_redis {
243271
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::rename),
244272
std::forward<std::string>(key),std::forward<std::string>(new_key));
245273

246-
socket_->send_msg(std::move(msg));
274+
if (!socket_->send_msg(std::move(msg))) {
275+
return false;
276+
}
247277

248278
const auto res = socket_->get_responese();
249279

@@ -262,7 +292,9 @@ namespace cpp_redis {
262292
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::renamenx),
263293
std::forward<std::string>(key), std::forward<std::string>(new_key));
264294

265-
socket_->send_msg(std::move(msg));
295+
if (!socket_->send_msg(std::move(msg))) {
296+
return false;
297+
}
266298

267299
const auto res = socket_->get_responese();
268300

@@ -279,7 +311,9 @@ namespace cpp_redis {
279311

280312
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::multi));
281313

282-
socket_->send_msg(std::move(msg));
314+
if (!socket_->send_msg(std::move(msg))) {
315+
return false;
316+
}
283317

284318
const auto res = socket_->get_responese();
285319

@@ -296,7 +330,9 @@ namespace cpp_redis {
296330

297331
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::exec));
298332

299-
socket_->send_msg(std::move(msg));
333+
if (!socket_->send_msg(std::move(msg))) {
334+
return false;
335+
}
300336

301337
const auto res = socket_->get_responese();
302338

@@ -313,7 +349,9 @@ namespace cpp_redis {
313349

314350
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::discard));
315351

316-
socket_->send_msg(std::move(msg));
352+
if (!socket_->send_msg(std::move(msg))) {
353+
return false;
354+
}
317355

318356
const auto res = socket_->get_responese();
319357

@@ -326,8 +364,10 @@ namespace cpp_redis {
326364

327365
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::remove_expire),std::forward<std::string>(key));
328366

329-
socket_->send_msg(std::move(msg));
330-
367+
if (!socket_->send_msg(std::move(msg))) {
368+
return false;
369+
}
370+
331371
const auto res = socket_->get_responese();
332372

333373
if (res->get_result_code() !=status::int_result_){
@@ -774,7 +814,10 @@ namespace cpp_redis {
774814
}
775815

776816
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::select), std::move(unit::int_to_string(num)));
777-
socket_->send_msg(std::move(msg));
817+
if (!socket_->send_msg(std::move(msg))){
818+
return false;
819+
}
820+
778821
const auto res = socket_->get_responese();
779822

780823
if (res->get_result_code() == status::unconnected_ ||

‎include/cppredis/cpp_hash_client.hpp

+48-15
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ namespace cpp_redis
2020
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_set),std::forward<std::string>(key),
2121
std::forward<std::string>(field), std::forward<std::string>(value));
2222

23-
socket_->send_msg(std::move(msg));
23+
if (!socket_->send_msg(std::move(msg))) {
24+
return 0;
25+
}
26+
2427
const auto res = socket_->get_responese();
2528
if (res->get_result_code() != status::int_result_ &&
2629
res->get_result_code() != status::status_){
@@ -41,7 +44,10 @@ namespace cpp_redis
4144
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_setx), std::forward<std::string>(key),
4245
std::forward<std::string>(field), std::forward<std::string>(value));
4346

44-
socket_->send_msg(std::move(msg));
47+
if (!socket_->send_msg(std::move(msg))) {
48+
return 0;
49+
}
50+
4551
const auto res = socket_->get_responese();
4652
if (res->get_result_code() != status::int_result_ &&
4753
res->get_result_code() != status::status_) {
@@ -58,7 +64,10 @@ namespace cpp_redis
5864
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_exists), std::forward<std::string>(key),
5965
std::forward<std::string>(field));
6066

61-
socket_->send_msg(std::move(msg));
67+
if (!socket_->send_msg(std::move(msg))) {
68+
return 0;
69+
}
70+
6271
const auto res = socket_->get_responese();
6372
if (res->get_result_code() != status::int_result_ &&
6473
res->get_result_code() != status::status_) {
@@ -74,7 +83,10 @@ namespace cpp_redis
7483
check_args();
7584
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_get),std::forward<std::string>(key), std::forward<std::string>(field));
7685

77-
socket_->send_msg(std::move(msg));
86+
if (!socket_->send_msg(std::move(msg))) {
87+
return "";
88+
}
89+
7890
const auto res = socket_->get_responese();
7991
if (res->get_result_code()!= status::results_ &&
8092
res->get_result_code() != status::status_){
@@ -95,7 +107,9 @@ namespace cpp_redis
95107

96108
std::string msg = request_->req_n_keys(request_->get_cmd(redis_cmd::hash_del), std::forward<std::vector<std::string>>(fields));
97109

98-
socket_->send_msg(std::move(msg));
110+
if (!socket_->send_msg(std::move(msg))) {
111+
return 0;
112+
}
99113

100114
const auto res = socket_->get_responese();
101115
if (res->get_result_code() != status::int_result_ &&
@@ -112,7 +126,9 @@ namespace cpp_redis
112126
check_args();
113127
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_len),std::forward<std::string>(key));
114128

115-
socket_->send_msg(std::move(msg));
129+
if (!socket_->send_msg(std::move(msg))) {
130+
return 0;
131+
}
116132

117133
const auto res = socket_->get_responese();
118134
if (res->get_result_code() != status::int_result_ &&
@@ -130,7 +146,9 @@ namespace cpp_redis
130146
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_strlen), std::forward<std::string>(key),
131147
std::forward<std::string>(field));
132148

133-
socket_->send_msg(std::move(msg));
149+
if (!socket_->send_msg(std::move(msg))) {
150+
return 0;
151+
}
134152

135153
const auto res = socket_->get_responese();
136154
if (res->get_result_code() != status::int_result_ &&
@@ -150,7 +168,9 @@ namespace cpp_redis
150168
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_incrby), std::forward<std::string>(key),
151169
std::forward<std::string>(field),std::forward<std::string>(increment));
152170

153-
socket_->send_msg(std::move(msg));
171+
if (!socket_->send_msg(std::move(msg))) {
172+
return 0;
173+
}
154174

155175
const auto res = socket_->get_responese();
156176
if (res->get_result_code() != status::int_result_ &&
@@ -169,7 +189,9 @@ namespace cpp_redis
169189
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_incrby_float), std::forward<std::string>(key),
170190
std::forward<std::string>(field), std::forward<std::string>(increment));
171191

172-
socket_->send_msg(std::move(msg));
192+
if (!socket_->send_msg(std::move(msg))) {
193+
return "";
194+
}
173195

174196
const auto res = socket_->get_responese();
175197
if (res->get_result_code() != status::results_ &&
@@ -185,8 +207,11 @@ namespace cpp_redis
185207

186208
virtual bool hash_mset(std::vector<std::string>&& keys)
187209
{
188-
std::string msg = request_->req_n_keys(request_->get_cmd(redis_cmd::hash_mset), std::forward<std::vector<std::string>>(keys));
189-
socket_->send_msg(std::move(msg));
210+
std::string msg = request_->req_n_keys(request_->get_cmd(redis_cmd::hash_mset),
211+
std::forward<std::vector<std::string>>(keys));
212+
if (!socket_->send_msg(std::move(msg))) {
213+
return false;
214+
}
190215

191216
const auto res = socket_->get_responese();
192217
if (res->get_result_code() != status::status_){
@@ -199,7 +224,9 @@ namespace cpp_redis
199224
virtual std::vector <std::string> hash_mget(std::vector<std::string>&& keys)
200225
{
201226
std::string msg = request_->req_n_keys(request_->get_cmd(redis_cmd::hash_mget), std::forward<std::vector<std::string>>(keys));
202-
socket_->send_msg(std::move(msg));
227+
if (!socket_->send_msg(std::move(msg))) {
228+
return {};
229+
}
203230

204231
const auto res = socket_->get_responese();
205232
if (res->get_result_code() != status::results_ &&
@@ -214,7 +241,9 @@ namespace cpp_redis
214241
virtual std::vector <std::string> hash_keys(std::string&& key)
215242
{
216243
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_keys), std::forward<std::string>(key));
217-
socket_->send_msg(std::move(msg));
244+
if (!socket_->send_msg(std::move(msg))) {
245+
return {};
246+
}
218247

219248
const auto res = socket_->get_responese();
220249
if (res->get_result_code() != status::results_ &&
@@ -231,7 +260,9 @@ namespace cpp_redis
231260
{
232261
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_vals),
233262
std::forward<std::string>(key));
234-
socket_->send_msg(std::move(msg));
263+
if (!socket_->send_msg(std::move(msg))) {
264+
return {};
265+
}
235266

236267
const auto res = socket_->get_responese();
237268
if (res->get_result_code() != status::results_ &&
@@ -247,7 +278,9 @@ namespace cpp_redis
247278
{
248279
std::string msg = request_->req_n_key(request_->get_cmd(redis_cmd::hash_get_all),
249280
std::forward<std::string>(key));
250-
socket_->send_msg(std::move(msg));
281+
if (!socket_->send_msg(std::move(msg))) {
282+
return {};
283+
}
251284

252285
const auto res = socket_->get_responese();
253286
if (res->get_result_code() != status::results_ &&

0 commit comments

Comments
 (0)