From 935d9814ae4563d113878258961d5bef3032366e Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sat, 27 Jan 2024 18:54:54 +0100 Subject: [PATCH 1/5] Introduce new simplified Operation type for Interpreter --- minisql/src/internals/row.rs | 5 +++ minisql/src/interpreter.rs | 73 +++++++++++++++++++++++++++++++++++- minisql/src/operation.rs | 18 +++++++++ minisql/src/schema.rs | 17 ++++++++- 4 files changed, 110 insertions(+), 3 deletions(-) diff --git a/minisql/src/internals/row.rs b/minisql/src/internals/row.rs index ad8dc1e..c0c81c0 100644 --- a/minisql/src/internals/row.rs +++ b/minisql/src/internals/row.rs @@ -1,4 +1,5 @@ use crate::type_system::Value; +use crate::operation::InsertionValuesForInterpreter; use std::ops::{Index, IndexMut}; use std::slice::SliceIndex; @@ -42,6 +43,10 @@ impl Row { Row(vec![]) } + pub fn new_from_insertion_values(insertion_values: InsertionValuesForInterpreter) -> Self { + Row(insertion_values) + } + pub fn with_number_of_columns(number_of_columns: usize) -> Self { Row(Vec::with_capacity(number_of_columns)) } diff --git a/minisql/src/interpreter.rs b/minisql/src/interpreter.rs index e85d085..7907ec9 100644 --- a/minisql/src/interpreter.rs +++ b/minisql/src/interpreter.rs @@ -2,7 +2,7 @@ use crate::error::Error; use crate::internals::row::{ColumnPosition, Row}; use crate::schema::{TableName, TableSchema}; use crate::internals::table::Table; -use crate::operation::{ColumnSelection, Condition, Operation}; +use crate::operation::{ColumnSelection, Condition, Operation, OperationForInterpreter, ConditionForInterpreter, ColumnSelectionForInterpreter}; use crate::result::DbResult; use crate::type_system::{DbType, IndexableValue, Value}; use bimap::BiMap; @@ -65,6 +65,7 @@ impl State { m } + // TODO: Get rid of this 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) => { @@ -75,6 +76,10 @@ impl State { } } + 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, @@ -88,6 +93,10 @@ impl State { } } + 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) { let new_table_position: TablePosition = self.tables.len(); self.table_name_position_mapping @@ -95,7 +104,67 @@ impl State { self.tables.push(table); } - pub fn interpret<'a>(&'a mut self, operation: Operation) -> DbResult> { + pub fn interpret_for_interpreter<'a>(&'a mut self, operation: OperationForInterpreter) -> DbResult> { + // TODO: lock stuff + use OperationForInterpreter::*; + + match operation { + Select(table_position, column_selection, maybe_condition) => { + let table: &Table = self.table_at(table_position); + + let selected_rows = match maybe_condition { + None => { + let x = table.select_all_rows(column_selection); + Box::new(x) as Box + 'a + Send> + }, + + Some(ConditionForInterpreter::Eq(eq_column, value)) => { + let x = + table.select_rows_where_eq( + column_selection, + eq_column, + value, + )?; + Box::new(x) as Box + 'a + Send> + } + }; + + Ok(Response::Selected(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_for_interpreter(values)?; + table.insert_row_at(id, row)?; + Ok(Response::Inserted) + } + 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(ConditionForInterpreter::Eq(eq_column, value)) => { + table.delete_rows_where_eq(eq_column, value)? + } + }; + + Ok(Response::Deleted(rows_affected)) + } + CreateTable(table_name, table_schema) => { + let table = Table::new(table_schema); + self.attach_table(table_name, table); + + Ok(Response::TableCreated) + } + CreateIndex(table_position, column) => { + let table: &mut Table = self.table_at_mut(table_position); + table.attach_index(column)?; + Ok(Response::IndexCreated) + } + } + } + + pub fn interpret<'a>(&'a mut self, operation: Operation) -> DbResult> { // TODO: lock stuff use Operation::*; diff --git a/minisql/src/operation.rs b/minisql/src/operation.rs index 3b060c9..7c45fe3 100644 --- a/minisql/src/operation.rs +++ b/minisql/src/operation.rs @@ -1,5 +1,7 @@ use crate::schema::{ColumnName, TableName, TableSchema}; use crate::type_system::Value; +use crate::internals::row::ColumnPosition; +use crate::interpreter::TablePosition; // ==============SQL operations================ // TODO: Note that every operation has a table name. @@ -16,13 +18,25 @@ pub enum Operation { // DropTable(TableName), } +pub enum OperationForInterpreter { + Select(TablePosition, ColumnSelectionForInterpreter, Option), + Insert(TablePosition, InsertionValuesForInterpreter), + Delete(TablePosition, Option), + CreateTable(TableName, TableSchema), + CreateIndex(TablePosition, ColumnPosition), +} + pub type InsertionValues = Vec<(ColumnName, Value)>; +pub type InsertionValuesForInterpreter = Vec; + pub enum ColumnSelection { All, Columns(Vec), } +pub type ColumnSelectionForInterpreter = Vec; + pub enum Condition { // And(Box, Box), // Or(Box, Box), @@ -34,6 +48,10 @@ pub enum Condition { // StringCondition(StringCondition), } +pub enum ConditionForInterpreter { + Eq(ColumnPosition, Value), +} + // enum StringCondition { // Prefix(ColumnName, String), // Substring(ColumnName, String), diff --git a/minisql/src/schema.rs b/minisql/src/schema.rs index e029606..90022d2 100644 --- a/minisql/src/schema.rs +++ b/minisql/src/schema.rs @@ -1,6 +1,6 @@ use crate::error::Error; use crate::internals::row::{ColumnPosition, Row}; -use crate::operation::{ColumnSelection, InsertionValues}; +use crate::operation::{ColumnSelection, InsertionValues, InsertionValuesForInterpreter, ColumnSelectionForInterpreter}; use crate::result::DbResult; use crate::type_system::{DbType, IndexableValue, Uuid, Value}; use bimap::BiMap; @@ -136,6 +136,21 @@ impl TableSchema { self.column_name_position_mapping.len() } + pub fn row_from_insertion_values_for_interpreter( + &self, + insertion_values: InsertionValuesForInterpreter, + ) -> DbResult<(Uuid, Row)> { + let row: Row = Row::new_from_insertion_values(insertion_values); + + let id: Uuid = match row.get(self.primary_key) { + Some(Value::Indexable(IndexableValue::Uuid(id))) => *id, + Some(_) => unreachable!(), // SAFETY: Should be guaranteed by validation + None => unreachable!(), // SAFETY: Should be guaranteed by validation + }; + + Ok((id, row)) + } + pub fn row_from_insertion_values( &self, insertion_values: InsertionValues, From 562e73213892d9e8ba9fc6f3e08ecd0dd47ec8e0 Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:22:00 +0100 Subject: [PATCH 2/5] Validation now outputs a Validated Interpreter Operation --- minisql/src/operation.rs | 32 ++++---- minisql/src/schema.rs | 10 +++ parser/src/core.rs | 5 +- parser/src/lib.rs | 1 + parser/src/syntax.rs | 36 +++++++++ parser/src/validation.rs | 169 +++++++++++++++------------------------ 6 files changed, 133 insertions(+), 120 deletions(-) create mode 100644 parser/src/syntax.rs diff --git a/minisql/src/operation.rs b/minisql/src/operation.rs index 7c45fe3..332aff0 100644 --- a/minisql/src/operation.rs +++ b/minisql/src/operation.rs @@ -18,25 +18,13 @@ pub enum Operation { // DropTable(TableName), } -pub enum OperationForInterpreter { - Select(TablePosition, ColumnSelectionForInterpreter, Option), - Insert(TablePosition, InsertionValuesForInterpreter), - Delete(TablePosition, Option), - CreateTable(TableName, TableSchema), - CreateIndex(TablePosition, ColumnPosition), -} - pub type InsertionValues = Vec<(ColumnName, Value)>; -pub type InsertionValuesForInterpreter = Vec; - pub enum ColumnSelection { All, Columns(Vec), } -pub type ColumnSelectionForInterpreter = Vec; - pub enum Condition { // And(Box, Box), // Or(Box, Box), @@ -48,11 +36,23 @@ pub enum Condition { // StringCondition(StringCondition), } -pub enum ConditionForInterpreter { - Eq(ColumnPosition, Value), -} - // enum StringCondition { // Prefix(ColumnName, String), // Substring(ColumnName, String), // } + +pub enum OperationForInterpreter { + Select(TablePosition, ColumnSelectionForInterpreter, Option), + Insert(TablePosition, InsertionValuesForInterpreter), + Delete(TablePosition, Option), + CreateTable(TableName, TableSchema), + CreateIndex(TablePosition, ColumnPosition), +} + +pub type InsertionValuesForInterpreter = Vec; + +pub type ColumnSelectionForInterpreter = Vec; + +pub enum ConditionForInterpreter { + Eq(ColumnPosition, Value), +} diff --git a/minisql/src/schema.rs b/minisql/src/schema.rs index 90022d2..0d44b76 100644 --- a/minisql/src/schema.rs +++ b/minisql/src/schema.rs @@ -48,6 +48,16 @@ impl TableSchema { self.column_name_position_mapping.get_by_left(column_name).copied() } + pub fn all_selection(&self) -> ColumnSelectionForInterpreter { + self.column_name_position_mapping.iter().map(|(_, column)| *column).collect() + } + + // TODO: Rename to get_column + pub fn get_column0(&self, column_name: &ColumnName) -> Option<(ColumnPosition, DbType)> { + let column = self.get_column_position(column_name)?; + Some((column, self.column_type(column))) + } + pub fn get_type_at(&self, column_name: &ColumnName) -> Option { let position = self.get_column_position(column_name)?; self.types.get(position).copied() diff --git a/parser/src/core.rs b/parser/src/core.rs index 248c5c6..258c928 100644 --- a/parser/src/core.rs +++ b/parser/src/core.rs @@ -1,4 +1,5 @@ use minisql::{operation::Operation, schema::TableSchema}; +use crate::syntax::RawQuerySyntax; use nom::{branch::alt, multi::many0, IResult}; use thiserror::Error; @@ -34,7 +35,9 @@ pub fn parse_and_validate(query: String, db_metadata: &Vec<(String, &TableSchema Error::ParsingError(err.to_string()) })?; - validate_operation(&op, db_metadata)?; + // TODO + // validate_operation(&op, db_metadata)?; + todo!(); Ok(op) } diff --git a/parser/src/lib.rs b/parser/src/lib.rs index 94b121b..18eab0c 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -2,6 +2,7 @@ mod parsing; mod validation; mod core; +mod syntax; pub use core::parse_and_validate; pub use core::Error; diff --git a/parser/src/syntax.rs b/parser/src/syntax.rs new file mode 100644 index 0000000..039a06d --- /dev/null +++ b/parser/src/syntax.rs @@ -0,0 +1,36 @@ +use minisql::{type_system::Value, schema::{TableSchema, ColumnName, TableName}}; + +// TODO: Move this out into separate file and rename to something like Syntax, SyntaxTree, +// OperationSyntax, RawOperationSyntax +pub enum RawQuerySyntax { + Select(TableName, ColumnSelection, Option), + Insert(TableName, InsertionValues), + Delete(TableName, Option), + // Update(...), + CreateTable(TableName, TableSchema), + CreateIndex(TableName, ColumnName), + // DropTable(TableName), +} + +pub type InsertionValues = Vec<(ColumnName, Value)>; + +pub enum ColumnSelection { + All, + Columns(Vec), +} + +pub enum Condition { + // And(Box, Box), + // Or(Box, Box), + // Not(Box), + Eq(ColumnName, Value), + // LessOrEqual(ColumnName, DbValue), + // Less(ColumnName, DbValue), + + // StringCondition(StringCondition), +} + +// enum StringCondition { +// Prefix(ColumnName, String), +// Substring(ColumnName, String), +// } diff --git a/parser/src/validation.rs b/parser/src/validation.rs index 2c20c24..017491b 100644 --- a/parser/src/validation.rs +++ b/parser/src/validation.rs @@ -1,9 +1,9 @@ - use std::collections::HashSet; +use std::collections::HashMap; use thiserror::Error; -use minisql::{operation::{ColumnSelection, Condition, InsertionValues, Operation}, schema::{TableSchema, ColumnName, TableName}, type_system::DbType}; - +use crate::syntax::{ColumnSelection, Condition, InsertionValues, RawQuerySyntax}; +use minisql::{operation::{ColumnSelectionForInterpreter, ConditionForInterpreter, InsertionValuesForInterpreter, OperationForInterpreter}, type_system::Value, schema::{TableSchema, ColumnName, TableName}, type_system::DbType, interpreter::TablePosition}; #[derive(Debug, Error)] pub enum ValidationError { @@ -25,69 +25,55 @@ pub enum ValidationError { RequiredColumnsAreMissing(Vec) } -pub type DbSchema<'a> = Vec<(TableName, &'a TableSchema)>; +pub type DbSchema<'a> = Vec<(TableName, TablePosition, &'a TableSchema)>; -/// Validates the operation based on db_metadata -pub fn validate_operation(operation: &Operation, db_schema: &DbSchema) -> Result<(), ValidationError> { - match operation { - Operation::Select(table_name, column_selection, condition) => { - validate_select(table_name, column_selection, condition, db_schema)?; +/// Validates and converts the raw syntax into a proper interpreter operation based on db schema. +pub fn validate_operation(query: RawQuerySyntax, db_schema: &DbSchema) -> Result { + match query { + RawQuerySyntax::Select(table_name, column_selection, condition) => { + validate_select(table_name, column_selection, condition, db_schema) }, - Operation::Insert(table_name, insertion_values) => { - validate_insert(&table_name, insertion_values, db_schema)?; + RawQuerySyntax::Insert(table_name, insertion_values) => { + validate_insert(table_name, insertion_values, db_schema) }, - Operation::Delete(table_name, condition) => { - validate_delete(table_name, condition, db_schema)?; + RawQuerySyntax::Delete(table_name, condition) => { + validate_delete(table_name, condition, db_schema) }, - // Operation::Update(table_name, insertion_values, condition) => { - // validate_update(table_name, insertion_values, db_metadata)?; - // }, - Operation::CreateTable(table_name, schema) => { - validate_create(table_name, schema, db_schema)?; + RawQuerySyntax::CreateTable(table_name, schema) => { + validate_create(table_name, schema, db_schema) }, - Operation::CreateIndex(table_name, column_name) => { - validate_create_index(table_name, column_name, db_schema)?; + RawQuerySyntax::CreateIndex(table_name, column_name) => { + validate_create_index(table_name, column_name, db_schema) }, - // Operation::DropTable(table_name) => { - // validate_drop(table_name, db_schema)?; - // } } - Ok(()) } -fn validate_table_exists<'a>(db_schema: &DbSchema<'a>, table_name: &'a TableName) -> Result<&'a TableSchema, ValidationError> { - db_schema.iter().find(|(tname, _)| table_name.eq(tname)) +fn validate_table_exists<'a>(db_schema: &DbSchema<'a>, table_name: &'a TableName) -> Result<(TablePosition, &'a TableSchema), ValidationError> { + db_schema.iter().find(|(tname, _, _)| table_name.eq(tname)) .ok_or(ValidationError::TableDoesNotExist(table_name.to_string())) - .map(|(_, table_schema)| table_schema).copied() + .map(|(_, table_position, table_schema)| (*table_position, *table_schema)) } - -// pub fn validate_drop(table_name: &str, db_metadata: &Vec<(String, TableSchema)>) -> Result<(), ValidationError> { -// db_metadata.iter().find(|(tname, _)| table_name.eq(tname)) -// .ok_or(ValidationError::TableDoesNotExist(table_name.to_string()))?; -// Ok(()) -// } - -pub fn validate_create(table_name: &TableName, schema: &TableSchema, db_schema: &DbSchema) -> Result<(), ValidationError> { - if let Some(_) = get_table_schema(db_schema, table_name) { +pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result { + if let Some(_) = get_table_schema(db_schema, &table_name) { return Err(ValidationError::TableAlreadyExists(table_name.to_string())); } - find_first_duplicate(&schema.get_columns()) + find_first_duplicate(&table_schema.get_columns()) .map_or_else( || Ok(()), |duplicate_column| Err(ValidationError::DuplicateColumn(duplicate_column.to_string())) )?; // TODO: Ensure it has a primary key?? - Ok(()) + Ok(OperationForInterpreter::CreateTable(table_name, table_schema)) } -pub fn validate_select(table_name: &TableName, column_selection: &ColumnSelection, condition: &Option, db_schema: &Vec<(TableName, &TableSchema)>) -> Result<(), ValidationError> { - let schema = validate_table_exists(db_schema, table_name)?; +pub fn validate_select(table_name: TableName, column_selection: ColumnSelection, condition: Option, db_schema: &DbSchema) -> Result { + let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; match column_selection { ColumnSelection::Columns(columns) => { - let non_existant_columns: Vec = + let non_existant_columns: Vec = columns.iter().filter_map(|column| if schema.does_column_exist(&column) { Some(column.clone()) @@ -97,52 +83,21 @@ pub fn validate_select(table_name: &TableName, column_selection: &ColumnSelectio if non_existant_columns.len() > 0 { Err(ValidationError::ColumnsDoNotExist(non_existant_columns)) } else { - validate_condition(condition, schema) + let selection: ColumnSelectionForInterpreter = + columns.iter().filter_map(|column_name| schema.get_column_position(column_name)).collect(); + let validated_condition = validate_condition(condition, schema)?; + Ok(OperationForInterpreter::Select(table_position, selection, validated_condition)) } } - ColumnSelection::All => Ok(()) + ColumnSelection::All => { + let validated_condition = validate_condition(condition, schema)?; + Ok(OperationForInterpreter::Select(table_position, schema.all_selection(), validated_condition)) + } } } -// pub fn validate_update(table_name: &str, insertion_values: &InsertionValues, db_metadata: &Vec<(String, TableSchema)>) -> Result<(), ValidationError> { -// let schema = validate_table_exists(db_schema, table_name)?; -// let mut column_names = HashSet::new(); -// // Find duplicate columns -// for (name, _) in insertion_values { -// if column_names.contains(name) { -// return Err(ValidationError::DuplicateColumn(name.clone())); -// } else { -// column_names.insert(name.clone()); -// } -// } -// // Ensure columns exist in schema -// let column_value_type: Vec<_> = insertion_values.iter().map(|(column, value)| { -// (column, value, schema.column_name_position_mapping.iter().find(|(name, _) | { -// (*name).eq(column) -// }).map(|(_, t)| schema.types.get(*t as usize))) -// }).collect(); -// if let Some((name, _, _)) = column_value_type.iter().find(|(_, _, t)| { -// t.is_none() -// }) { -// return Err(ValidationError::ColumnsDoNotExist(vec![(*name).clone())]); -// } - -// // Check types -// if let Some((_, _, _)) = column_value_type.iter().find(|(_, value, t)| { -// if let Some(Some(column_type)) = t { -// !type_of(value).eq(column_type) -// } else { -// false -// } -// }) { -// // TODO: Add column name information -// return Err(ValidationError::TypeMismatch); -// } -// Ok(()) -// } - -pub fn validate_insert(table_name: &TableName, insertion_values: &InsertionValues, db_schema: &DbSchema) -> Result<(), ValidationError> { - let schema = validate_table_exists(db_schema, table_name)?; +pub fn validate_insert(table_name: TableName, insertion_values: InsertionValues, db_schema: &DbSchema) -> Result { + let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; // Check for duplicate columns in insertion_values. let columns_in_query_vec: Vec<&ColumnName> = insertion_values.iter().map(|(column_name, _)| column_name).collect(); @@ -157,56 +112,64 @@ pub fn validate_insert(table_name: &TableName, insertion_values: &InsertionValue let columns_in_schema: HashSet<&ColumnName> = HashSet::from_iter(schema.get_columns()); let non_existant_columns = Vec::from_iter(columns_in_query.difference(&columns_in_schema)); if non_existant_columns.len() > 0 { - return Err(ValidationError::ColumnsDoNotExist(non_existant_columns.iter().map(|str| str.to_string()).collect())); + return Err(ValidationError::ColumnsDoNotExist(non_existant_columns.iter().map(|column_name| column_name.to_string()).collect())); } let missing_required_columns = Vec::from_iter(columns_in_schema.difference(&columns_in_query)); if missing_required_columns.len() > 0 { return Err(ValidationError::RequiredColumnsAreMissing(missing_required_columns.iter().map(|str| str.to_string()).collect())); } - // Check types + // Check types and prepare for creation of InsertionValues for the interpreter + let mut values_map: HashMap<_, Value> = HashMap::new(); for (column_name, value) in insertion_values { - let expected_type = schema.get_type_at(column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; // By the previous validation steps this is never gonna trigger an error. + let (column, expected_type) = schema.get_column0(&column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; // By the previous validation steps this is never gonna trigger an error. let value_type = value.to_type(); if value_type != expected_type { return Err(ValidationError::TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type }); } + values_map.insert(column, value); } - Ok(()) + // These are values ordered by the column position + let values: InsertionValuesForInterpreter = values_map.into_values().collect(); + + Ok(OperationForInterpreter::Insert(table_position, values)) } -pub fn validate_delete(table_name: &TableName, condition: &Option, db_schema: &DbSchema) -> Result<(), ValidationError> { - let schema = validate_table_exists(db_schema, table_name)?; - validate_condition(condition, schema)?; - Ok(()) +pub fn validate_delete(table_name: TableName, condition: Option, db_schema: &DbSchema) -> Result { + let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; + let validated_condition = validate_condition(condition, schema)?; + Ok(OperationForInterpreter::Delete(table_position, validated_condition)) } -fn validate_condition(condition: &Option, schema: &TableSchema) -> Result<(), ValidationError> { +fn validate_condition(condition: Option, schema: &TableSchema) -> Result, ValidationError> { match condition { Some(condition) => { match condition { Condition::Eq(column_name, value) => { - let expected_type: DbType = schema.get_type_at(column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; + let (column, expected_type) = schema.get_column0(&column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; let value_type: DbType = value.to_type(); - if !expected_type.eq(&value_type) { + if expected_type.eq(&value_type) { + Ok(Some(ConditionForInterpreter::Eq(column, value))) + } else { return Err(ValidationError::TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type }); } } } } - None => {} + None => Ok(None) } - Ok(()) } -fn validate_create_index(table_name: &TableName, column_name: &ColumnName, db_schema: &DbSchema) -> Result<(), ValidationError> { - let schema = validate_table_exists(db_schema, table_name)?; - if schema.does_column_exist(column_name) { - Ok(()) - } else { - Err(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()])) - } +fn validate_create_index(table_name: TableName, column_name: ColumnName, db_schema: &DbSchema) -> Result { + // TODO: You should disallow indexing of Number columns. + let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; + schema + .get_column_position(&column_name) + .map_or_else( + || Err(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()])), + |column| Ok(OperationForInterpreter::CreateIndex(table_position, column)) + ) } // ===Helpers=== @@ -225,6 +188,6 @@ where A: Eq + std::hash::Hash } fn get_table_schema<'a>(db_schema: &DbSchema<'a>, table_name: &'a TableName) -> Option<&'a TableSchema> { - let (_, table_schema) = db_schema.iter().find(|(tname, _)| table_name.eq(tname))?; + let (_, _, table_schema) = db_schema.iter().find(|(tname, _, _)| table_name.eq(tname))?; Some(table_schema) } From 9771a89716193ae377202952105118579a938ae3 Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:47:33 +0100 Subject: [PATCH 3/5] Use RawQuerySyntax for parsing --- minisql/src/interpreter.rs | 16 +++++++++------- parser/src/core.rs | 13 +++++-------- parser/src/parsing/common.rs | 7 +++++-- parser/src/parsing/create.rs | 13 +++++++------ parser/src/parsing/delete.rs | 10 +++++----- parser/src/parsing/index.rs | 24 ++++++++++++------------ parser/src/parsing/insert.rs | 18 ++++++++++-------- parser/src/parsing/select.rs | 16 ++++++++-------- parser/src/validation.rs | 4 +--- server/src/main.rs | 6 +++--- 10 files changed, 65 insertions(+), 62 deletions(-) diff --git a/minisql/src/interpreter.rs b/minisql/src/interpreter.rs index 7907ec9..70393cc 100644 --- a/minisql/src/interpreter.rs +++ b/minisql/src/interpreter.rs @@ -2,7 +2,7 @@ use crate::error::Error; use crate::internals::row::{ColumnPosition, Row}; use crate::schema::{TableName, TableSchema}; use crate::internals::table::Table; -use crate::operation::{ColumnSelection, Condition, Operation, OperationForInterpreter, ConditionForInterpreter, ColumnSelectionForInterpreter}; +use crate::operation::{ColumnSelection, Condition, Operation, OperationForInterpreter, ConditionForInterpreter}; use crate::result::DbResult; use crate::type_system::{DbType, IndexableValue, Value}; use bimap::BiMap; @@ -27,6 +27,8 @@ pub enum Response<'a> { 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::*; @@ -56,13 +58,13 @@ 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 } // TODO: Get rid of this diff --git a/parser/src/core.rs b/parser/src/core.rs index 258c928..f173f38 100644 --- a/parser/src/core.rs +++ b/parser/src/core.rs @@ -1,4 +1,4 @@ -use minisql::{operation::Operation, schema::TableSchema}; +use minisql::{operation::OperationForInterpreter, interpreter::DbSchema}; use crate::syntax::RawQuerySyntax; use nom::{branch::alt, multi::many0, IResult}; use thiserror::Error; @@ -13,7 +13,7 @@ pub enum Error { ValidationError(#[from] ValidationError) } -pub fn parse_statement<'a>(input: &'a str) -> IResult<&str, Operation> { +pub fn parse_statement<'a>(input: &'a str) -> IResult<&str, RawQuerySyntax> { alt(( parse_insert, parse_create, @@ -25,20 +25,17 @@ pub fn parse_statement<'a>(input: &'a str) -> IResult<&str, Operation> { ))(input) } -pub fn parse_statements<'a>(input: &'a str) -> IResult<&str, Vec> { +pub fn parse_statements<'a>(input: &'a str) -> IResult<&str, Vec> { many0(parse_statement)(input) } -pub fn parse_and_validate(query: String, db_metadata: &Vec<(String, &TableSchema)>) -> Result { +pub fn parse_and_validate(query: String, db_schema: &DbSchema) -> Result { let (_, op) = parse_statement(query.as_str()) .map_err(|err| { Error::ParsingError(err.to_string()) })?; - // TODO - // validate_operation(&op, db_metadata)?; - todo!(); - Ok(op) + Ok(validate_operation(op, db_schema)?) } // #[test] diff --git a/parser/src/parsing/common.rs b/parser/src/parsing/common.rs index f71d587..6787105 100644 --- a/parser/src/parsing/common.rs +++ b/parser/src/parsing/common.rs @@ -6,8 +6,9 @@ use nom::{ bytes::complete::tag, IResult, branch::alt, }; -use minisql::{operation::Condition, type_system::DbType}; +use minisql::type_system::DbType; +use crate::syntax::Condition; use super::literal::parse_db_value; pub fn parse_table_name(input: &str) -> IResult<&str, &str> { @@ -67,7 +68,9 @@ fn parse_equality(input: &str) -> IResult<&str, Condition> { #[cfg(test)] mod tests { - use minisql::{operation::Condition, type_system::DbType}; + use minisql::type_system::DbType; + + use crate::syntax::Condition; use crate::parsing::common::{parse_db_type, parse_equality}; #[test] diff --git a/parser/src/parsing/create.rs b/parser/src/parsing/create.rs index 94e3538..e950f98 100644 --- a/parser/src/parsing/create.rs +++ b/parser/src/parsing/create.rs @@ -1,4 +1,4 @@ -use minisql::{operation::Operation, schema::{ColumnName, TableSchema}, type_system::DbType}; +use minisql::{schema::{ColumnName, TableSchema}, type_system::DbType}; use nom::{ bytes::complete::tag, character::complete::{char, multispace0, multispace1}, @@ -8,8 +8,9 @@ use nom::{ }; use super::common::{parse_table_name, parse_identifier, parse_db_type}; +use crate::syntax::RawQuerySyntax; -pub fn parse_create(input: &str) -> IResult<&str, Operation> { +pub fn parse_create(input: &str) -> IResult<&str, RawQuerySyntax> { let (input, _) = tag("CREATE")(input)?; let (input, _) = multispace1(input)?; let (input, _) = tag("TABLE")(input)?; @@ -41,7 +42,7 @@ pub fn parse_create(input: &str) -> IResult<&str, Operation> { ); Ok(( input, - Operation::CreateTable(table_name.to_string(), schema), + RawQuerySyntax::CreateTable(table_name.to_string(), schema), )) } @@ -68,8 +69,8 @@ pub fn parse_column_definition(input: &str) -> IResult<&str, (ColumnName, DbType #[cfg(test)] mod tests { - use minisql::operation::Operation; use crate::parsing::create::parse_create; + use crate::syntax::RawQuerySyntax; #[test] fn test_parse_create_no_spaces() { @@ -94,9 +95,9 @@ mod tests { #[test] fn test_parse_create() { let (_, create) = parse_create("CREATE TABLE \"Table1\"( id UUID , column1 INT );").expect("should parse"); - assert!(matches!(create, Operation::CreateTable(_ ,_))); + assert!(matches!(create, RawQuerySyntax::CreateTable(_ ,_))); match create { - Operation::CreateTable(name, schema) => { + RawQuerySyntax::CreateTable(name, schema) => { assert_eq!(name, "Table1"); assert_eq!(schema.number_of_columns(), 2); assert_eq!(schema.column_position_from_column_name(&"id".to_string()).unwrap(), 0); diff --git a/parser/src/parsing/delete.rs b/parser/src/parsing/delete.rs index af71cec..4dc07d2 100644 --- a/parser/src/parsing/delete.rs +++ b/parser/src/parsing/delete.rs @@ -1,13 +1,13 @@ -use minisql::operation::Operation; use nom::{ bytes::complete::tag, character::complete::{char, multispace0, multispace1}, IResult, }; +use crate::syntax::RawQuerySyntax; use super::common::{parse_table_name, parse_condition}; -pub fn parse_delete(input: &str) -> IResult<&str, Operation> { +pub fn parse_delete(input: &str) -> IResult<&str, RawQuerySyntax> { let (input, _) = tag("DELETE")(input)?; let (input, _) = multispace1(input)?; let (input, _) = tag("FROM")(input)?; @@ -19,19 +19,19 @@ pub fn parse_delete(input: &str) -> IResult<&str, Operation> { let (input, _) = char(';')(input)?; Ok(( input, - Operation::Delete(table_name.to_string(), condition), + RawQuerySyntax::Delete(table_name.to_string(), condition), )) } #[cfg(test)] mod tests { - use minisql::operation::Operation; + use crate::syntax::RawQuerySyntax; use crate::parsing::delete::parse_delete; #[test] fn test_parse_delete() { let (_, operation) = parse_delete("DELETE FROM \"T1\" WHERE id = 1 ;").expect("should parse"); - assert!(matches!(operation, Operation::Delete(_, _))) + assert!(matches!(operation, RawQuerySyntax::Delete(_, _))) } // TODO: add test with condition diff --git a/parser/src/parsing/index.rs b/parser/src/parsing/index.rs index 3130a6b..68233ba 100644 --- a/parser/src/parsing/index.rs +++ b/parser/src/parsing/index.rs @@ -1,4 +1,4 @@ -use minisql::operation::Operation; +use crate::syntax::RawQuerySyntax; use nom::{ bytes::complete::tag, character::complete::{char, multispace0, multispace1}, @@ -7,7 +7,7 @@ use nom::{ use super::common::{parse_identifier, parse_table_name}; -pub fn parse_create_index(input: &str) -> IResult<&str, Operation> { +pub fn parse_create_index(input: &str) -> IResult<&str, RawQuerySyntax> { let (input, _) = tag("CREATE")(input)?; let unique = |input| -> IResult<&str, bool> { let (input, _) = multispace1(input)?; @@ -31,23 +31,23 @@ pub fn parse_create_index(input: &str) -> IResult<&str, Operation> { let (input, _) = char(')')(input)?; let (input, _) = multispace0(input)?; let (input, _) = char(';')(input)?; - let operation = Operation::CreateIndex(table_name.to_string(), column_name.to_string()); + let operation = RawQuerySyntax::CreateIndex(table_name.to_string(), column_name.to_string()); Ok((input, operation)) } #[cfg(test)] mod tests { - use minisql::operation::Operation; + use crate::syntax::RawQuerySyntax; use crate::parsing::index::parse_create_index; #[test] fn test_create_index() { - let (_, operation) = parse_create_index("CREATE UNIQUE INDEX idxcontactsemail ON \"contacts\" (email);").expect("should parse"); - assert!(matches!(operation, Operation::CreateIndex(_, _))); - match operation { - Operation::CreateIndex(table_name, column_name) => { + let (_, syntax) = parse_create_index("CREATE UNIQUE INDEX idxcontactsemail ON \"contacts\" (email);").expect("should parse"); + assert!(matches!(syntax, RawQuerySyntax::CreateIndex(_, _))); + match syntax { + RawQuerySyntax::CreateIndex(table_name, column_name) => { assert_eq!(table_name, "contacts"); assert_eq!(column_name, "email"); } @@ -57,10 +57,10 @@ mod tests { #[test] fn test_create_index_with_spaces() { - let (_, operation) = parse_create_index("CREATE UNIQUE INDEX idxcontactsemail ON \"contacts\" ( email ) ;").expect("should parse"); - assert!(matches!(operation, Operation::CreateIndex(_, _))); - match operation { - Operation::CreateIndex(table_name, column_name) => { + let (_, syntax) = parse_create_index("CREATE UNIQUE INDEX idxcontactsemail ON \"contacts\" ( email ) ;").expect("should parse"); + assert!(matches!(syntax, RawQuerySyntax::CreateIndex(_, _))); + match syntax { + RawQuerySyntax::CreateIndex(table_name, column_name) => { assert_eq!(table_name, "contacts"); assert_eq!(column_name, "email"); } diff --git a/parser/src/parsing/insert.rs b/parser/src/parsing/insert.rs index 365be68..5f1f64a 100644 --- a/parser/src/parsing/insert.rs +++ b/parser/src/parsing/insert.rs @@ -1,5 +1,6 @@ use super::{literal::parse_db_value, common::{parse_table_name, parse_identifier}}; -use minisql::{operation::Operation, type_system::Value}; +use crate::syntax::RawQuerySyntax; +use minisql::type_system::Value; use nom::{ bytes::complete::tag, character::complete::{multispace0, multispace1, char}, @@ -9,7 +10,7 @@ use nom::{ IResult, }; -pub fn parse_insert(input: &str) -> IResult<&str, Operation> { +pub fn parse_insert(input: &str) -> IResult<&str, RawQuerySyntax> { let (input, _) = tag("INSERT")(input)?; let (input, _) = multispace1(input)?; let (input, _) = tag("INTO")(input)?; @@ -33,7 +34,7 @@ pub fn parse_insert(input: &str) -> IResult<&str, Operation> { let (input, _) = char(';')(input)?; Ok(( input, - Operation::Insert(table_name.to_string(), column_names.into_iter().zip(values).collect()), + RawQuerySyntax::Insert(table_name.to_string(), column_names.into_iter().zip(values).collect()), )) } @@ -48,17 +49,18 @@ pub fn parse_values(input: &str) -> IResult<&str, Vec> { #[cfg(test)] mod tests { - use minisql::{operation::Operation, type_system::{IndexableValue, Value}}; + use minisql::type_system::{IndexableValue, Value}; + use crate::syntax::RawQuerySyntax; use super::parse_insert; #[test] fn test_parse_insert() { let sql = "INSERT INTO \"MyTable\" (id, data) VALUES(1, \"Text\");"; - let operation = parse_insert(sql).expect("should parse"); - match operation { - ("", Operation::Insert(table_name, insertion_values)) => { + let syntax = parse_insert(sql).expect("should parse"); + match syntax { + ("", RawQuerySyntax::Insert(table_name, insertion_values)) => { assert_eq!(table_name, "MyTable"); assert_eq!( insertion_values, @@ -78,7 +80,7 @@ mod tests { let sql = "INSERT INTO \"MyTable\" ( id, data ) VALUES ( 1, \"Text\" ) ;"; let operation = parse_insert(sql).expect("should parse"); match operation { - ("", Operation::Insert(table_name, insertion_values)) => { + ("", RawQuerySyntax::Insert(table_name, insertion_values)) => { assert_eq!(table_name, "MyTable"); assert_eq!(insertion_values, vec![ diff --git a/parser/src/parsing/select.rs b/parser/src/parsing/select.rs index c3c4292..e7a09a8 100644 --- a/parser/src/parsing/select.rs +++ b/parser/src/parsing/select.rs @@ -1,5 +1,5 @@ use super::common::{parse_table_name, parse_column_name, parse_condition}; -use minisql::operation::{ColumnSelection, Operation}; +use crate::syntax::{ColumnSelection, RawQuerySyntax}; use nom::{ branch::alt, bytes::complete::tag, @@ -11,7 +11,7 @@ use nom::{ IResult, }; -pub fn parse_select(input: &str) -> IResult<&str, Operation> { +pub fn parse_select(input: &str) -> IResult<&str, RawQuerySyntax> { let (input, _) = tag("SELECT")(input)?; let (input, _) = multispace1(input)?; @@ -27,7 +27,7 @@ pub fn parse_select(input: &str) -> IResult<&str, Operation> { let (input, _) = tag(";")(input)?; Ok(( input, - Operation::Select(table_name.to_string(), column_selection, condition), + RawQuerySyntax::Select(table_name.to_string(), column_selection, condition), )) } @@ -44,7 +44,7 @@ pub fn try_parse_column_selection(input: &str) -> IResult<&str, ColumnSelection> #[cfg(test)] mod tests { - use minisql::operation::{ColumnSelection, Operation}; + use crate::syntax::{ColumnSelection, RawQuerySyntax}; use crate::parsing::{common::{parse_column_name, parse_table_name}, select::parse_select}; @@ -53,7 +53,7 @@ mod tests { let sql = "SELECT * FROM \"MyTable\";"; let operation = parse_select(sql).expect("should parse"); match operation { - ("", Operation::Select(table_name, column_selection, maybe_condition)) => { + ("", RawQuerySyntax::Select(table_name, column_selection, maybe_condition)) => { assert_eq!(table_name, "MyTable"); assert!(matches!(column_selection, ColumnSelection::All)); assert!(matches!(maybe_condition, None)); @@ -80,7 +80,7 @@ mod tests { let sql = "SELECT name , email FROM \"AddressBook\" ;"; let operation = parse_select(sql).expect("should parse"); match operation { - ("", Operation::Select(table_name, column_selection, maybe_condition)) => { + ("", RawQuerySyntax::Select(table_name, column_selection, maybe_condition)) => { assert_eq!(table_name, "AddressBook"); assert!(matches!(column_selection, ColumnSelection::Columns(_))); match column_selection { @@ -102,11 +102,11 @@ mod tests { #[test] fn test_parse_select_where() { - use minisql::operation::Condition; + use crate::syntax::Condition; let sql = "SELECT * FROM \"AddressBook\" WHERE id = 5 ;"; let operation = parse_select(sql).expect("should parse"); match operation { - ("", Operation::Select(table_name, column_selection, maybe_condition)) => { + ("", RawQuerySyntax::Select(table_name, column_selection, maybe_condition)) => { assert_eq!(table_name, "AddressBook"); assert!(matches!(column_selection, ColumnSelection::All)); assert!(matches!(maybe_condition, Some(Condition::Eq(_, _)))); diff --git a/parser/src/validation.rs b/parser/src/validation.rs index 017491b..9e6a79f 100644 --- a/parser/src/validation.rs +++ b/parser/src/validation.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use thiserror::Error; use crate::syntax::{ColumnSelection, Condition, InsertionValues, RawQuerySyntax}; -use minisql::{operation::{ColumnSelectionForInterpreter, ConditionForInterpreter, InsertionValuesForInterpreter, OperationForInterpreter}, type_system::Value, schema::{TableSchema, ColumnName, TableName}, type_system::DbType, interpreter::TablePosition}; +use minisql::{operation::{ColumnSelectionForInterpreter, ConditionForInterpreter, InsertionValuesForInterpreter, OperationForInterpreter}, type_system::Value, schema::{TableSchema, ColumnName, TableName}, type_system::DbType, interpreter::{TablePosition, DbSchema}}; #[derive(Debug, Error)] pub enum ValidationError { @@ -25,8 +25,6 @@ pub enum ValidationError { RequiredColumnsAreMissing(Vec) } -pub type DbSchema<'a> = Vec<(TableName, TablePosition, &'a TableSchema)>; - /// Validates and converts the raw syntax into a proper interpreter operation based on db schema. pub fn validate_operation(query: RawQuerySyntax, db_schema: &DbSchema) -> Result { match query { diff --git a/server/src/main.rs b/server/src/main.rs index d256374..fcbb6bf 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -53,10 +53,10 @@ async fn handle_stream(mut stream: TcpStream) -> anyhow::Result<()> { } FrontendMessage::Query(data) => { println!("Received Query: {:?}", data); - let metadata = state.metadata(); - match parse_and_validate(data.query.as_str().to_string(), &metadata) { + let db_schema = state.db_schema(); + match parse_and_validate(data.query.as_str().to_string(), &db_schema) { Ok(operation) => { - match state.interpret(operation) { + match state.interpret_for_interpreter(operation) { Ok(_) => { send_query_response(&mut writer).await?; } From 11dc992476f56e9b2f1052128d8164253d5f114d Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sat, 27 Jan 2024 22:46:19 +0100 Subject: [PATCH 4/5] Cleanup --- minisql/src/error.rs | 6 - minisql/src/internals/row.rs | 4 +- minisql/src/internals/table.rs | 5 +- minisql/src/interpreter.rs | 296 +++++++++++---------------------- minisql/src/operation.rs | 53 +----- minisql/src/schema.rs | 124 +------------- parser/src/core.rs | 4 +- parser/src/parsing/create.rs | 4 +- parser/src/validation.rs | 62 +++---- server/src/main.rs | 2 +- 10 files changed, 157 insertions(+), 403 deletions(-) diff --git a/minisql/src/error.rs b/minisql/src/error.rs index 6000c0e..6660f9d 100644 --- a/minisql/src/error.rs +++ b/minisql/src/error.rs @@ -1,17 +1,11 @@ use crate::internals::row::ColumnPosition; use crate::schema::{ColumnName, TableName}; -use crate::operation::InsertionValues; use crate::type_system::{DbType, Uuid, Value}; #[derive(Debug)] pub enum Error { - TableDoesNotExist(TableName), - ColumnDoesNotExist(TableName, ColumnName), ColumnPositionDoesNotExist(TableName, ColumnPosition), ValueDoesNotMatchExpectedType(TableName, ColumnName, DbType, Value), AttemptingToInsertAlreadyPresentId(TableName, Uuid), - MissingTypeAnnotationOfColumn(TableName, ColumnPosition), - MissingColumnInInsertValues(TableName, ColumnName, InsertionValues), - MismatchBetweenInsertValuesAndColumns(TableName, InsertionValues), AttemptToIndexNonIndexableColumn(TableName, ColumnName), } diff --git a/minisql/src/internals/row.rs b/minisql/src/internals/row.rs index c0c81c0..508ca40 100644 --- a/minisql/src/internals/row.rs +++ b/minisql/src/internals/row.rs @@ -1,5 +1,5 @@ use crate::type_system::Value; -use crate::operation::InsertionValuesForInterpreter; +use crate::operation::InsertionValues; use std::ops::{Index, IndexMut}; use std::slice::SliceIndex; @@ -43,7 +43,7 @@ impl Row { Row(vec![]) } - pub fn new_from_insertion_values(insertion_values: InsertionValuesForInterpreter) -> Self { + pub fn new_from_insertion_values(insertion_values: InsertionValues) -> Self { Row(insertion_values) } diff --git a/minisql/src/internals/table.rs b/minisql/src/internals/table.rs index 2b5a5bc..ac6ca5a 100644 --- a/minisql/src/internals/table.rs +++ b/minisql/src/internals/table.rs @@ -206,6 +206,7 @@ impl Table { match value { IndexableValue::Uuid(id) => Ok(Some(HashSet::from([*id]))), _ => { + // TODO: This validation step is not really necessary. let column_name: ColumnName = self .schema .column_name_from_column_position(column_position)?; @@ -222,8 +223,8 @@ impl Table { match self.indexes.get(&column_position) { Some(index) => { // Note that we are cloning the ids here! This can be very wasteful in some cases. - // It would be possible to just return a reference, - // but this seems fairly non-trivial. + // Theoretically it would be possible to return a reference, + // but after attempting to do this it seems very non-trivial. let ids = index.get(value).cloned(); Ok(ids) } diff --git a/minisql/src/interpreter.rs b/minisql/src/interpreter.rs index 70393cc..b96dc40 100644 --- a/minisql/src/interpreter.rs +++ b/minisql/src/interpreter.rs @@ -1,10 +1,8 @@ -use crate::error::Error; -use crate::internals::row::{ColumnPosition, Row}; +use crate::internals::row::Row; use crate::schema::{TableName, TableSchema}; use crate::internals::table::Table; -use crate::operation::{ColumnSelection, Condition, Operation, OperationForInterpreter, ConditionForInterpreter}; +use crate::operation::{Operation, Condition}; use crate::result::DbResult; -use crate::type_system::{DbType, IndexableValue, Value}; use bimap::BiMap; // Use `TablePosition` as index @@ -57,7 +55,6 @@ impl State { } } - /// TODO: return a reference to avoid allocations 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 { @@ -67,34 +64,10 @@ impl State { schema } - // TODO: Get rid of this - 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] } @@ -106,9 +79,9 @@ impl State { self.tables.push(table); } - pub fn interpret_for_interpreter<'a>(&'a mut self, operation: OperationForInterpreter) -> DbResult> { + pub fn interpret<'a>(&'a mut self, operation: Operation) -> DbResult> { // TODO: lock stuff - use OperationForInterpreter::*; + use Operation::*; match operation { Select(table_position, column_selection, maybe_condition) => { @@ -120,7 +93,7 @@ impl State { Box::new(x) as Box + 'a + Send> }, - Some(ConditionForInterpreter::Eq(eq_column, value)) => { + Some(Condition::Eq(eq_column, value)) => { let x = table.select_rows_where_eq( column_selection, @@ -136,7 +109,7 @@ impl State { Insert(table_position, values) => { let table: &mut Table = self.table_at_mut(table_position); - let (id, row) = table.schema().row_from_insertion_values_for_interpreter(values)?; + let (id, row) = table.schema().row_from_insertion_values(values)?; table.insert_row_at(id, row)?; Ok(Response::Inserted) } @@ -145,7 +118,7 @@ impl State { let rows_affected = match maybe_condition { None => table.delete_all_rows(), - Some(ConditionForInterpreter::Eq(eq_column, value)) => { + Some(Condition::Eq(eq_column, value)) => { table.delete_rows_where_eq(eq_column, value)? } }; @@ -165,85 +138,15 @@ impl State { } } } - - pub fn interpret<'a>(&'a mut self, operation: Operation) -> DbResult> { - // TODO: lock stuff - use Operation::*; - - match operation { - Select(table_name, column_selection, maybe_condition) => { - let table: &Table = self.table_from_name(&table_name)?; - - let selected_column_positions: Vec = 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 + 'a + Send> - }, - - Some(Condition::Eq(eq_column_name, value)) => { - let eq_column_position = table - .schema() - .column_position_from_column_name(&eq_column_name)?; - let x = - table.select_rows_where_eq( - selected_column_positions, - eq_column_position, - value, - )?; - Box::new(x) as Box + 'a + Send> - } - }; - - Ok(Response::Selected(selected_rows)) - } - Insert(table_name, values) => { - let table: &mut Table = self.table_from_name_mut(&table_name)?; - - 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)?; - - 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)? - } - }; - - Ok(Response::Deleted(rows_affected)) - } - CreateTable(table_name, table_schema) => { - let table = Table::new(table_schema); - self.attach_table(table_name, table); - - 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)?; - Ok(Response::IndexCreated) - } - } - } } #[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; @@ -284,12 +187,13 @@ 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 { @@ -299,18 +203,6 @@ mod tests { assert!(rows.len() == 0); } - #[test] - fn test_select_nonexistant_table() { - let mut state = State::new(); - - let response: DbResult = 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::*; @@ -318,10 +210,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) = ( @@ -331,17 +224,17 @@ 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(_))); @@ -351,7 +244,7 @@ mod tests { 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); @@ -360,7 +253,6 @@ mod tests { #[test] fn test_insert_select_basic2() { - use ColumnSelection::*; use Condition::*; use IndexableValue::*; use Operation::*; @@ -368,10 +260,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) = ( @@ -381,11 +276,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(); @@ -397,17 +292,17 @@ 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 { @@ -432,9 +327,9 @@ mod tests { { 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(_))); @@ -454,9 +349,9 @@ mod tests { { 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(_))); @@ -475,7 +370,6 @@ mod tests { #[test] fn test_delete() { - use ColumnSelection::*; use Condition::*; use IndexableValue::*; use Operation::*; @@ -483,10 +377,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) = ( @@ -496,11 +392,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(); @@ -512,11 +408,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(); @@ -524,14 +420,14 @@ 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 { @@ -555,14 +451,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) = ( @@ -572,11 +470,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(); @@ -588,11 +486,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(); @@ -617,33 +515,35 @@ mod tests { } pub fn example() { - use ColumnSelection::*; + use crate::type_system::{IndexableValue, Value, DbType}; + use crate::internals::row::ColumnPosition; 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) = ( @@ -654,11 +554,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(); @@ -671,11 +571,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(); @@ -683,7 +583,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); @@ -692,9 +592,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=="); @@ -708,16 +608,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(); diff --git a/minisql/src/operation.rs b/minisql/src/operation.rs index 332aff0..6bbf918 100644 --- a/minisql/src/operation.rs +++ b/minisql/src/operation.rs @@ -1,58 +1,21 @@ -use crate::schema::{ColumnName, TableName, TableSchema}; +use crate::schema::{TableName, TableSchema}; use crate::type_system::Value; use crate::internals::row::ColumnPosition; use crate::interpreter::TablePosition; -// ==============SQL operations================ -// TODO: Note that every operation has a table name. -// Perhaps consider factoring the table name out -// and think of the operations as operating on a unique table. -// TODO: `TableName` should be replaced by `TablePosition` +// Validated operation. Constructed by validation crate. pub enum Operation { - Select(TableName, ColumnSelection, Option), - Insert(TableName, InsertionValues), - Delete(TableName, Option), - // Update(...), - CreateTable(TableName, TableSchema), - CreateIndex(TableName, ColumnName), - // DropTable(TableName), -} - -pub type InsertionValues = Vec<(ColumnName, Value)>; - -pub enum ColumnSelection { - All, - Columns(Vec), -} - -pub enum Condition { - // And(Box, Box), - // Or(Box, Box), - // Not(Box), - Eq(ColumnName, Value), - // LessOrEqual(ColumnName, DbValue), - // Less(ColumnName, DbValue), - - // StringCondition(StringCondition), -} - -// enum StringCondition { -// Prefix(ColumnName, String), -// Substring(ColumnName, String), -// } - -pub enum OperationForInterpreter { - Select(TablePosition, ColumnSelectionForInterpreter, Option), - Insert(TablePosition, InsertionValuesForInterpreter), - Delete(TablePosition, Option), + Select(TablePosition, ColumnSelection, Option), + Insert(TablePosition, InsertionValues), + Delete(TablePosition, Option), CreateTable(TableName, TableSchema), CreateIndex(TablePosition, ColumnPosition), } -pub type InsertionValuesForInterpreter = Vec; +pub type InsertionValues = Vec; -pub type ColumnSelectionForInterpreter = Vec; +pub type ColumnSelection = Vec; -pub enum ConditionForInterpreter { +pub enum Condition { Eq(ColumnPosition, Value), } diff --git a/minisql/src/schema.rs b/minisql/src/schema.rs index 0d44b76..97cd87b 100644 --- a/minisql/src/schema.rs +++ b/minisql/src/schema.rs @@ -1,14 +1,13 @@ use crate::error::Error; use crate::internals::row::{ColumnPosition, Row}; -use crate::operation::{ColumnSelection, InsertionValues, InsertionValuesForInterpreter, ColumnSelectionForInterpreter}; +use crate::operation::{InsertionValues, ColumnSelection}; use crate::result::DbResult; use crate::type_system::{DbType, IndexableValue, Uuid, Value}; use bimap::BiMap; -use std::collections::HashMap; // Note that it is nice to split metadata from the data because // then you can give the metadata to the parser without giving it the data. -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct TableSchema { table_name: TableName, // used for descriptive errors primary_key: ColumnPosition, @@ -48,12 +47,13 @@ impl TableSchema { self.column_name_position_mapping.get_by_left(column_name).copied() } - pub fn all_selection(&self) -> ColumnSelectionForInterpreter { - self.column_name_position_mapping.iter().map(|(_, column)| *column).collect() + pub fn all_selection(&self) -> ColumnSelection { + let mut selection: ColumnSelection = self.column_name_position_mapping.iter().map(|(_, column)| *column).collect(); + selection.sort(); + selection } - // TODO: Rename to get_column - pub fn get_column0(&self, column_name: &ColumnName) -> Option<(ColumnPosition, DbType)> { + pub fn get_column(&self, column_name: &ColumnName) -> Option<(ColumnPosition, DbType)> { let column = self.get_column_position(column_name)?; Some((column, self.column_type(column))) } @@ -63,48 +63,10 @@ impl TableSchema { self.types.get(position).copied() } - // TODO: Get rid of this after validation is merged - fn get_column(&self, column_name: &ColumnName) -> DbResult<(DbType, ColumnPosition)> { - match self.column_name_position_mapping.get_by_left(column_name) { - Some(column_position) => match self.types.get(*column_position) { - Some(type_) => Ok((*type_, *column_position)), - None => Err(Error::MissingTypeAnnotationOfColumn( - self.table_name.clone(), - *column_position, - )), - }, - None => Err(Error::ColumnDoesNotExist( - self.table_name.clone(), - column_name.clone(), - )), - } - } - - // TODO: Get rid of this after validation is merged - pub fn column_position_from_column_name( - &self, - column_name: &ColumnName, - ) -> DbResult { - self.get_column(column_name) - .map(|(_, column_position)| column_position) - } - pub fn is_primary(&self, column_position: ColumnPosition) -> bool { self.primary_key == column_position } - fn column_positions_from_column_names( - &self, - column_names: &[ColumnName], - ) -> DbResult> { - let mut positions: Vec = Vec::with_capacity(column_names.len()); - for column_name in column_names { - let column_position = self.column_position_from_column_name(column_name)?; - positions.push(column_position) - } - Ok(positions) - } - pub fn column_name_from_column_position( &self, column_position: ColumnPosition, @@ -121,34 +83,13 @@ impl TableSchema { } } - pub fn column_positions_from_column_selection( - &self, - column_selection: &ColumnSelection, - ) -> DbResult> { - match column_selection { - ColumnSelection::All => { - let mut column_positions: Vec = self - .column_name_position_mapping - .iter() - .map(|(_, column_position)| *column_position) - .collect(); - column_positions.sort(); - Ok(column_positions) - } - - ColumnSelection::Columns(column_names) => { - self.column_positions_from_column_names(column_names) - } - } - } - pub fn number_of_columns(&self) -> usize { self.column_name_position_mapping.len() } - pub fn row_from_insertion_values_for_interpreter( + pub fn row_from_insertion_values( &self, - insertion_values: InsertionValuesForInterpreter, + insertion_values: InsertionValues, ) -> DbResult<(Uuid, Row)> { let row: Row = Row::new_from_insertion_values(insertion_values); @@ -160,51 +101,4 @@ impl TableSchema { Ok((id, row)) } - - pub fn row_from_insertion_values( - &self, - insertion_values: InsertionValues, - ) -> DbResult<(Uuid, Row)> { - // TODO: There should be proper validation of the insertion_values. - // And it shouldn't really be done here. - // - // In the below we don't check for duplicate column names - // - let number_of_columns = self.number_of_columns(); - if number_of_columns != insertion_values.len() { - return Err(Error::MismatchBetweenInsertValuesAndColumns( - self.table_name.clone(), - insertion_values, - )); - } - - let mut row: Row = Row::with_number_of_columns(number_of_columns); - - let mut values: HashMap = HashMap::new(); - for (column_name, db_value) in &insertion_values { - values.insert(column_name.clone(), db_value.clone()); - } - - for column_position in 0..number_of_columns { - let column_name: ColumnName = self.column_name_from_column_position(column_position)?; - match values.get(&column_name) { - Some(db_value) => row.push(db_value.clone()), - None => { - return Err(Error::MissingColumnInInsertValues( - self.table_name.clone(), - column_name, - insertion_values, - )) - } - } - } - - let id: Uuid = match row.get(self.primary_key) { - Some(Value::Indexable(IndexableValue::Uuid(id))) => *id, - Some(_) => unreachable!(), - None => unreachable!(), - }; - - Ok((id, row)) - } } diff --git a/parser/src/core.rs b/parser/src/core.rs index f173f38..2cd2432 100644 --- a/parser/src/core.rs +++ b/parser/src/core.rs @@ -1,4 +1,4 @@ -use minisql::{operation::OperationForInterpreter, interpreter::DbSchema}; +use minisql::{operation::Operation, interpreter::DbSchema}; use crate::syntax::RawQuerySyntax; use nom::{branch::alt, multi::many0, IResult}; use thiserror::Error; @@ -29,7 +29,7 @@ pub fn parse_statements<'a>(input: &'a str) -> IResult<&str, Vec many0(parse_statement)(input) } -pub fn parse_and_validate(query: String, db_schema: &DbSchema) -> Result { +pub fn parse_and_validate(query: String, db_schema: &DbSchema) -> Result { let (_, op) = parse_statement(query.as_str()) .map_err(|err| { Error::ParsingError(err.to_string()) diff --git a/parser/src/parsing/create.rs b/parser/src/parsing/create.rs index e950f98..c82df31 100644 --- a/parser/src/parsing/create.rs +++ b/parser/src/parsing/create.rs @@ -100,8 +100,8 @@ mod tests { RawQuerySyntax::CreateTable(name, schema) => { assert_eq!(name, "Table1"); assert_eq!(schema.number_of_columns(), 2); - assert_eq!(schema.column_position_from_column_name(&"id".to_string()).unwrap(), 0); - assert_eq!(schema.column_position_from_column_name(&"column1".to_string()).unwrap(), 1); + assert_eq!(schema.get_column_position(&"id".to_string()).unwrap(), 0); + assert_eq!(schema.get_column_position(&"column1".to_string()).unwrap(), 1); } _ => {} } diff --git a/parser/src/validation.rs b/parser/src/validation.rs index 9e6a79f..0f60f00 100644 --- a/parser/src/validation.rs +++ b/parser/src/validation.rs @@ -2,8 +2,10 @@ use std::collections::HashSet; use std::collections::HashMap; use thiserror::Error; -use crate::syntax::{ColumnSelection, Condition, InsertionValues, RawQuerySyntax}; -use minisql::{operation::{ColumnSelectionForInterpreter, ConditionForInterpreter, InsertionValuesForInterpreter, OperationForInterpreter}, type_system::Value, schema::{TableSchema, ColumnName, TableName}, type_system::DbType, interpreter::{TablePosition, DbSchema}}; +use crate::syntax; +use crate::syntax::RawQuerySyntax; +use minisql::operation; +use minisql::{operation::Operation, type_system::Value, schema::{TableSchema, ColumnName, TableName}, type_system::DbType, interpreter::{TablePosition, DbSchema}}; #[derive(Debug, Error)] pub enum ValidationError { @@ -26,7 +28,7 @@ pub enum ValidationError { } /// Validates and converts the raw syntax into a proper interpreter operation based on db schema. -pub fn validate_operation(query: RawQuerySyntax, db_schema: &DbSchema) -> Result { +pub fn validate_operation(query: RawQuerySyntax, db_schema: &DbSchema) -> Result { match query { RawQuerySyntax::Select(table_name, column_selection, condition) => { validate_select(table_name, column_selection, condition, db_schema) @@ -52,7 +54,7 @@ fn validate_table_exists<'a>(db_schema: &DbSchema<'a>, table_name: &'a TableName .map(|(_, table_position, table_schema)| (*table_position, *table_schema)) } -pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result { +pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result { if let Some(_) = get_table_schema(db_schema, &table_name) { return Err(ValidationError::TableAlreadyExists(table_name.to_string())); } @@ -64,13 +66,13 @@ pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_sche )?; // TODO: Ensure it has a primary key?? - Ok(OperationForInterpreter::CreateTable(table_name, table_schema)) + Ok(Operation::CreateTable(table_name, table_schema)) } -pub fn validate_select(table_name: TableName, column_selection: ColumnSelection, condition: Option, db_schema: &DbSchema) -> Result { +pub fn validate_select(table_name: TableName, column_selection: syntax::ColumnSelection, condition: Option, db_schema: &DbSchema) -> Result { let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; match column_selection { - ColumnSelection::Columns(columns) => { + syntax::ColumnSelection::Columns(columns) => { let non_existant_columns: Vec = columns.iter().filter_map(|column| if schema.does_column_exist(&column) { @@ -81,20 +83,20 @@ pub fn validate_select(table_name: TableName, column_selection: ColumnSelection, if non_existant_columns.len() > 0 { Err(ValidationError::ColumnsDoNotExist(non_existant_columns)) } else { - let selection: ColumnSelectionForInterpreter = + let selection: operation::ColumnSelection = columns.iter().filter_map(|column_name| schema.get_column_position(column_name)).collect(); let validated_condition = validate_condition(condition, schema)?; - Ok(OperationForInterpreter::Select(table_position, selection, validated_condition)) + Ok(Operation::Select(table_position, selection, validated_condition)) } } - ColumnSelection::All => { + syntax::ColumnSelection::All => { let validated_condition = validate_condition(condition, schema)?; - Ok(OperationForInterpreter::Select(table_position, schema.all_selection(), validated_condition)) + Ok(Operation::Select(table_position, schema.all_selection(), validated_condition)) } } } -pub fn validate_insert(table_name: TableName, insertion_values: InsertionValues, db_schema: &DbSchema) -> Result { +pub fn validate_insert(table_name: TableName, insertion_values: syntax::InsertionValues, db_schema: &DbSchema) -> Result { let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; // Check for duplicate columns in insertion_values. @@ -120,7 +122,7 @@ pub fn validate_insert(table_name: TableName, insertion_values: InsertionValues, // Check types and prepare for creation of InsertionValues for the interpreter let mut values_map: HashMap<_, Value> = HashMap::new(); for (column_name, value) in insertion_values { - let (column, expected_type) = schema.get_column0(&column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; // By the previous validation steps this is never gonna trigger an error. + let (column, expected_type) = schema.get_column(&column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; // By the previous validation steps this is never gonna trigger an error. let value_type = value.to_type(); if value_type != expected_type { return Err(ValidationError::TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type }); @@ -129,26 +131,26 @@ pub fn validate_insert(table_name: TableName, insertion_values: InsertionValues, } // These are values ordered by the column position - let values: InsertionValuesForInterpreter = values_map.into_values().collect(); + let values: operation::InsertionValues = values_map.into_values().collect(); - Ok(OperationForInterpreter::Insert(table_position, values)) + Ok(Operation::Insert(table_position, values)) } -pub fn validate_delete(table_name: TableName, condition: Option, db_schema: &DbSchema) -> Result { +pub fn validate_delete(table_name: TableName, condition: Option, db_schema: &DbSchema) -> Result { let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; let validated_condition = validate_condition(condition, schema)?; - Ok(OperationForInterpreter::Delete(table_position, validated_condition)) + Ok(Operation::Delete(table_position, validated_condition)) } -fn validate_condition(condition: Option, schema: &TableSchema) -> Result, ValidationError> { +fn validate_condition(condition: Option, schema: &TableSchema) -> Result, ValidationError> { match condition { Some(condition) => { match condition { - Condition::Eq(column_name, value) => { - let (column, expected_type) = schema.get_column0(&column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; + syntax::Condition::Eq(column_name, value) => { + let (column, expected_type) = schema.get_column(&column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; let value_type: DbType = value.to_type(); if expected_type.eq(&value_type) { - Ok(Some(ConditionForInterpreter::Eq(column, value))) + Ok(Some(operation::Condition::Eq(column, value))) } else { return Err(ValidationError::TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type }); } @@ -159,27 +161,27 @@ fn validate_condition(condition: Option, schema: &TableSchema) -> Res } } -fn validate_create_index(table_name: TableName, column_name: ColumnName, db_schema: &DbSchema) -> Result { +fn validate_create_index(table_name: TableName, column_name: ColumnName, db_schema: &DbSchema) -> Result { // TODO: You should disallow indexing of Number columns. let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; schema .get_column_position(&column_name) .map_or_else( || Err(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()])), - |column| Ok(OperationForInterpreter::CreateIndex(table_position, column)) + |column| Ok(Operation::CreateIndex(table_position, column)) ) } // ===Helpers=== -fn find_first_duplicate(xs: &[A]) -> Option<&A> -where A: Eq + std::hash::Hash +fn find_first_duplicate(ts: &[T]) -> Option<&T> +where T: Eq + std::hash::Hash { - let mut already_seen_elements: HashSet<&A> = HashSet::new(); - for x in xs { - if already_seen_elements.contains(x) { - return Some(x); + let mut already_seen_elements: HashSet<&T> = HashSet::new(); + for t in ts { + if already_seen_elements.contains(t) { + return Some(t); } else { - already_seen_elements.insert(&x); + already_seen_elements.insert(&t); } } None diff --git a/server/src/main.rs b/server/src/main.rs index fcbb6bf..add7b2b 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -56,7 +56,7 @@ async fn handle_stream(mut stream: TcpStream) -> anyhow::Result<()> { let db_schema = state.db_schema(); match parse_and_validate(data.query.as_str().to_string(), &db_schema) { Ok(operation) => { - match state.interpret_for_interpreter(operation) { + match state.interpret(operation) { Ok(_) => { send_query_response(&mut writer).await?; } From fdfdaa9fc02a6db5d91de6bbc4b1da3fc1a39e4d Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sat, 27 Jan 2024 23:42:03 +0100 Subject: [PATCH 5/5] Return table schema in SELECT response --- minisql/src/interpreter.rs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/minisql/src/interpreter.rs b/minisql/src/interpreter.rs index b96dc40..dd0e870 100644 --- a/minisql/src/interpreter.rs +++ b/minisql/src/interpreter.rs @@ -18,7 +18,7 @@ pub struct State { // #[derive(Debug)] pub enum Response<'a> { - Selected(Box + 'a + Send>), + Selected(&'a TableSchema, Box + 'a + Send>), Inserted, Deleted(usize), // how many were deleted TableCreated, @@ -31,7 +31,7 @@ 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"), @@ -104,7 +104,7 @@ impl State { } }; - Ok(Response::Selected(selected_rows)) + Ok(Response::Selected(table.schema(), selected_rows)) }, Insert(table_position, values) => { let table: &mut Table = self.table_at_mut(table_position); @@ -195,8 +195,8 @@ mod tests { let response: Response = state .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(); @@ -237,8 +237,8 @@ mod tests { .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(); @@ -304,8 +304,8 @@ mod tests { { 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(_schema, rows) = response else { panic!() }; let rows: Vec<_> = rows.collect(); @@ -332,8 +332,8 @@ mod tests { 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(_schema, rows) = response else { panic!() }; let rows: Vec<_> = rows.collect(); @@ -354,8 +354,8 @@ mod tests { 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(_schema, rows) = response else { panic!() }; let rows: Vec<_> = rows.collect(); @@ -429,8 +429,8 @@ mod tests { 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(_schema, rows) = response else { panic!() }; let rows: Vec<_> = rows.collect();