fix clippy and fmt

node_engine/src/lib.rs

@@ -12,17 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use data_manipulation::{QueryPlan, TypedQuery, UntypedQuery};
+use data_manipulation::{QueryPlan, UntypedQuery};
 use data_repr::scalar::ScalarValue;
-pub use node_engine_old::NodeEngineOld;
+pub use node_engine::NodeEngine;
 use postgre_sql::query_ast::Query;
 use std::collections::HashMap;
 use types::SqlTypeFamily;
 
-mod node_engine_old;
-mod query_engine_old;
+mod node_engine;
 mod query_executor;
-mod session_old;
 mod transaction_manager;
 mod worker;
 
@@ -55,7 +53,7 @@ impl QueryPlanCache {
                 query,
                 sql,
                 param_types,
-            }) => Some((query.clone(), sql.clone(), param_types.to_vec())),
+            }) => Some((query, sql, param_types.to_vec())),
             Some(_) => None,
         }
     }
@@ -86,7 +84,7 @@ impl QueryPlanCache {
     pub fn bind_portal(&mut self, statement_name: String, portal_name: String, portal: Portal) {
         self.portal_per_statement
             .entry(statement_name)
-            .or_insert_with(|| vec![])
+            .or_insert_with(Vec::new)
             .push(portal_name.clone());
         self.all_portals.insert(portal_name, portal);
     }

node_engine/src/node_engine_old.rs → node_engine/src/node_engine.rs

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::query_engine_old::QueryEngineOld;
 use crate::worker::Worker;
 use native_tls::Identity;
 use postgre_sql::wire_protocol::PgWireAcceptor;
@@ -22,15 +21,14 @@ use std::{
     io::{self, Read},
     net::TcpListener,
     path::{Path, PathBuf},
-    sync::{Arc, Mutex},
     thread,
 };
 use storage::Database;
 
 #[derive(Default, Clone)]
-pub struct NodeEngineOld;
+pub struct NodeEngine;
 
-impl NodeEngineOld {
+impl NodeEngine {
     pub fn start(&self, database: Database) {
         let listener = TcpListener::bind("0.0.0.0:5432").expect("create listener");
 
@@ -58,33 +56,6 @@ impl NodeEngineOld {
                         worker.process(&mut connection, db);
 
                         Ok(())
-
-                        // let arc = Arc::new(Mutex::new(connection));
-                        // let mut query_engine = QueryEngineOld::new(arc.clone(), db);
-                        // log::debug!("ready to handle query");
-                        //
-                        // loop {
-                        //     let mut guard = arc.lock().unwrap();
-                        //     let result = guard.receive();
-                        //     drop(guard);
-                        //     log::debug!("{:?}", result);
-                        //     match result {
-                        //         Err(e) => {
-                        //             log::error!("UNEXPECTED ERROR: {:?}", e);
-                        //             return Err(e);
-                        //         }
-                        //         Ok(Err(e)) => {
-                        //             log::error!("UNEXPECTED ERROR: {:?}", e);
-                        //             return Err(io::ErrorKind::InvalidInput.into());
-                        //         }
-                        //         Ok(Ok(client_request)) => match query_engine.execute(client_request) {
-                        //             Ok(()) => {}
-                        //             Err(_) => {
-                        //                 break Ok(());
-                        //             }
-                        //         },
-                        //     }
-                        // }
                     });
                 }
             }