omedusyo/minisql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into persistence-2-electric-boogaloo

Browse source 
# Conflicts:
#	Cargo.lock
#	minisql/Cargo.toml
#	minisql/src/internals/row.rs
#	minisql/src/interpreter.rs
#	minisql/src/schema.rs
#	minisql/src/type_system.rs
This commit is contained in:
Jindřich Moravec 2024-01-28 15:34:14 +01:00
commit 6bf4e34006
28 changed files with 1146 additions and 654 deletions
Download patch file Download diff file Expand all files Collapse all files

344
minisql/src/interpreter.rs
View file

@ -1,12 +1,11 @@
use crate::error::Error;
use crate::internals::row::{ColumnPosition, Row};
use crate::internals::row::ColumnPosition;
use crate::schema::{TableName, TableSchema};
use crate::internals::table::Table;
use crate::operation::{ColumnSelection, Condition, Operation};
use crate::operation::{Operation, Condition};
use crate::result::DbResult;
use crate::type_system::{DbType, IndexableValue, Value};
use bimap::BiMap;
use serde::{Deserialize, Serialize};
use crate::restricted_row::RestrictedRow;
// Use `TablePosition` as index
pub type Tables = Vec<Table>;
@ -21,18 +20,20 @@ pub struct State {
// #[derive(Debug)]
pub enum Response<'a> {
Selected(Box<dyn Iterator<Item=Row> + 'a + Send>),
Selected(&'a TableSchema, Box<dyn Iterator<Item=RestrictedRow> + 'a + Send>),
Inserted,
Deleted(usize), // how many were deleted
TableCreated,
IndexCreated,
}
pub type DbSchema<'a> = Vec<(TableName, TablePosition, &'a TableSchema)>;
impl std::fmt::Debug for Response<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
use Response::*;
match self {
Selected(_rows) =>
Selected(_schema, _rows) =>
// TODO: How can we iterate through the rows without having to take ownership of
// them?
f.write_str("Some rows... trust me"),
@ -56,37 +57,21 @@ impl State {
}
}
/// TODO: return a reference to avoid allocations
pub fn metadata<'a>(&'a self) -> Vec<(String, &'a TableSchema)> {
let mut m = Vec::new();
for (name, pos) in &self.table_name_position_mapping {
let table_schema = self.tables.get(*pos).unwrap().schema();
m.push((name.clone(), table_schema));
pub fn db_schema<'a>(&'a self) -> DbSchema {
let mut schema: DbSchema = Vec::new();
for (table_name, &table_position) in &self.table_name_position_mapping {
let table_schema = self.tables[table_position].schema();
schema.push((table_name.clone(), table_position, table_schema));
}
m
schema
}
fn table_from_name<'a>(&'a self, table_name: &TableName) -> DbResult<&'a Table> {
match self.table_name_position_mapping.get_by_left(table_name) {
Some(table_position) => {
let table = &self.tables[*table_position];
Ok(table)
}
None => Err(Error::TableDoesNotExist(table_name.clone())),
}
fn table_at<'a>(&'a self, table_position: TablePosition) -> &'a Table {
&self.tables[table_position]
}
fn table_from_name_mut<'b: 'a, 'a>(
&'b mut self,
table_name: &TableName,
) -> DbResult<&'a mut Table> {
match self.table_name_position_mapping.get_by_left(table_name) {
Some(table_position) => {
let table = &mut self.tables[*table_position];
Ok(table)
}
None => Err(Error::TableDoesNotExist(table_name.clone())),
}
fn table_at_mut<'a>(&'a mut self, table_position: TablePosition) -> &'a mut Table {
&mut self.tables[table_position]
}
fn attach_table(&mut self, table_name: TableName, table: Table) {
@ -96,56 +81,47 @@ impl State {
self.tables.push(table);
}
pub fn interpret<'a>(&'a mut self, operation: Operation) -> DbResult<Response<'a>> {
pub fn interpret<'a>(&'a mut self, operation: Operation) -> DbResult<Response<'a>> {
// TODO: lock stuff
use Operation::*;
match operation {
Select(table_name, column_selection, maybe_condition) => {
let table: &Table = self.table_from_name(&table_name)?;
Select(table_position, column_selection, maybe_condition) => {
let table: &Table = self.table_at(table_position);
let selected_column_positions: Vec<ColumnPosition> = table
.schema()
.column_positions_from_column_selection(&column_selection)?;
let selected_rows = match maybe_condition {
None => {
let x = table.select_all_rows(selected_column_positions);
Box::new(x) as Box<dyn Iterator<Item=Row> + 'a + Send>
let rows = table.select_all_rows(column_selection);
Box::new(rows) as Box<dyn Iterator<Item=RestrictedRow> + 'a + Send>
},
Some(Condition::Eq(eq_column_name, value)) => {
let eq_column_position = table
.schema()
.column_position_from_column_name(&eq_column_name)?;
Some(Condition::Eq(eq_column, value)) => {
let x =
table.select_rows_where_eq(
selected_column_positions,
eq_column_position,
column_selection,
eq_column,
value,
)?;
Box::new(x) as Box<dyn Iterator<Item=Row> + 'a + Send>
Box::new(x) as Box<dyn Iterator<Item=RestrictedRow> + 'a + Send>
}
};
Ok(Response::Selected(selected_rows))
}
Insert(table_name, values) => {
let table: &mut Table = self.table_from_name_mut(&table_name)?;
Ok(Response::Selected(table.schema(), selected_rows))
},
Insert(table_position, values) => {
let table: &mut Table = self.table_at_mut(table_position);
let (id, row) = table.schema().row_from_insertion_values(values)?;
table.insert_row_at(id, row)?;
Ok(Response::Inserted)
}
Delete(table_name, maybe_condition) => {
let table: &mut Table = self.table_from_name_mut(&table_name)?;
Delete(table_position, maybe_condition) => {
let table: &mut Table = self.table_at_mut(table_position);
let rows_affected = match maybe_condition {
None => table.delete_all_rows(),
Some(Condition::Eq(eq_column_name, value)) => {
let eq_column_position = table
.schema()
.column_position_from_column_name(&eq_column_name)?;
table.delete_rows_where_eq(eq_column_position, value)?
Some(Condition::Eq(eq_column, value)) => {
table.delete_rows_where_eq(eq_column, value)?
}
};
@ -157,13 +133,9 @@ impl State {
Ok(Response::TableCreated)
}
CreateIndex(table_name, column_name) => {
let table: &mut Table = self.table_from_name_mut(&table_name)?;
let column_position: ColumnPosition = table
.schema()
.column_position_from_column_name(&column_name)?;
table.attach_index(column_position)?;
CreateIndex(table_position, column) => {
let table: &mut Table = self.table_at_mut(table_position);
table.attach_index(column)?;
Ok(Response::IndexCreated)
}
}
@ -173,7 +145,10 @@ impl State {
#[cfg(test)]
mod tests {
use super::*;
use crate::internals::row::ColumnPosition;
use std::collections::HashSet;
use crate::type_system::{DbType, IndexableValue, Value};
use crate::operation::Operation;
fn users_schema() -> TableSchema {
let id: ColumnPosition = 0;
@ -214,33 +189,22 @@ mod tests {
let mut state = State::new();
let users_schema = users_schema();
let users = users_schema.table_name().clone();
let users_position = 0;
state
.interpret(Operation::CreateTable(users.clone(), users_schema))
.interpret(Operation::CreateTable(users, users_schema.clone()))
.unwrap();
let response: Response = state
.interpret(Operation::Select(users.clone(), ColumnSelection::All, None))
.interpret(Operation::Select(users_position, users_schema.all_selection(), None))
.unwrap();
assert!(matches!(response, Response::Selected(_)));
let Response::Selected(rows) = response else {
assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(_schema, rows) = response else {
panic!()
};
let rows: Vec<_> = rows.collect();
assert!(rows.len() == 0);
}
#[test]
fn test_select_nonexistant_table() {
let mut state = State::new();
let response: DbResult<Response> = state.interpret(Operation::Select(
"table_that_doesnt_exist".to_string(),
ColumnSelection::All,
None,
));
assert!(matches!(response, Err(Error::TableDoesNotExist(_))));
}
#[test]
fn test_insert_select_basic1() {
use IndexableValue::*;
@ -248,10 +212,11 @@ mod tests {
let mut state = State::new();
let users_schema = users_schema();
let users = users_schema.table_name().clone();
let users = 0;
state
.interpret(Operation::CreateTable(users.clone(), users_schema))
.interpret(Operation::CreateTable("users".to_string(), users_schema.clone()))
.unwrap();
let (id, name, age) = (
@ -261,36 +226,35 @@ mod tests {
);
state
.interpret(Operation::Insert(
users.clone(),
users,
vec![
("id".to_string(), id.clone()),
("name".to_string(), name.clone()),
("age".to_string(), age.clone()),
id.clone(),
name.clone(),
age.clone(),
],
))
.unwrap();
let response: Response = state
.interpret(Operation::Select(users.clone(), ColumnSelection::All, None))
.interpret(Operation::Select(users, users_schema.all_selection(), None))
.unwrap();
assert!(matches!(response, Response::Selected(_)));
let Response::Selected(rows) = response else {
assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(_schema, rows) = response else {
panic!()
};
let rows: Vec<_> = rows.collect();
assert!(rows.len() == 1);
let row = &rows[0];
assert!(row.len() == 3);
assert!(row[0] == id);
assert!(row[1] == name);
assert!(row[2] == age);
assert!(row[0].1 == id);
assert!(row[1].1 == name);
assert!(row[2].1 == age);
}
#[test]
fn test_insert_select_basic2() {
use ColumnSelection::*;
use Condition::*;
use IndexableValue::*;
use Operation::*;
@ -298,10 +262,13 @@ mod tests {
let mut state = State::new();
let users_schema = users_schema();
let users = users_schema.table_name().clone();
let users_position: TablePosition = 0;
let id_column: ColumnPosition = 0;
let name_column: ColumnPosition = 1;
state
.interpret(CreateTable(users.clone(), users_schema))
.interpret(CreateTable(users_schema.table_name().clone(), users_schema.clone()))
.unwrap();
let (id0, name0, age0) = (
@ -311,11 +278,11 @@ mod tests {
);
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id0.clone()),
("name".to_string(), name0.clone()),
("age".to_string(), age0.clone()),
id0.clone(),
name0.clone(),
age0.clone(),
],
))
.unwrap();
@ -327,48 +294,49 @@ mod tests {
);
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id1.clone()),
("name".to_string(), name1.clone()),
("age".to_string(), age1.clone()),
id1.clone(),
name1.clone(),
age1.clone(),
],
))
.unwrap();
{
let response: Response = state.interpret(Select(users.clone(), All, None)).unwrap();
let response: Response = state.interpret(Select(users_position, users_schema.all_selection(), None)).unwrap();
assert!(matches!(response, Response::Selected(_)));
let Response::Selected(rows) = response else {
assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(_, rows) = response else {
panic!()
};
let rows: Vec<_> = rows.collect();
let rows: Vec<_> = rows.collect();
assert!(rows.len() == 2);
let row0 = &rows[0];
let row1 = &rows[1];
assert!(row0.len() == 3);
assert!(row0[0] == id0);
assert!(row0[1] == name0);
assert!(row0[2] == age0);
assert!(row0[0].1 == id0);
assert!(row0[1].1 == name0);
assert!(row0[2].1 == age0);
assert!(row1.len() == 3);
assert!(row1[0] == id1);
assert!(row1[1] == name1);
assert!(row1[2] == age1);
assert!(row1[0].1 == id1);
assert!(row1[1].1 == name1);
assert!(row1[2].1 == age1);
}
{
let response: Response = state
.interpret(Select(
users.clone(),
All,
Some(Eq("id".to_string(), id0.clone())),
users_position,
users_schema.all_selection(),
Some(Eq(id_column, id0.clone())),
))
.unwrap();
assert!(matches!(response, Response::Selected(_)));
let Response::Selected(rows) = response else {
assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(_, rows) = response else {
panic!()
};
let rows: Vec<_> = rows.collect();
@ -376,21 +344,21 @@ mod tests {
let row0 = &rows[0];
assert!(row0.len() == 3);
assert!(row0[0] == id0);
assert!(row0[1] == name0);
assert!(row0[2] == age0);
assert!(row0[0].1 == id0);
assert!(row0[1].1 == name0);
assert!(row0[2].1 == age0);
}
{
let response: Response = state
.interpret(Select(
users.clone(),
Columns(vec!["name".to_string(), "id".to_string()]),
Some(Eq("id".to_string(), id0.clone())),
users_position,
vec![name_column, id_column],
Some(Eq(id_column, id0.clone())),
))
.unwrap();
assert!(matches!(response, Response::Selected(_)));
let Response::Selected(rows) = response else {
assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(_, rows) = response else {
panic!()
};
let rows: Vec<_> = rows.collect();
@ -398,14 +366,13 @@ mod tests {
let row0 = &rows[0];
assert!(row0.len() == 2);
assert!(row0[0] == name0);
assert!(row0[1] == id0);
assert!(row0[0].1 == name0);
assert!(row0[1].1 == id0);
}
}
#[test]
fn test_delete() {
use ColumnSelection::*;
use Condition::*;
use IndexableValue::*;
use Operation::*;
@ -413,10 +380,12 @@ mod tests {
let mut state = State::new();
let users_schema = users_schema();
let users = users_schema.table_name().clone();
let users_position: TablePosition = 0;
let id_column: ColumnPosition = 0;
state
.interpret(CreateTable(users.clone(), users_schema))
.interpret(CreateTable(users_schema.table_name().clone(), users_schema.clone()))
.unwrap();
let (id0, name0, age0) = (
@ -426,11 +395,11 @@ mod tests {
);
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id0.clone()),
("name".to_string(), name0.clone()),
("age".to_string(), age0.clone()),
id0.clone(),
name0.clone(),
age0.clone(),
],
))
.unwrap();
@ -442,11 +411,11 @@ mod tests {
);
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id1.clone()),
("name".to_string(), name1.clone()),
("age".to_string(), age1.clone()),
id1.clone(),
name1.clone(),
age1.clone(),
],
))
.unwrap();
@ -454,17 +423,17 @@ mod tests {
{
let delete_response: Response = state
.interpret(Delete(
users.clone(),
Some(Eq("id".to_string(), id0.clone())),
users_position,
Some(Eq(id_column, id0.clone())),
))
.unwrap();
assert!(matches!(delete_response, Response::Deleted(1)));
}
let response: Response = state.interpret(Select(users.clone(), All, None)).unwrap();
let response: Response = state.interpret(Select(users_position, users_schema.all_selection(), None)).unwrap();
assert!(matches!(response, Response::Selected(_)));
let Response::Selected(rows) = response else {
assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(_, rows) = response else {
panic!()
};
let rows: Vec<_> = rows.collect();
@ -472,9 +441,9 @@ mod tests {
let row = &rows[0];
assert!(row.len() == 3);
assert!(row[0] == id1);
assert!(row[1] == name1);
assert!(row[2] == age1);
assert!(row[0].1 == id1);
assert!(row[1].1 == name1);
assert!(row[2].1 == age1);
}
#[test]
@ -485,14 +454,16 @@ mod tests {
let mut state = State::new();
let users_schema = users_schema();
let users = users_schema.table_name().clone();
let users_position: TablePosition = 0;
let name_column: ColumnPosition = 1;
state
.interpret(CreateTable(users.clone(), users_schema))
.interpret(CreateTable(users_schema.table_name().clone(), users_schema.clone()))
.unwrap();
state
.interpret(CreateIndex(users.clone(), "name".to_string()))
.interpret(CreateIndex(users_position, name_column))
.unwrap();
let (id0, name0, age0) = (
@ -502,11 +473,11 @@ mod tests {
);
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id0.clone()),
("name".to_string(), name0.clone()),
("age".to_string(), age0.clone()),
id0.clone(),
name0.clone(),
age0.clone(),
],
))
.unwrap();
@ -518,11 +489,11 @@ mod tests {
);
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id1.clone()),
("name".to_string(), name1.clone()),
("age".to_string(), age1.clone()),
id1.clone(),
name1.clone(),
age1.clone(),
],
))
.unwrap();
@ -547,33 +518,34 @@ mod tests {
}
pub fn example() {
use ColumnSelection::*;
use crate::type_system::{IndexableValue, Value, DbType};
use Condition::*;
use IndexableValue::*;
use Operation::*;
use Value::*;
let users_schema: TableSchema = {
let id: ColumnPosition = 0;
let name: ColumnPosition = 1;
let age: ColumnPosition = 2;
let id_column: ColumnPosition = 0;
let name_column: ColumnPosition = 1;
let age_column: ColumnPosition = 2;
let users_schema: TableSchema = {
TableSchema::new(
"users".to_string(),
id,
id_column,
vec!(
("id".to_string(), id),
("name".to_string(), name),
("age".to_string(), age),
("id".to_string(), id_column),
("name".to_string(), name_column),
("age".to_string(), age_column),
),
vec![DbType::Uuid, DbType::String, DbType::Int],
)
};
let users_position: TablePosition = 0;
let users = users_schema.table_name().clone();
let mut state = State::new();
state
.interpret(Operation::CreateTable(users.clone(), users_schema))
.interpret(Operation::CreateTable(users, users_schema.clone()))
.unwrap();
let (id0, name0, age0) = (
@ -584,11 +556,11 @@ pub fn example() {
println!("==INSERT Plato==");
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id0.clone()),
("name".to_string(), name0.clone()),
("age".to_string(), age0.clone()),
id0.clone(),
name0.clone(),
age0.clone(),
],
))
.unwrap();
@ -601,11 +573,11 @@ pub fn example() {
println!("==INSERT Aristotle==");
state
.interpret(Insert(
users.clone(),
users_position,
vec![
("id".to_string(), id1.clone()),
("name".to_string(), name1.clone()),
("age".to_string(), age1.clone()),
id1.clone(),
name1.clone(),
age1.clone(),
],
))
.unwrap();
@ -613,7 +585,7 @@ pub fn example() {
{
let response: Response = state
.interpret(Operation::Select(users.clone(), ColumnSelection::All, None))
.interpret(Operation::Select(users_position, users_schema.all_selection(), None))
.unwrap();
println!("==SELECT ALL==");
println!("{:?}", response);
@ -622,9 +594,9 @@ pub fn example() {
{
let response: Response = state
.interpret(Select(
users.clone(),
All,
Some(Eq("id".to_string(), id0.clone())),
users_position,
users_schema.all_selection(),
Some(Eq(id_column, id0.clone())),
))
.unwrap();
println!("==SELECT Plato==");
@ -638,16 +610,16 @@ pub fn example() {
// "infer" them?
let _delete_response: Response = state
.interpret(Delete(
users.clone(),
Some(Eq("id".to_string(), id0.clone())),
users_position,
Some(Eq(id_column, id0.clone())),
))
.unwrap();
println!("==DELETE Plato==");
}
let response: Response = state
.interpret(Select(
users.clone(),
Columns(vec!["name".to_string(), "id".to_string()]),
users_position,
vec![name_column, id_column],
None,
))
.unwrap();