From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 22 Aug 2017 10:55:15 +0000 (+0300)
Subject: cassandra: Cleanup - Create statement earlier
X-Git-Tag: 2.3.0.rc1~1054
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2c4998f6e1fe5ea9a2c9bafd678cd4b6b064a0b;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Cleanup - Create statement earlier

Simplifies the following changes
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 58fdc457fa..97e5c79b51 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -916,11 +916,6 @@ static void driver_cassandra_init_statement(struct cassandra_result *result)
 {
 	struct cassandra_db *db = (struct cassandra_db *)result->api.db;
 
-	if (result->statement != NULL) {
-		/* continuing a paged result */
-		return;
-	}
-	result->statement = cass_statement_new(result->query, 0);
 	cass_statement_set_consistency(result->statement, result->consistency);
 
 #ifdef HAVE_CASSANDRA_SPECULATIVE_POLICY
@@ -1074,6 +1069,7 @@ driver_cassandra_query_full(struct sql_db *_db, const char *query,
 
 	result = driver_cassandra_query_init(db, query, query_type,
 					     callback, context);
+	result->statement = cass_statement_new(query, 0);
 	(void)driver_cassandra_send_query(result);
 }