sql: move Session into execution module

Author: erikgrinaker

src/bin/toysql.rs

@@ -17,7 +17,7 @@ use rustyline_derive::{Completer, Helper, Highlighter, Hinter};
 use toydb::Client;
 use toydb::errinput;
 use toydb::error::Result;
-use toydb::sql::engine::StatementResult;
+use toydb::sql::execution::StatementResult;
 use toydb::sql::parser::{Lexer, Token};
 
 fn main() {

src/client.rs

@@ -8,7 +8,7 @@ use crate::encoding::Value as _;
 use crate::errdata;
 use crate::error::{Error, Result};
 use crate::server::{Request, Response, Status};
-use crate::sql::engine::StatementResult;
+use crate::sql::execution::StatementResult;
 use crate::sql::types::Table;
 use crate::storage::mvcc;
 

src/lib.rs

@@ -12,4 +12,4 @@ pub mod storage;
 
 pub use client::Client;
 pub use server::Server;
-pub use sql::engine::StatementResult;
+pub use sql::execution::StatementResult;

src/server.rs

@@ -12,7 +12,8 @@ use crate::encoding::{self, Value as _};
 use crate::error::Result;
 use crate::raft;
 use crate::sql;
-use crate::sql::engine::{Catalog as _, Engine as _, StatementResult};
+use crate::sql::engine::{Catalog as _, Engine as _};
+use crate::sql::execution::StatementResult;
 use crate::sql::types::{Row, Table};
 use crate::storage;
 
@@ -275,7 +276,7 @@ impl Server {
     fn sql_session(
         id: raft::NodeID,
         socket: TcpStream,
-        mut session: sql::engine::Session<sql::engine::Raft>,
+        mut session: sql::execution::Session<sql::engine::Raft>,
     ) -> Result<()> {
         let mut reader = BufReader::new(socket.try_clone()?);
         let mut writer = BufWriter::new(socket);

src/sql/engine/engine.rs

@@ -1,8 +1,8 @@
 use std::collections::{BTreeMap, BTreeSet};
 
-use super::Session;
 use crate::errinput;
 use crate::error::Result;
+use crate::sql::execution::Session;
 use crate::sql::types::{Expression, Row, Rows, Table, Value};
 use crate::storage::mvcc;
 

src/sql/engine/mod.rs

@@ -6,9 +6,7 @@
 mod engine;
 mod local;
 mod raft;
-mod session;
 
 pub use engine::{Catalog, Engine, Transaction};
 pub use local::{Key, Local};
 pub use raft::{Raft, Status, Write};
-pub use session::{Session, StatementResult};

src/sql/execution/mod.rs

@@ -1,7 +1,9 @@
-//! Executes a `Plan`.
+//! Executes statements and plans.
 
 mod aggregator;
 mod executor;
 mod join;
+mod session;
 
 pub use executor::{ExecutionResult, Executor};
+pub use session::{Session, StatementResult};

src/sql/engine/session.rs src/sql/execution/session.rssrc/sql/engine/session.rs renamed to src/sql/execution/session.rs

@@ -2,20 +2,17 @@ use itertools::Itertools as _;
 use log::error;
 use serde::{Deserialize, Serialize};
 
-use super::raft::{Raft, Status};
-use super::{Engine, Transaction as _};
 use crate::error::{Error, Result};
+use crate::sql::engine::{Engine, Raft, Status, Transaction as _};
 use crate::sql::execution::ExecutionResult;
 use crate::sql::parser::{Parser, ast};
 use crate::sql::planner::Plan;
 use crate::sql::types::{Label, Row, Rows, Value};
 use crate::storage::mvcc;
 use crate::{errdata, errinput};
 
-/// A SQL client session. Executes raw SQL statements against a SQL engine and
-/// handles transaction control.
-///
-/// TODO: move into executor module.
+/// A SQL client session. Parses and executes raw SQL statements and handles
+/// transaction control.
 pub struct Session<'a, E: Engine<'a>> {
     /// The SQL engine.
     engine: &'a E,

src/sql/mod.rs

@@ -2,7 +2,7 @@
 //! as follows:
 //!
 //! 1. The `toySQL` client connects to the server, which creates a new
-//!    `sql::engine::Session` in `Server::sql_session`.
+//!    `sql::execution::Session` in `Server::sql_session`.
 //!
 //! 2. `toySQL` submits a SQL `SELECT` string, which the server executes via
 //!     `Session::execute`.
@@ -86,11 +86,12 @@ mod tests {
     use tempfile::TempDir;
     use test_each_file::test_each_path;
 
-    use super::engine::{Catalog as _, Session};
+    use super::engine::Catalog as _;
+    use super::execution::{Session, StatementResult};
     use super::parser::Parser;
     use super::planner::{OPTIMIZERS, Plan};
     use crate::encoding::format::{self, Formatter as _};
-    use crate::sql::engine::{Engine, Local, StatementResult};
+    use crate::sql::engine::{Engine, Local};
     use crate::sql::planner::{Planner, Scope};
     use crate::storage::engine::test as testengine;
     use crate::storage::{self, Engine as _};