perf(sqlite-native): avoid cloning cached read chunks

Author: NathanFlurry

rivetkit-typescript/packages/sqlite-native/src/vfs.rs

@@ -413,20 +413,18 @@ unsafe extern "C" fn kv_io_read(
 		let end_chunk = (offset + requested_length - 1) / kv::CHUNK_SIZE;
 
 		let mut chunk_keys_to_fetch = Vec::new();
-		let mut buffered_chunks: HashMap<usize, Vec<u8>> = HashMap::new();
+		let mut buffered_chunks = HashMap::new();
+		// Skip fetching chunks already present in the dirty buffer (batch mode) or read cache.
 		for chunk_idx in start_chunk..=end_chunk {
-			// Check dirty buffer first (batch mode writes).
 			if state.batch_mode {
-				if let Some(buffered) = state.dirty_buffer.get(&(chunk_idx as u32)) {
-					buffered_chunks.insert(chunk_idx, buffered.clone());
+				if state.dirty_buffer.contains_key(&(chunk_idx as u32)) {
 					continue;
 				}
 			}
-			// Check read cache.
 			let key = kv::get_chunk_key(file.file_tag, chunk_idx as u32);
 			if let Some(read_cache) = state.read_cache.as_ref() {
 				if let Some(cached) = read_cache.get(key.as_slice()) {
-					buffered_chunks.insert(chunk_idx, cached.clone());
+					buffered_chunks.insert(chunk_idx, cached.as_slice());
 					continue;
 				}
 			}
@@ -440,29 +438,24 @@ unsafe extern "C" fn kv_io_read(
 			}
 		} else {
 			match ctx.kv_get(chunk_keys_to_fetch) {
-				Ok(resp) => {
-					if let Some(read_cache) = state.read_cache.as_mut() {
-						for (key, value) in resp.keys.iter().zip(resp.values.iter()) {
-							if !value.is_empty() {
-								read_cache.insert(key.clone(), value.clone());
-							}
-						}
-					}
-					resp
-				}
+				Ok(resp) => resp,
 				Err(_) => return SQLITE_IOERR_READ,
 			}
 		};
 		let value_map = build_value_map(&resp);
 
 		for chunk_idx in start_chunk..=end_chunk {
-			let chunk_data: Option<&[u8]> = buffered_chunks
-				.get(&chunk_idx)
-				.map(|v| v.as_slice())
-				.or_else(|| {
-					let key = kv::get_chunk_key(file.file_tag, chunk_idx as u32);
-					value_map.get(key.as_slice()).copied()
-				});
+			let chunk_key = kv::get_chunk_key(file.file_tag, chunk_idx as u32);
+			let chunk_data = if state.batch_mode {
+				state
+					.dirty_buffer
+					.get(&(chunk_idx as u32))
+					.map(|buffered| buffered.as_slice())
+			} else {
+				None
+			}
+			.or_else(|| buffered_chunks.get(&chunk_idx).copied())
+			.or_else(|| value_map.get(chunk_key.as_slice()).copied());
 			let chunk_offset = chunk_idx * kv::CHUNK_SIZE;
 			let read_start = offset.saturating_sub(chunk_offset);
 			let read_end = std::cmp::min(kv::CHUNK_SIZE, offset + requested_length - chunk_offset);
@@ -485,6 +478,14 @@ unsafe extern "C" fn kv_io_read(
 			}
 		}
 
+		if let Some(read_cache) = state.read_cache.as_mut() {
+			for (key, value) in resp.keys.iter().zip(resp.values.iter()) {
+				if !value.is_empty() {
+					read_cache.insert(key.clone(), value.clone());
+				}
+			}
+		}
+
 		let actual_bytes = std::cmp::min(requested_length, file_size - offset);
 		if actual_bytes < requested_length {
 			buf[actual_bytes..].fill(0);