From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 29 Jan 2024 13:47:27 +0000 (+0200)
Subject: cassandra: Fix sending batch queries started while Cassandra wasn't connected
X-Git-Tag: 2.4.0~1816
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35cba09cf91d79402f44ccdff8246c19caa2622e;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Fix sending batch queries started while Cassandra wasn't connected

The batch queries were just hanging forever instead of being sent after
Cassandra was connected to.
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 41d9661ec3..f452048849 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -1636,7 +1636,9 @@ static void driver_cassandra_send_queries(struct cassandra_db *db)
 
 	results = array_get(&db->results, &count);
 	for (i = 0; i < count; i++) {
-		if (!results[i]->query_sent && results[i]->statement != NULL) {
+		if (!results[i]->query_sent &&
+		    (results[i]->batch != NULL ||
+		     results[i]->statement != NULL)) {
 			if (cassandra_result_connect_and_send_query(results[i]) <= 0)
 				break;
 		}