From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 8 Nov 2023 21:24:17 +0000 (+0200)
Subject: cassandra: statement_query() - Don't generate query string unnecessarily
X-Git-Tag: 2.4.0~2455
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43e1495aace9dc0255054c2416ee05dd59f6b7e4;p=thirdparty%2Fdovecot%2Fcore.git

cassandra: statement_query() - Don't generate query string unnecessarily
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 20d6266ad9..47a492adff 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -2602,7 +2602,6 @@ driver_cassandra_statement_query(struct sql_statement *_stmt,
 	struct cassandra_sql_statement *stmt =
 		(struct cassandra_sql_statement *)_stmt;
 	struct cassandra_db *db = container_of(_stmt->db, struct cassandra_db, api);
-	const char *query = sql_statement_get_query(_stmt);
 	bool is_prepared = stmt->cass_stmt != NULL || stmt->prep != NULL;
 
 	stmt->result = driver_cassandra_query_init(db,
@@ -2617,7 +2616,10 @@ driver_cassandra_statement_query(struct sql_statement *_stmt,
 		/* wait for prepare to finish */
 		return;
 	} else {
-		stmt->result->statement = cass_statement_new(query, 0);
+		/* Not a prepared statement. Generate a statement from
+		   the query string. */
+		stmt->result->statement =
+			cass_statement_new(sql_statement_get_query(_stmt), 0);
 		stmt->result->timestamp = stmt->timestamp;
 		if (stmt->timestamp != 0) {
 			cass_statement_set_timestamp(stmt->result->statement,