mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-08-04 10:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix op_idx_delete infinite seeking loop

Browse source
This commit is contained in:
Jussi Saurio 2025-06-05 15:15:59 +03:00
parent 5c08d259bf
commit 1b4bef9c7c
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
core/vdbe/execute.rs
View file

@ -3932,6 +3932,13 @@ pub fn op_idx_delete(
else {
unreachable!("unexpected Insn {:?}", insn)
};
tracing::debug!(
"op_idx_delete(cursor_id={}, start_reg={}, num_regs={}, state={:?})",
cursor_id,
start_reg,
num_regs,
state.op_idx_delete_state
);
loop {
match &state.op_idx_delete_state {
Some(OpIdxDeleteState::Seeking(record)) => {
@ -3941,12 +3948,13 @@ pub fn op_idx_delete(
return_if_io!(
cursor.seek(SeekKey::IndexKey(&record), SeekOp::GE { eq_only: true })
);
tracing::debug!(
"op_idx_delete(seek={}, record={} rowid={:?})",
&record,
return_if_io!(cursor.record()).as_ref().unwrap(),
return_if_io!(cursor.rowid())
);
}
state.op_idx_delete_state = Some(OpIdxDeleteState::Deleting);
}
Some(OpIdxDeleteState::Deleting) => {
{
let mut cursor = state.get_cursor(*cursor_id);
let cursor = cursor.as_btree_mut();
if return_if_io!(cursor.rowid()).is_none() {
// If P5 is not zero, then raise an SQLITE_CORRUPT_INDEX error if no matching
// index entry is found. This happens when running an UPDATE or DELETE statement and the
@ -3955,16 +3963,9 @@ pub fn op_idx_delete(
// For those cases, P5 is zero. Also, do not raise this (self-correcting and non-critical) error if in writable_schema mode.
return Err(LimboError::Corrupt(format!(
"IdxDelete: no matching index entry found for record {:?}",
record
make_record(&state.registers, start_reg, num_regs)
)));
}
}
state.op_idx_delete_state = Some(OpIdxDeleteState::Deleting);
}
Some(OpIdxDeleteState::Deleting) => {
{
let mut cursor = state.get_cursor(*cursor_id);
let cursor = cursor.as_btree_mut();
return_if_io!(cursor.delete());
}
let n_change = program.n_change.get();