]> 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)
committerAki Tuomi <aki.tuomi@dovecot.fi>
Fri, 8 Sep 2017 10:18:32 +0000 (13:18 +0300)
Simplifies the following changes

src/lib-sql/driver-cassandra.c

index 58fdc457fa26bb794d84b83bcab864de2e979405..97e5c79b512f4b4e35c225654bb9e5f606a54d9a 100644 (file)
@@ -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);
 }