Skip to content

Commit 916866a

Browse files
committedApr 27, 2020
fix
1 parent dcdc353 commit 916866a

File tree

3 files changed

+45
-110
lines changed

3 files changed

+45
-110
lines changed
 

‎include/cppredis/cpp_hash_client.hpp

+20-49
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@ namespace cpp_redis
2727
}
2828

2929
const auto results = res->get_int_results();
30-
if (results.empty()){
31-
return 0;
32-
}
3330

34-
return results[0];
31+
return ((!results.empty())?results[0]:0);
3532
}
3633

3734
//和string数据结构一样,可以实现分布式锁
@@ -50,11 +47,7 @@ namespace cpp_redis
5047
}
5148

5249
const auto results = res->get_int_results();
53-
if (results.empty()) {
54-
return 0;
55-
}
56-
57-
return results[0];
50+
return ((!results.empty()) ? results[0] : 0);
5851
}
5952

6053
virtual int hash_exists(std::string&& key, std::string&& field)
@@ -70,11 +63,7 @@ namespace cpp_redis
7063
}
7164

7265
const auto results = res->get_int_results();
73-
if (results.empty()) {
74-
return 0;
75-
}
76-
77-
return results[0];
66+
return ((!results.empty()) ? results[0] : 0);
7867
}
7968

8069
virtual std::string hash_get(std::string&& key, std::string&& field)
@@ -106,15 +95,11 @@ namespace cpp_redis
10695

10796
const auto res = socket_->get_responese();
10897
if (res->get_result_code() != status::int_result_){
109-
return -1;
98+
return 0;
11099
}
111100

112101
const auto results = res->get_int_results();
113-
if (results.empty()){
114-
return -1;
115-
}
116-
117-
return results[0];
102+
return ((!results.empty()) ? results[0] : 0);
118103
}
119104

120105
virtual int hash_len(std::string&& key)
@@ -126,15 +111,11 @@ namespace cpp_redis
126111

127112
const auto res = socket_->get_responese();
128113
if (res->get_result_code() != status::int_result_) {
129-
return -1;
114+
return 0;
130115
}
131116

132117
const auto results = res->get_int_results();
133-
if (results.empty()) {
134-
return -1;
135-
}
136-
137-
return results[0];
118+
return ((!results.empty()) ? results[0] : 0);
138119
}
139120

140121
virtual int hash_strlen(std::string&& key, std::string&& field)
@@ -147,15 +128,11 @@ namespace cpp_redis
147128

148129
const auto res = socket_->get_responese();
149130
if (res->get_result_code() != status::int_result_) {
150-
return -1;
131+
return 0;
151132
}
152133

153134
const auto results = res->get_int_results();
154-
if (results.empty()) {
155-
return -1;
156-
}
157-
158-
return results[0];
135+
return ((!results.empty()) ? results[0] : 0);
159136
}
160137

161138
//返回增加值
@@ -170,15 +147,12 @@ namespace cpp_redis
170147

171148
const auto res = socket_->get_responese();
172149
if (res->get_result_code() != status::int_result_) {
173-
return -1;
150+
return 0;
174151
}
175152

176153
const auto results = res->get_int_results();
177-
if (results.empty()) {
178-
return -1;
179-
}
180154

181-
return results[0];
155+
return ((!results.empty()) ? results[0] : 0);
182156
}
183157

184158
virtual std::string hash_incrby_float(std::string&& key, std::string&& field, std::string&& increment)
@@ -195,11 +169,8 @@ namespace cpp_redis
195169
}
196170

197171
const auto results = res->get_results();
198-
if (results.empty()) {
199-
return"";
200-
}
201172

202-
return results[0];
173+
return ((!results.empty()) ? results[0] : "");
203174
}
204175

205176

@@ -225,10 +196,10 @@ namespace cpp_redis
225196
const auto res = socket_->get_responese();
226197
if (res->get_result_code() != status::results_)
227198
{
228-
return { {} };
199+
return {} ;
229200
}
230201

231-
return std::move(res->get_results());
202+
return res->get_results();
232203
}
233204

234205
//返回所有的keys
@@ -240,10 +211,10 @@ namespace cpp_redis
240211
const auto res = socket_->get_responese();
241212
if (res->get_result_code() != status::results_)
242213
{
243-
return { {} };
214+
return {} ;
244215
}
245216

246-
return std::move(res->get_results());
217+
return res->get_results();
247218
}
248219

249220

@@ -257,10 +228,10 @@ namespace cpp_redis
257228
const auto res = socket_->get_responese();
258229
if (res->get_result_code() != status::results_)
259230
{
260-
return { {} };
231+
return {} ;
261232
}
262233

263-
return std::move(res->get_results());
234+
return res->get_results();
264235
}
265236

266237
//返回key中的域和值
@@ -273,10 +244,10 @@ namespace cpp_redis
273244
const auto res = socket_->get_responese();
274245
if (res->get_result_code() != status::results_)
275246
{
276-
return { {} };
247+
return {} ;
277248
}
278249

279-
return std::move(res->get_results());
250+
return res->get_results();
280251
}
281252

282253
};

‎include/cppredis/cpp_redis_list.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ namespace cpp_redis {
121121
const auto res = socket_->get_responese();
122122

123123
if (res->get_result_code() != status::results_) {
124-
return { {} };
124+
return {} ;
125125
}
126126

127127
//函数调用是右值

0 commit comments

Comments
 (0)
Failed to load comments.