f Switch to prepare_cached statements everywhere

Author: tnull

bench/benches/bench.rs

@@ -3,21 +3,12 @@ extern crate lightning_persister;
 
 extern crate criterion;
 
-use criterion::{criterion_group, criterion_main};
+use criterion::{criterion_group, criterion_main, Criterion};
 
-criterion_group!(benches,
-	// Note that benches run in the order given here. Thus, they're sorted according to how likely
-	// developers are to be working on the specific code listed, then by runtime.
-	lightning::routing::router::benches::generate_routes_with_zero_penalty_scorer,
-	lightning::routing::router::benches::generate_mpp_routes_with_zero_penalty_scorer,
-	lightning::routing::router::benches::generate_routes_with_probabilistic_scorer,
-	lightning::routing::router::benches::generate_mpp_routes_with_probabilistic_scorer,
-	lightning::routing::router::benches::generate_large_mpp_routes_with_probabilistic_scorer,
-	lightning::sign::benches::bench_get_secure_random_bytes,
-	lightning::ln::channelmanager::bench::bench_sends,
-	lightning_persister::fs_store::bench::bench_sends,
-	lightning_persister::sqlite_store::bench::bench_sends,
-	lightning_rapid_gossip_sync::bench::bench_reading_full_graph_from_file,
-	lightning::routing::gossip::benches::read_network_graph,
-	lightning::routing::gossip::benches::write_network_graph);
+criterion_group!{
+	name = benches;
+	config = Criterion::default().sample_size(1000);
+	targets = //lightning_persister::fs_store::bench::bench_sends,
+		lightning_persister::sqlite_store::bench::bench_sends,
+}
 criterion_main!(benches);

lightning-persister/src/sqlite_store.rs

@@ -98,9 +98,13 @@ impl KVStore for SqliteStore {
 		let sql =
 			format!("SELECT value FROM {} WHERE namespace=:namespace AND key=:key;", self.kv_table_name);
 
-		let res = locked_conn
+		let mut stmt = locked_conn.prepare_cached(&sql).map_err(|e| {
+			let msg = format!("Failed to prepare statement: {}", e);
+			std::io::Error::new(std::io::ErrorKind::Other, msg)
+		})?;
+
+		let res = stmt
 			.query_row(
-				&sql,
 				named_params! {
 					":namespace": namespace,
 					":key": key,
@@ -146,14 +150,17 @@ impl KVStore for SqliteStore {
 			self.kv_table_name
 		);
 
-		locked_conn
-			.execute(
-				&sql,
-				named_params! {
-					":namespace": namespace,
-					":key": key,
-					":value": buf,
-				},
+		let mut stmt = locked_conn.prepare_cached(&sql).map_err(|e| {
+			let msg = format!("Failed to prepare statement: {}", e);
+			std::io::Error::new(std::io::ErrorKind::Other, msg)
+		})?;
+
+		stmt.execute(
+			named_params! {
+				":namespace": namespace,
+				":key": key,
+				":value": buf,
+			},
 			)
 			.map(|_| ())
 			.map_err(|e| {
@@ -183,13 +190,17 @@ impl KVStore for SqliteStore {
 		let locked_conn = self.connection.lock().unwrap();
 
 		let sql = format!("DELETE FROM {} WHERE namespace=:namespace AND key=:key;", self.kv_table_name);
-		locked_conn
-			.execute(
-				&sql,
-				named_params! {
-					":namespace": namespace,
-					":key": key,
-				},
+
+		let mut stmt = locked_conn.prepare_cached(&sql).map_err(|e| {
+			let msg = format!("Failed to prepare statement: {}", e);
+			std::io::Error::new(std::io::ErrorKind::Other, msg)
+		})?;
+
+		stmt.execute(
+			named_params! {
+				":namespace": namespace,
+				":key": key,
+			},
 			)
 			.map_err(|e| {
 				let msg = format!("Failed to delete key {}/{}: {}", namespace, key, e);
@@ -202,7 +213,7 @@ impl KVStore for SqliteStore {
 		let locked_conn = self.connection.lock().unwrap();
 
 		let sql = format!("SELECT key FROM {} WHERE namespace=:namespace", self.kv_table_name);
-		let mut stmt = locked_conn.prepare(&sql).map_err(|e| {
+		let mut stmt = locked_conn.prepare_cached(&sql).map_err(|e| {
 			let msg = format!("Failed to prepare statement: {}", e);
 			std::io::Error::new(std::io::ErrorKind::Other, msg)
 		})?;