From 1725038ca8a29f37ddff4650069d34fd3cd2dc5e Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@icinga.com>
Date: Thu, 12 Oct 2017 08:34:17 +0200
Subject: [PATCH] Implement pipelining support for Redis queries

fixes #5670
---
 lib/redis/rediswriter.cpp | 59 ++++++++++++++++++++++++++++++++++++++-
 lib/redis/rediswriter.hpp |  1 +
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/lib/redis/rediswriter.cpp b/lib/redis/rediswriter.cpp
index 3eca8ec40..b89e59bf1 100644
--- a/lib/redis/rediswriter.cpp
+++ b/lib/redis/rediswriter.cpp
@@ -334,5 +334,62 @@ boost::shared_ptr<redisReply> RedisWriter::ExecuteQuery(const std::vector<String
 		);
 	}
 
-	return boost::shared_ptr<redisReply>(reply);
+	return boost::shared_ptr<redisReply>(reply, freeReplyObject);
+}
+
+std::vector<boost::shared_ptr<redisReply> > RedisWriter::ExecuteQueries(const std::vector<std::vector<String> >& queries)
+{
+	const char **argv;
+	size_t *argvlen;
+
+	for (const auto& query : queries) {
+		argv = new const char *[query.size()];
+		argvlen = new size_t[query.size()];
+
+		for (std::vector<String>::size_type i = 0; i < query.size(); i++) {
+			argv[i] = query[i].CStr();
+			argvlen[i] = query[i].GetLength();
+		}
+
+		redisAppendCommandArgv(m_Context, query.size(), argv, argvlen);
+
+		delete [] argv;
+		delete [] argvlen;
+	}
+
+	std::vector<boost::shared_ptr<redisReply> > replies;
+
+	for (size_t i = 0; i < queries.size(); i++) {
+		redisReply *rawReply;
+
+		if (redisGetReply(m_Context, reinterpret_cast<void **>(&rawReply)) == REDIS_ERR) {
+			BOOST_THROW_EXCEPTION(
+			    redis_error()
+				<< errinfo_message("redisGetReply() failed")
+			);
+		}
+
+		boost::shared_ptr<redisReply> reply(rawReply, freeReplyObject);
+		replies.push_back(reply);
+	}
+
+	for (size_t i = 0; i < queries.size(); i++) {
+		const auto& query = queries[i];
+		const auto& reply = replies[i];
+
+		if (reply->type == REDIS_REPLY_ERROR) {
+			Log(LogCritical, "RedisWriter")
+			    << "Redis query failed: " << reply->str;
+
+			String msg = reply->str;
+
+			BOOST_THROW_EXCEPTION(
+			    redis_error()
+				<< errinfo_message(msg)
+				<< errinfo_redis_query(Utility::Join(Array::FromVector(query), ' ', false))
+			);
+		}
+	}
+
+	return replies;
 }
diff --git a/lib/redis/rediswriter.hpp b/lib/redis/rediswriter.hpp
index 48ea8d238..ca43a476a 100644
--- a/lib/redis/rediswriter.hpp
+++ b/lib/redis/rediswriter.hpp
@@ -88,6 +88,7 @@ private:
 	void ExceptionHandler(boost::exception_ptr exp);
 
 	boost::shared_ptr<redisReply> ExecuteQuery(const std::vector<String>& query);
+	std::vector<boost::shared_ptr<redisReply> > ExecuteQueries(const std::vector<std::vector<String> >& queries);
 
 	Timer::Ptr m_StatsTimer;
 	Timer::Ptr m_ReconnectTimer;