asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: optimize item service to reduce redundant database queries

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-25 20:59:45 -03:00
parent 41ff152a12
commit 3478ffee2c
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/modes/server/api/item.rs
View File

@@ -168,7 +168,7 @@ pub async fn handle_get_item_latest_content(
let item_service = AsyncItemService::new(state.data_dir.clone(), state.db.clone(), state.item_service.clone()); let item_service = AsyncItemService::new(state.data_dir.clone(), state.db.clone(), state.item_service.clone());
// First find the item to get its ID // First find the item to get its ID and metadata
let item_with_meta = item_service let item_with_meta = item_service
.find_item(vec![], tags, HashMap::new()) .find_item(vec![], tags, HashMap::new())
.await; .await;
@@ -176,7 +176,8 @@ pub async fn handle_get_item_latest_content(
match item_with_meta { match item_with_meta {
Ok(item) => { Ok(item) => {
let item_id = item.item.id.unwrap(); let item_id = item.item.id.unwrap();
stream_item_content_response(&item_service, item_id, params.allow_binary, params.offset, params.length).await let metadata = item.meta_as_map();
stream_item_content_response_with_metadata(&item_service, item_id, &metadata, params.allow_binary, params.offset, params.length).await
} }
Err(CoreError::ItemNotFoundGeneric) => Err(StatusCode::NOT_FOUND), Err(CoreError::ItemNotFoundGeneric) => Err(StatusCode::NOT_FOUND),
Err(e) => { Err(e) => {
@@ -239,6 +240,17 @@ async fn stream_item_content_response(
})?; })?;
let metadata = item_with_meta.meta_as_map(); let metadata = item_with_meta.meta_as_map();
stream_item_content_response_with_metadata(item_service, item_id, &metadata, allow_binary, offset, length).await
}
async fn stream_item_content_response_with_metadata(
item_service: &AsyncItemService,
item_id: i64,
metadata: &HashMap<String, String>,
allow_binary: bool,
offset: u64,
length: u64,
) -> Result<Response, StatusCode> {
let mime_type = metadata let mime_type = metadata
.get("mime_type") .get("mime_type")
.map(|s| s.to_string()) .map(|s| s.to_string())
@@ -265,7 +277,7 @@ async fn stream_item_content_response(
} }
// Now stream the content with the specified offset and length using pre-fetched metadata // Now stream the content with the specified offset and length using pre-fetched metadata
match item_service.stream_item_content_by_id_with_metadata(item_id, &metadata, true, offset, length).await { match item_service.stream_item_content_by_id_with_metadata(item_id, metadata, true, offset, length).await {
Ok((stream, _)) => { Ok((stream, _)) => {
let body = axum::body::Body::from_stream(stream); let body = axum::body::Body::from_stream(stream);
let response = Response::builder() let response = Response::builder()

9
src/services/item_service.rs
View File

@@ -104,8 +104,15 @@ impl ItemService {
let item = item_maybe.ok_or(CoreError::ItemNotFoundGeneric)?; let item = item_maybe.ok_or(CoreError::ItemNotFoundGeneric)?;
debug!("ITEM_SERVICE: Found matching item: {:?}", item); debug!("ITEM_SERVICE: Found matching item: {:?}", item);
// Get tags and meta directly instead of calling get_item which makes redundant queries
let item_id = item.id.ok_or_else(|| CoreError::InvalidInput("Item missing ID".to_string()))?; let item_id = item.id.ok_or_else(|| CoreError::InvalidInput("Item missing ID".to_string()))?;
self.get_item(conn, item_id) let tags = db::get_item_tags(conn, &item)?;
debug!("ITEM_SERVICE: Found {} tags for item {}", tags.len(), item_id);
let meta = db::get_item_meta(conn, &item)?;
debug!("ITEM_SERVICE: Found {} meta entries for item {}", meta.len(), item_id);
Ok(ItemWithMeta { item, tags, meta })
} }
pub fn list_items(&self, conn: &Connection, tags: &[String], meta: &HashMap<String, String>) -> Result<Vec<ItemWithMeta>, CoreError> { pub fn list_items(&self, conn: &Connection, tags: &[String], meta: &HashMap<String, String>) -> Result<Vec<ItemWithMeta>, CoreError> {