From 73e30bfd438979d928bb3297001ee0579afc18c6 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Sat, 16 May 2026 17:45:23 +0000 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=20Bolt:=20[performance=20improvement]?= =?UTF-8?q?=20Optimize=20D1=20query=20generation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces intermediate `Vec` allocations with `String::with_capacity` and `write!` macro in the `build_upsert_stmt` and `build_delete_stmt` functions within `crates/flow/src/targets/d1.rs`. Co-authored-by: bashandbone <89049923+bashandbone@users.noreply.github.com> --- crates/ast-engine/src/tree_sitter/mod.rs | 10 ++- crates/flow/src/targets/d1.rs | 89 +++++++++++++------- crates/rule-engine/src/rule/mod.rs | 6 +- crates/rule-engine/src/rule/referent_rule.rs | 5 +- 4 files changed, 71 insertions(+), 39 deletions(-) diff --git a/crates/ast-engine/src/tree_sitter/mod.rs b/crates/ast-engine/src/tree_sitter/mod.rs index 3762df9..7bd59d1 100644 --- a/crates/ast-engine/src/tree_sitter/mod.rs +++ b/crates/ast-engine/src/tree_sitter/mod.rs @@ -553,9 +553,8 @@ impl ContentExt for String { let mut bytes = std::mem::take(self).into_bytes(); let original_len = bytes.len(); bytes.splice(safe_start..safe_end, full_inserted); - *self = Self::from_utf8(bytes).unwrap_or_else(|e| { - Self::from_utf8_lossy(&e.into_bytes()).into_owned() - }); + *self = Self::from_utf8(bytes) + .unwrap_or_else(|e| Self::from_utf8_lossy(&e.into_bytes()).into_owned()); // We calculate new_end_byte using the difference in the new overall string length // to correctly align the end offset, taking any potential replacement bytes from @@ -791,7 +790,10 @@ mod test { let tree2 = parse_lang(|p| p.parse(&src, Some(&tree)), &Tsx.get_ts_language())?; let fresh_tree = parse(&src)?; - assert_eq!(tree2.root_node().to_sexp(), fresh_tree.root_node().to_sexp()); + assert_eq!( + tree2.root_node().to_sexp(), + fresh_tree.root_node().to_sexp() + ); Ok(()) } } diff --git a/crates/flow/src/targets/d1.rs b/crates/flow/src/targets/d1.rs index e45fd52..b03dfec 100644 --- a/crates/flow/src/targets/d1.rs +++ b/crates/flow/src/targets/d1.rs @@ -300,40 +300,63 @@ impl D1ExportContext { key: &KeyValue, values: &FieldValues, ) -> Result<(String, Vec), RecocoError> { - let mut columns = vec![]; - let mut placeholders = vec![]; - let mut params = vec![]; - let mut update_clauses = vec![]; + use std::fmt::Write; + + // ⚡ Bolt Optimization: Use String::with_capacity and write! to avoid intermediate Vec allocations + // and string copying during query generation. + let mut sql = String::with_capacity(256); + let mut params = Vec::with_capacity(self.key_fields_schema.len() + values.fields.len()); + + write!(sql, "INSERT INTO {} (", self.table_name) + .map_err(|e| RecocoError::internal_msg(e.to_string()))?; + let mut first = true; // Extract key parts - KeyValue is a wrapper around Box<[KeyPart]> - for (idx, _key_field) in self.key_fields_schema.iter().enumerate() { + for (idx, key_field) in self.key_fields_schema.iter().enumerate() { if let Some(key_part) = key.0.get(idx) { - columns.push(self.key_fields_schema[idx].name.clone()); - placeholders.push("?".to_string()); + if !first { + sql.push_str(", "); + } + sql.push_str(&key_field.name); params.push(key_part_to_json(key_part)?); + first = false; } } // Add value fields for (idx, value) in values.fields.iter().enumerate() { if let Some(value_field) = self.value_fields_schema.get(idx) { - columns.push(value_field.name.clone()); - placeholders.push("?".to_string()); + if !first { + sql.push_str(", "); + } + sql.push_str(&value_field.name); params.push(value_to_json(value)?); - update_clauses.push(format!( - "{} = excluded.{}", - value_field.name, value_field.name - )); + first = false; } } - let sql = format!( - "INSERT INTO {} ({}) VALUES ({}) ON CONFLICT DO UPDATE SET {}", - self.table_name, - columns.join(", "), - placeholders.join(", "), - update_clauses.join(", ") - ); + sql.push_str(") VALUES ("); + + for i in 0..params.len() { + if i > 0 { + sql.push_str(", "); + } + sql.push('?'); + } + + sql.push_str(") ON CONFLICT DO UPDATE SET "); + + first = true; + for (idx, _value) in values.fields.iter().enumerate() { + if let Some(value_field) = self.value_fields_schema.get(idx) { + if !first { + sql.push_str(", "); + } + write!(sql, "{} = excluded.{}", value_field.name, value_field.name) + .map_err(|e| RecocoError::internal_msg(e.to_string()))?; + first = false; + } + } Ok((sql, params)) } @@ -342,22 +365,28 @@ impl D1ExportContext { &self, key: &KeyValue, ) -> Result<(String, Vec), RecocoError> { - let mut where_clauses = vec![]; - let mut params = vec![]; + use std::fmt::Write; - for (idx, _key_field) in self.key_fields_schema.iter().enumerate() { + // ⚡ Bolt Optimization: Avoid intermediate Vec allocations + let mut sql = String::with_capacity(128); + write!(sql, "DELETE FROM {} WHERE ", self.table_name) + .map_err(|e| RecocoError::internal_msg(e.to_string()))?; + + let mut params = Vec::with_capacity(self.key_fields_schema.len()); + let mut first = true; + + for (idx, key_field) in self.key_fields_schema.iter().enumerate() { if let Some(key_part) = key.0.get(idx) { - where_clauses.push(format!("{} = ?", self.key_fields_schema[idx].name)); + if !first { + sql.push_str(" AND "); + } + write!(sql, "{} = ?", key_field.name) + .map_err(|e| RecocoError::internal_msg(e.to_string()))?; params.push(key_part_to_json(key_part)?); + first = false; } } - let sql = format!( - "DELETE FROM {} WHERE {}", - self.table_name, - where_clauses.join(" AND ") - ); - Ok((sql, params)) } diff --git a/crates/rule-engine/src/rule/mod.rs b/crates/rule-engine/src/rule/mod.rs index d1d7712..a2433f3 100644 --- a/crates/rule-engine/src/rule/mod.rs +++ b/crates/rule-engine/src/rule/mod.rs @@ -246,7 +246,11 @@ impl Rule { pub fn defined_vars(&self) -> RapidSet { match self { - Rule::Pattern(p) => p.defined_vars().into_iter().map(|s| s.to_string()).collect(), + Rule::Pattern(p) => p + .defined_vars() + .into_iter() + .map(|s| s.to_string()) + .collect(), Rule::Kind(_) => RapidSet::default(), Rule::Regex(_) => RapidSet::default(), Rule::NthChild(n) => n.defined_vars(), diff --git a/crates/rule-engine/src/rule/referent_rule.rs b/crates/rule-engine/src/rule/referent_rule.rs index dd947bc..74d480e 100644 --- a/crates/rule-engine/src/rule/referent_rule.rs +++ b/crates/rule-engine/src/rule/referent_rule.rs @@ -27,10 +27,7 @@ impl Clone for Registration { impl Registration { fn read(&self) -> Arc> { - self.0 - .read() - .unwrap_or_else(|e| e.into_inner()) - .clone() + self.0.read().unwrap_or_else(|e| e.into_inner()).clone() } pub(crate) fn contains_key(&self, key: &str) -> bool { self.read().contains_key(key)