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

fix: small changes

Browse source
This commit is contained in:
Jindřich Moravec 2024-01-25 23:23:18 +01:00
parent 88fb13325a
commit 4fca7ce12b
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
minisql/src/interpreter.rs
View file

@ -166,7 +166,6 @@ impl State {
mod tests { mod tests {
use super::*; use super::*;
use std::collections::HashSet; use std::collections::HashSet;
use std::ops::Deref;
fn users_schema() -> TableSchema { fn users_schema() -> TableSchema {
let id: ColumnPosition = 0; let id: ColumnPosition = 0;
@ -215,7 +214,7 @@ mod tests {
.interpret(Operation::Select(users.clone(), ColumnSelection::All, None)) .interpret(Operation::Select(users.clone(), ColumnSelection::All, None))
.unwrap(); .unwrap();
assert!(matches!(response, Response::Selected(_, _))); assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(schema, rows) = response else { let Response::Selected(_schema, rows) = response else {
panic!() panic!()
}; };
@ -269,7 +268,7 @@ mod tests {
.unwrap(); .unwrap();
assert!(matches!(response, Response::Selected(_, _))); assert!(matches!(response, Response::Selected(_, _)));
let Response::Selected(schema, rows) = response else { let Response::Selected(_schema, rows) = response else {
panic!() panic!()
}; };

1
minisql/src/type_system.rs
View file

@ -102,6 +102,7 @@ impl Value {
} }
} }
#[cfg(test)]
mod tests { mod tests {
use crate::error::TypeConversionError::UnknownType; use crate::error::TypeConversionError::UnknownType;
use super::{Value, IndexableValue}; use super::{Value, IndexableValue};

6
server/src/main.rs
View file

@ -44,7 +44,6 @@ async fn main() -> anyhow::Result<()> {
loop { loop {
let state = state.clone(); let state = state.clone();
let tokens = tokens.clone(); let tokens = tokens.clone();
let (pid, key) = random_pid_key();
let (socket, _) = listener.accept().await?; let (socket, _) = listener.accept().await?;
println!("New client connected: {}", socket.peer_addr()?); println!("New client connected: {}", socket.peer_addr()?);
@ -156,6 +155,11 @@ where
while let Some(row) = rows.next() { while let Some(row) = rows.next() {
writer.write_table_row(&row).await?; writer.write_table_row(&row).await?;
sent_rows += 1; sent_rows += 1;
if token.is_canceled() {
token.reset();
break;
}
} }
writer.write_command_complete(CompleteStatus::Select(sent_rows)).await?; writer.write_command_complete(CompleteStatus::Select(sent_rows)).await?;