Fix compilation errors and warnings (DB::scan, imports)

Author: michaelmior

src/db.rs

@@ -5,7 +5,7 @@ use serde_json::Value;
 use std::collections::HashMap;
 use std::fs;
 use std::iter::Peekable;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use uuid::Uuid;
 
 fn sanitize_filename(name: &str) -> String {
@@ -257,8 +257,12 @@ impl DB {
         self.get_collection(collection).update(id, doc);
     }
 
-    pub fn scan(&mut self, collection: &str) -> impl Iterator<Item = (String, Value)> + '_ {
-        self.get_collection(collection).scan()
+    pub fn scan(&self, collection: &str) -> Box<dyn Iterator<Item = (String, Value)> + '_> {
+        if let Some(col) = self.collections.get(collection) {
+            Box::new(col.scan())
+        } else {
+            Box::new(std::iter::empty())
+        }
     }
 }
 

src/main.rs

@@ -113,12 +113,12 @@ impl SimpleQueryHandler for ArgusHandler {
 
         match stmt {
             Statement::Insert {
-                collection: _,
+                collection,
                 documents,
             } => {
                 let count = documents.len();
                 for doc in documents {
-                    db.insert(doc);
+                    db.insert(&collection, doc);
                 }
                 Ok(vec![Response::Execution(Tag::new(&format!(
                     "INSERT 0 {}",

src/query.rs

@@ -313,9 +313,9 @@ pub fn execute_plan<'a>(
     db: &'a DB,
 ) -> Box<dyn Iterator<Item = (String, Value)> + 'a> {
     match plan {
-        LogicalPlan::Scan { .. } => {
-            let iter = db.scan();
-            Box::new(ScanOperator::new(Box::new(iter)))
+        LogicalPlan::Scan { collection } => {
+            let iter = db.scan(&collection);
+            Box::new(ScanOperator::new(iter))
         }
         LogicalPlan::Filter { input, predicate } => {
             let child = execute_plan(*input, db);