Skip to content

🧹 Refactor std_database_query to improve maintainability #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Tcode-Motion wants to merge 2 commits into from
Closed

🧹 Refactor std_database_query to improve maintainability #326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ac433
refactor(stdlib): extract row processing helpers from std_database_query
google-labs-jules[bot] Oct 27, 2026
196a1a8
refactor(stdlib): extract row processing helpers from std_database_query
google-labs-jules[bot] Oct 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions stdlib/src/database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,38 @@ fn std_database_query(
.map(|s| s.to_string())
.collect();

let mut rows = stmt.query(params_refs.as_slice()).map_err(|e| {
let rows = stmt.query(params_refs.as_slice()).map_err(|e| {
RuntimeError::new(
RuntimeErrorKind::InvalidOperation(format!("Database query error: {}", e)),
None,
None,
)
})?;

let result_rows = process_query_rows(rows, &column_names)?;

Ok(RuntimeValue::List {
items: Rc::new(RefCell::new(result_rows)),
is_const: false,
})
}

fn convert_value_ref(val: rusqlite::types::ValueRef<'_>) -> RuntimeValue {
match val {
rusqlite::types::ValueRef::Null => RuntimeValue::Null,
rusqlite::types::ValueRef::Integer(i) => RuntimeValue::Int(i),
rusqlite::types::ValueRef::Real(f) => RuntimeValue::Float(f),
rusqlite::types::ValueRef::Text(bytes) | rusqlite::types::ValueRef::Blob(bytes) => {
let s = String::from_utf8_lossy(bytes).into_owned();
RuntimeValue::Str(s)
}
}
}

fn process_query_rows(
mut rows: rusqlite::Rows<'_>,
column_names: &[String],
) -> Result<Vec<RuntimeValue>, RuntimeError> {
// âš¡ Bolt Performance Optimization:
// Instead of constructing a new IndexMap for each row, cloning every column string,
// and re-hashing all keys, we create a prototype map once containing null values.
Expand All @@ -143,7 +167,7 @@ fn std_database_query(
// We map the database column indices to the deduplicated IndexMap indices.
let mut prototype_map = IndexMap::with_capacity(column_names.len());
let mut col_idx_to_map_idx = Vec::with_capacity(column_names.len());
for name in &column_names {
for name in column_names {
let (map_idx, _) = prototype_map.insert_full(name.clone(), RuntimeValue::Null);
col_idx_to_map_idx.push(map_idx);
}
Expand All @@ -159,25 +183,14 @@ fn std_database_query(
})? {
let mut row_map = prototype_map.clone();
for (idx, &map_idx) in col_idx_to_map_idx.iter().enumerate() {
let value = match row.get_ref(idx).map_err(|e| {
let val_ref = row.get_ref(idx).map_err(|e| {
RuntimeError::new(
RuntimeErrorKind::InvalidOperation(format!("Database column get error: {}", e)),
None,
None,
)
})? {
rusqlite::types::ValueRef::Null => RuntimeValue::Null,
rusqlite::types::ValueRef::Integer(i) => RuntimeValue::Int(i),
rusqlite::types::ValueRef::Real(f) => RuntimeValue::Float(f),
rusqlite::types::ValueRef::Text(bytes) => {
let s = String::from_utf8_lossy(bytes).into_owned();
RuntimeValue::Str(s)
}
rusqlite::types::ValueRef::Blob(bytes) => {
let s = String::from_utf8_lossy(bytes).into_owned();
RuntimeValue::Str(s)
}
};
})?;
let value = convert_value_ref(val_ref);
if let Some((_, v)) = row_map.get_index_mut(map_idx) {
*v = value;
}
Expand All @@ -188,10 +201,7 @@ fn std_database_query(
});
}

Ok(RuntimeValue::List {
items: Rc::new(RefCell::new(result_rows)),
is_const: false,
})
Ok(result_rows)
}

fn std_database_execute(
Expand Down
Loading