# HG changeset patch # User Timo Sirainen # Date 1503399315 -10800 # Node ID 7b17f52b75b69f81a2079648685ffcd7b4c29660 # Parent 348e82e819b00d3e27d7028e7cd0d898646c17be cassandra: Cleanup - Create statement earlier Simplifies the following changes diff -r 348e82e819b0 -r 7b17f52b75b6 src/lib-sql/driver-cassandra.c --- a/src/lib-sql/driver-cassandra.c Thu Aug 24 11:56:38 2017 +0300 +++ b/src/lib-sql/driver-cassandra.c Tue Aug 22 13:55:15 2017 +0300 @@ -911,11 +911,6 @@ { 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 @@ result = driver_cassandra_query_init(db, query, query_type, callback, context); + result->statement = cass_statement_new(query, 0); (void)driver_cassandra_send_query(result); }