]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
cassandra: Fix sending batch queries started while Cassandra wasn't connected
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 29 Jan 2024 13:47:27 +0000 (15:47 +0200)
committerTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 29 Jan 2024 13:47:27 +0000 (15:47 +0200)
The batch queries were just hanging forever instead of being sent after
Cassandra was connected to.

src/lib-sql/driver-cassandra.c

index 41d9661ec3eed776b5e8e068b5e2e24e86acb4ad..f45204884947e3b299397f4c72234eab80565a97 100644 (file)
@@ -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;
                }