From c690a8c7cb89c98be7e468bb6459318235a59d98 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 7 Feb 2018 15:28:45 +0200 Subject: [PATCH] cassandra: Make sure timestamp is always logged (if set) with debug_queries=y It wasn't logged in some code paths. --- src/lib-sql/driver-cassandra.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c index 0ce04b29f3..27603567d7 100644 --- a/src/lib-sql/driver-cassandra.c +++ b/src/lib-sql/driver-cassandra.c @@ -1372,6 +1372,7 @@ driver_cassandra_result_more(struct sql_result **_result, bool async, the caller" error text, so it won't be in the debug log output. */ i_free_and_null(old_result->error); + new_result->timestamp = old_result->timestamp; new_result->consistency = old_result->consistency; new_result->page_num = old_result->page_num + 1; new_result->page0_start_time = old_result->page0_start_time; @@ -1573,6 +1574,7 @@ driver_cassandra_transaction_commit(struct sql_transaction_context *_ctx, /* wait for prepare to finish */ } else { ctx->stmt->result->statement = ctx->stmt->cass_stmt; + ctx->stmt->result->timestamp = ctx->stmt->timestamp; (void)driver_cassandra_send_query(ctx->stmt->result); pool_unref(&ctx->stmt->stmt.pool); } @@ -1984,6 +1986,7 @@ driver_cassandra_statement_query(struct sql_statement *_stmt, callback, context); if (stmt->cass_stmt != NULL) { stmt->result->statement = stmt->cass_stmt; + stmt->result->timestamp = stmt->timestamp; } else if (stmt->prep != NULL) { /* wait for prepare to finish */ return;