aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-23 18:04:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'core/vdbe: Avoid cloning Arc<MvStore> on every VDBE step' from Pekka Enberg

Browse Source 
The VDBE step() function was taking Arc<MvStore> by value, causing it to
be cloned on every single step of query execution. This resulted in
thousands of atomic reference count increments/decrements per query,
showing up as a major hotspot in profiling.
Changed step() and related functions to take Option<&Arc<MvStore>>
instead, passing a reference rather than cloning the Arc. This
eliminates the unnecessary atomic operations while maintaining the same
semantics.

Reviewed-by: Jussi Saurio <jussi.saurio@gmail.com>

Closes #3520
This commit is contained in:
Pekka Enberg
2025-10-02 13:41:14 +03:00
committed by GitHub
parent 641c3a73d0 4c5a7cda08
commit aa37d279ca
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib.rs
View File

@@ -2472,7 +2472,7 @@ impl Statement {
let mut res = if !self.accesses_db {
self.program.step(
&mut self.state,
self.mv_store.clone(),
self.mv_store.as_ref(),
self.pager.clone(),
self.query_mode,
)
@@ -2480,7 +2480,7 @@ impl Statement {
const MAX_SCHEMA_RETRY: usize = 50;
let mut res = self.program.step(
&mut self.state,
self.mv_store.clone(),
self.mv_store.as_ref(),
self.pager.clone(),
self.query_mode,
);
@@ -2493,7 +2493,7 @@ impl Statement {
self.reprepare()?;
res = self.program.step(
&mut self.state,
self.mv_store.clone(),
self.mv_store.as_ref(),
self.pager.clone(),
self.query_mode,
);

14
core/vdbe/mod.rs
View File

@@ -512,7 +512,7 @@ impl Program {
pub fn step(
&self,
state: &mut ProgramState,
mv_store: Option<Arc<MvStore>>,
mv_store: Option<&Arc<MvStore>>,
pager: Arc<Pager>,
query_mode: QueryMode,
) -> Result<StepResult> {
@@ -526,7 +526,7 @@ impl Program {
fn explain_step(
&self,
state: &mut ProgramState,
_mv_store: Option<Arc<MvStore>>,
_mv_store: Option<&Arc<MvStore>>,
pager: Arc<Pager>,
) -> Result<StepResult> {
debug_assert!(state.column_count() == EXPLAIN_COLUMNS.len());
@@ -580,7 +580,7 @@ impl Program {
fn explain_query_plan_step(
&self,
state: &mut ProgramState,
_mv_store: Option<Arc<MvStore>>,
_mv_store: Option<&Arc<MvStore>>,
pager: Arc<Pager>,
) -> Result<StepResult> {
debug_assert!(state.column_count() == EXPLAIN_QUERY_PLAN_COLUMNS.len());
@@ -628,7 +628,7 @@ impl Program {
fn normal_step(
&self,
state: &mut ProgramState,
mv_store: Option<Arc<MvStore>>,
mv_store: Option<&Arc<MvStore>>,
pager: Arc<Pager>,
) -> Result<StepResult> {
let enable_tracing = tracing::enabled!(tracing::Level::TRACE);
@@ -650,7 +650,7 @@ impl Program {
}
if let Some(err) = io.get_error() {
let err = err.into();
handle_program_error(&pager, &self.connection, &err, mv_store.as_ref())?;
handle_program_error(&pager, &self.connection, &err, mv_store)?;
return Err(err);
}
state.io_completions = None;
@@ -665,7 +665,7 @@ impl Program {
// Always increment VM steps for every loop iteration
state.metrics.vm_steps = state.metrics.vm_steps.saturating_add(1);
match insn_function(self, state, insn, &pager, mv_store.as_ref()) {
match insn_function(self, state, insn, &pager, mv_store) {
Ok(InsnFunctionStepResult::Step) => {
// Instruction completed, moving to next
state.metrics.insn_executed = state.metrics.insn_executed.saturating_add(1);
@@ -694,7 +694,7 @@ impl Program {
return Ok(StepResult::Busy);
}
Err(err) => {
handle_program_error(&pager, &self.connection, &err, mv_store.as_ref())?;
handle_program_error(&pager, &self.connection, &err, mv_store)?;
return Err(err);
}
}