]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
cassandra: Cleanup - Create statement earlier
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Tue, 22 Aug 2017 10:55:15 +0000 (13:55 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Wed, 27 Sep 2017 10:39:26 +0000 (13:39 +0300)
Simplifies the following changes

src/lib-sql/driver-cassandra.c

index 63c725d67c9c9c431ee8e8f0d808c5eaebe8ddc7..df69abfa834e909c9ec3ffee0d9c07ec04cda933 100644 (file)
@@ -911,11 +911,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
@@ -1069,6 +1064,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);
 }