King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-02-26 13:23:55 +00:00
Code Issues Releases Wiki Activity

Recursively check for failures.

Browse source
This commit is contained in:
King_DuckZ 2016-07-11 17:47:28 +01:00
parent e3fa82006f
commit dbd958daec
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/backends/redis/batch.cpp
View file

@ -90,6 +90,21 @@ namespace redis {
delete data; delete data;
} }
int array_throw_if_failed (int parErrCount, int parMaxReportedErrors, const std::vector<Reply>& parReplies, std::ostream& parStream) {
int err_count = 0;
for (const auto& rep : parReplies) {
if (rep.which() == RedisVariantType_Error) {
++err_count;
if (err_count + parErrCount <= parMaxReportedErrors)
parStream << '"' << get_error_string(rep).message() << "\" ";
}
else if (rep.which() == RedisVariantType_Array) {
err_count += array_throw_if_failed(err_count + parErrCount, parMaxReportedErrors, get_array(rep), parStream);
}
}
return err_count;
}
} //unnamed namespace } //unnamed namespace
struct Batch::LocalData { struct Batch::LocalData {
@ -167,17 +182,10 @@ namespace redis {
void Batch::throw_if_failed() { void Batch::throw_if_failed() {
std::ostringstream oss; std::ostringstream oss;
int err_count = 0;
const int max_reported_errors = 3; const int max_reported_errors = 3;
oss << "Error in reply: "; oss << "Error in reply: ";
for (const auto& rep : replies()) { const int err_count = array_throw_if_failed(0, max_reported_errors, replies(), oss);
if (rep.which() == RedisVariantType_Error) {
++err_count;
if (err_count <= max_reported_errors)
oss << '"' << get_error_string(rep).message() << "\" ";
}
}
if (err_count) { if (err_count) {
oss << " (showing " << err_count << '/' << max_reported_errors << " errors on " << replies().size() << " total replies)"; oss << " (showing " << err_count << '/' << max_reported_errors << " errors on " << replies().size() << " total replies)";
throw std::runtime_error(oss.str()); throw std::runtime_error(oss.str());