dovecot-2.2: cassandra: Leave consistency to default if it's not...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f0273ba240ae
changeset: 18652:f0273ba240ae
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 12 19:14:13 2015 +0300
description:
cassandra: Leave consistency to default if it's not specified in config.

diffstat:

 src/lib-sql/driver-cassandra.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r 1fac17a2bc53 -r f0273ba240ae src/lib-sql/driver-cassandra.c
--- a/src/lib-sql/driver-cassandra.c	Tue May 12 19:13:31 2015 +0300
+++ b/src/lib-sql/driver-cassandra.c	Tue May 12 19:14:13 2015 +0300
@@ -44,6 +44,8 @@
 	struct sql_result *sync_result;
 
 	char *error;
+
+	unsigned int set_consistency:1;
 };
 
 struct cassandra_result {
@@ -322,6 +324,7 @@
 		} else if (strcmp(key, "consistency") == 0) {
 			if (consistency_parse(value, &db->consistency) < 0)
 				i_fatal("cassandra: Unknown consistency: %s", value);
+			db->set_consistency = TRUE;
 		} else {
 			i_fatal("cassandra: Unknown connect string: %s", key);
 		}
@@ -468,7 +471,8 @@
 	result->query = i_strdup(query);
 	result->row_pool = pool_alloconly_create("cassandra result", 512);
 	result->statement = cass_statement_new(query, 0);
-	cass_statement_set_consistency(result->statement, db->consistency);
+	if (db->set_consistency)
+		cass_statement_set_consistency(result->statement, db->consistency);
 	future = cass_session_execute(db->session, result->statement);
 	driver_cassandra_set_callback(future, db, query_callback, result);
 }