From: Timo Sirainen <tss@iki.fi>
Date: Tue, 12 May 2015 16:14:13 +0000 (+0300)
Subject: cassandra: Leave consistency to default if it's not specified in config.
X-Git-Tag: 2.2.17.rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa451bfbbe759379b4f8d3f289c77a0d51b8d07;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: Leave consistency to default if it's not specified in config.
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index d426422670..adfb377422 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -44,6 +44,8 @@ struct cassandra_db {
 	struct sql_result *sync_result;
 
 	char *error;
+
+	unsigned int set_consistency:1;
 };
 
 struct cassandra_result {
@@ -322,6 +324,7 @@ static void driver_cassandra_parse_connect_string(struct cassandra_db *db,
 		} 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 @@ static void do_query(struct cassandra_result *result, const char *query)
 	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);
 }