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

Improve Column instruction

Browse source
This commit is contained in:
Pekka Enberg 2023-08-31 22:05:05 +03:00
parent b25f8c4daf
commit 4b714311b5
3 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/lib.rs
View file

@ -59,7 +59,7 @@ impl Connection {
for i in 0..program.column_count() { for i in 0..program.column_count() {
row.push(program.column(i).unwrap().to_string()); row.push(program.column(i).unwrap().to_string());
} }
println!("{:?}", row); println!("Row = {:?}", row);
} }
vdbe::StepResult::IO => todo!(), vdbe::StepResult::IO => todo!(),
vdbe::StepResult::Done => break, vdbe::StepResult::Done => break,

6
core/sqlite3_ondisk.rs
View file

@ -202,7 +202,7 @@ pub fn read_btree_cell(page: &[u8], page_type: &PageType, pos: usize) -> Result<
} }
} }
#[derive(Debug)] #[derive(Debug, Clone)]
pub enum Value { pub enum Value {
Null, Null,
Integer(i64), Integer(i64),
@ -213,7 +213,7 @@ pub enum Value {
#[derive(Debug)] #[derive(Debug)]
pub struct Record { pub struct Record {
_values: Vec<Value>, pub values: Vec<Value>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -276,7 +276,7 @@ pub fn read_record(payload: &[u8]) -> Result<Record> {
pos += usize; pos += usize;
values.push(value); values.push(value);
} }
Ok(Record { _values: values }) Ok(Record { values })
} }
pub fn read_value(buf: &[u8], serial_type: SerialType) -> Result<(Value, usize)> { pub fn read_value(buf: &[u8], serial_type: SerialType) -> Result<(Value, usize)> {

39
core/vdbe.rs
View file

@ -1,6 +1,7 @@
use crate::btree::Cursor; use crate::btree::Cursor;
use crate::pager::Pager; use crate::pager::Pager;
use crate::schema::Schema; use crate::schema::Schema;
use crate::sqlite3_ondisk::Value;
use anyhow::Result; use anyhow::Result;
use sqlite3_parser::ast::{OneSelect, Select, Stmt}; use sqlite3_parser::ast::{OneSelect, Select, Stmt};
@ -50,7 +51,9 @@ pub struct NextAwaitInsn {
} }
pub struct ColumnInsn { pub struct ColumnInsn {
pub cursor_id: usize,
pub column: usize, pub column: usize,
pub dest: usize,
} }
pub struct ResultRowInsn { pub struct ResultRowInsn {
@ -94,6 +97,7 @@ impl ProgramBuilder {
pc: 0, pc: 0,
pager, pager,
cursors: HashMap::new(), cursors: HashMap::new(),
registers: Vec::new(),
} }
} }
} }
@ -109,6 +113,7 @@ pub struct Program {
pub pc: usize, pub pc: usize,
pager: Arc<Pager>, pager: Arc<Pager>,
cursors: HashMap<usize, Cursor>, cursors: HashMap<usize, Cursor>,
registers: Vec<Option<Value>>,
} }
impl Program { impl Program {
@ -121,11 +126,11 @@ impl Program {
} }
pub fn column_count(&self) -> usize { pub fn column_count(&self) -> usize {
0 self.registers.len()
} }
pub fn column(&self, _i: usize) -> Option<&str> { pub fn column(&self, i: usize) -> Option<String> {
None Some(format!("{:?}", self.registers[i]))
} }
pub fn step(&mut self) -> Result<StepResult> { pub fn step(&mut self) -> Result<StepResult> {
@ -157,13 +162,19 @@ impl Program {
self.pc += 1; self.pc += 1;
} }
} }
Insn::Column(_) => { Insn::Column(insn) => {
let cursor = self.cursors.get_mut(&insn.cursor_id).unwrap();
if let Some(ref record) = *cursor.record()? {
self.registers.resize(insn.column + 1, None);
self.registers[insn.dest] = Some(record.values[insn.column].clone());
} else {
todo!();
}
self.pc += 1; self.pc += 1;
} }
Insn::ResultRow(insn) => { Insn::ResultRow(insn) => {
let cursor = self.cursors.get_mut(&insn.cursor_id).unwrap(); let cursor = self.cursors.get_mut(&insn.cursor_id).unwrap();
let record = cursor.record()?; let _ = cursor.record()?;
println!("record: {:?}", record);
self.pc += 1; self.pc += 1;
return Ok(StepResult::Row); return Ok(StepResult::Row);
} }
@ -237,7 +248,11 @@ fn translate_select(pager: Arc<Pager>, schema: &Schema, select: Select) -> Resul
sqlite3_parser::ast::ResultColumn::Expr(_, _) => todo!(), sqlite3_parser::ast::ResultColumn::Expr(_, _) => todo!(),
sqlite3_parser::ast::ResultColumn::Star => { sqlite3_parser::ast::ResultColumn::Star => {
for i in 0..table.columns.len() { for i in 0..table.columns.len() {
program.emit_insn(Insn::Column(ColumnInsn { column: i })); program.emit_insn(Insn::Column(ColumnInsn {
cursor_id,
column: i,
dest: i,
}));
} }
} }
sqlite3_parser::ast::ResultColumn::TableStar(_) => todo!(), sqlite3_parser::ast::ResultColumn::TableStar(_) => todo!(),
@ -304,7 +319,15 @@ fn print_insn(addr: usize, insn: &Insn) {
0, 0,
"".to_string(), "".to_string(),
), ),
Insn::Column(column) => (" Column", 0, column.column, 0, "", 0, "".to_string()), Insn::Column(insn) => (
" Column",
insn.cursor_id,
insn.column,
0,
"",
0,
"".to_string(),
),
Insn::ResultRow(insn) => (" ResultRow", insn.cursor_id, 0, 0, "", 0, "".to_string()), Insn::ResultRow(insn) => (" ResultRow", insn.cursor_id, 0, 0, "", 0, "".to_string()),
Insn::NextAsync(insn) => ("NextAsync", insn.cursor_id, 0, 0, "", 0, "".to_string()), Insn::NextAsync(insn) => ("NextAsync", insn.cursor_id, 0, 0, "", 0, "".to_string()),
Insn::NextAwait(insn) => ( Insn::NextAwait(insn) => (