Mercurial > dovecot > core-2.2

changeset 22727:37d5a5c7a7b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cassandra: Rename cassandra_sql_statement.pending_timestamp to just timestamp
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Mon, 06 Nov 2017 11:00:06 +0200
parents dcec0ced2c50
children 3970c1d61616
files src/lib-sql/driver-cassandra.c
diffstat 1 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-sql/driver-cassandra.c	Thu Oct 19 13:05:41 2017 +0300
+++ b/src/lib-sql/driver-cassandra.c	Mon Nov 06 11:00:06 2017 +0200
@@ -176,7 +176,7 @@
 	CassStatement *cass_stmt;
 
 	ARRAY(struct cassandra_sql_arg) pending_args;
-	cass_int64_t pending_timestamp;
+	cass_int64_t timestamp;
 
 	struct cassandra_result *result;
 };
@@ -1719,10 +1719,8 @@
 	}
 	stmt->cass_stmt = cass_prepared_bind(stmt->prep->prepared);
 
-	if (stmt->pending_timestamp != 0) {
-		cass_statement_set_timestamp(stmt->cass_stmt,
-					     stmt->pending_timestamp);
-	}
+	if (stmt->timestamp != 0)
+		cass_statement_set_timestamp(stmt->cass_stmt, stmt->timestamp);
 
 	if (array_is_created(&stmt->pending_args)) {
 		array_foreach(&stmt->pending_args, arg)
@@ -1888,7 +1886,7 @@
 	if (stmt->cass_stmt != NULL)
 		cass_statement_set_timestamp(stmt->cass_stmt, ts_usecs);
 	else
-		stmt->pending_timestamp = ts_usecs;
+		stmt->timestamp = ts_usecs;
 }
 
 static struct cassandra_sql_arg *
@@ -1976,9 +1974,9 @@
 		return;
 	} else {
 		stmt->result->statement = cass_statement_new(query, 0);
-		if (stmt->pending_timestamp != 0) {
+		if (stmt->timestamp != 0) {
 			cass_statement_set_timestamp(stmt->result->statement,
-						     stmt->pending_timestamp);
+						     stmt->timestamp);
 		}
 	}
 	(void)driver_cassandra_send_query(stmt->result);