aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-01-06 17:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'Fix NextAwait's next instruction; rename rewind_labels' from Arpit Saxena

Browse Source 
Closes #351
NextAwait's next instruction was pointing to RewindAwait earlier which
is not current. The instruction now points to the instruction after
RewindAwait, which will be the loop body. Hence, rename rewind_labels to
scan_loop_body_labels to make it clearer

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

Closes #354
This commit is contained in:
jussisaurio
2024-10-05 18:23:37 +03:00
parent 765870ce69 47c8fd1964
commit d3015ad854
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/translate/emitter.rs
View File

@@ -124,7 +124,7 @@ pub struct Metadata {
// in a join with a scan and a seek, the seek will jump to the scan's Next instruction when the join condition is false.
next_row_labels: HashMap<usize, BranchOffset>,
// labels for the Rewind instructions.
rewind_labels: Vec<BranchOffset>,
scan_loop_body_labels: Vec<BranchOffset>,
// mapping between Aggregation operator id and the register that holds the start of the aggregation result
aggregation_start_registers: HashMap<usize, usize>,
// mapping between Aggregation operator id and associated metadata (if the aggregation has a group by clause)
@@ -196,10 +196,8 @@ impl Emitter for Operator {
SCAN_REWIND_AND_CONDITIONS => {
let cursor_id = program.resolve_cursor_id(table_identifier, None);
program.emit_insn(Insn::RewindAsync { cursor_id });
let rewind_label = program.allocate_label();
let scan_loop_body_label = program.allocate_label();
let halt_label = m.termination_label_stack.last().unwrap();
m.rewind_labels.push(rewind_label);
program.defer_label_resolution(rewind_label, program.offset() as usize);
program.emit_insn_with_label_dependency(
Insn::RewindAwait {
cursor_id,
@@ -207,6 +205,11 @@ impl Emitter for Operator {
},
*halt_label,
);
m.scan_loop_body_labels.push(scan_loop_body_label);
program.defer_label_resolution(
scan_loop_body_label,
program.offset() as usize,
);
let jump_label = m.next_row_labels.get(id).unwrap_or(halt_label);
if let Some(preds) = predicates {
@@ -235,7 +238,7 @@ impl Emitter for Operator {
program
.resolve_label(*m.next_row_labels.get(id).unwrap(), program.offset());
program.emit_insn(Insn::NextAsync { cursor_id });
let jump_label = m.rewind_labels.pop().unwrap();
let jump_label = m.scan_loop_body_labels.pop().unwrap();
program.emit_insn_with_label_dependency(
Insn::NextAwait {
cursor_id,
@@ -1439,7 +1442,7 @@ fn prologue(
group_bys: HashMap::new(),
left_joins: HashMap::new(),
next_row_labels: HashMap::new(),
rewind_labels: vec![],
scan_loop_body_labels: vec![],
sorts: HashMap::new(),
};