JosephFerano/distributed-fs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding better error handling and moving tests to its own file

Browse Source
This commit is contained in:
Joseph Ferano 2018-12-09 18:37:19 -04:00
parent 1f7d26f9bd
commit 3cb9378e41
3 changed files with 176 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
src/bin/meta_data.rs
View File

@ -12,10 +12,8 @@ use std::io::Write;
use std::net::{TcpListener, TcpStream};
fn main() {
// TODO: We need to check if the DB exists, if not, ask the user to run the python script
// Maybe we can even run it for them
let conn = Connection::open("dfs.db").unwrap();
let mut file_list: Vec<String> = Vec::new();
let conn = Connection::open("dfs.db")
.expect("Error opening 'dfs.db', consider running 'python createdb.py'");
let listener = TcpListener::bind("localhost:6770").unwrap();
for stream in listener.incoming() {
@ -86,7 +84,7 @@ fn add_data_node(conn: &Connection, address: &str, port: i32) {
fn remove_data_node(conn: &Connection, address: &str, port: i32) {
match conn.execute(
"DELETE FROM dnode WHERE address=?1 AND port=?2)",
"DELETE FROM dnode WHERE address=?1 AND port=?2",
&[&address as &ToSql, &port],
) {
Ok(n) => println!("{} rows updated", n),
@ -94,7 +92,7 @@ fn remove_data_node(conn: &Connection, address: &str, port: i32) {
};
}
fn get_data_node(conn: &Connection, address: &str, port: i32) -> DataNode {
fn get_data_node(conn: &Connection, address: &str, port: i32) -> Option<DataNode> {
let mut stmt = conn
.prepare("SELECT nid, address, port FROM dnode WHERE address=?1 AND port=?2")
.unwrap();
@ -102,7 +100,7 @@ fn get_data_node(conn: &Connection, address: &str, port: i32) -> DataNode {
id: row.get(0),
ip: row.get(1),
port: row.get(2),
}).unwrap()
}).ok()
}
fn get_data_nodes(conn: &Connection) -> Vec<DataNode> {
@ -146,15 +144,19 @@ fn remove_file(conn: &Connection, fname: String) {
let mut stmt = conn
.prepare("SELECT fname, fsize FROM inode")
.unwrap();
let iter = stmt.query_map(NO_PARAMS, |row| INode {
let mut files = Vec::new();
match stmt.query_map(NO_PARAMS, |row| INode {
id: 0,
name: row.get(0),
size: row.get(1),
}).unwrap();
let mut files = Vec::new();
for f in iter {
let f = f.unwrap();
files.push(format!("{} {} bytes", f.name, f.size));
}) {
Ok(iter) => {
for f in iter {
let f = f.unwrap();
files.push(format!("{} {} bytes", f.name, f.size));
}
},
Err(e) => println!("Error! {}", e),
}
files
}
@ -171,14 +173,13 @@ fn remove_file(conn: &Connection, fname: String) {
fn get_file_inode(conn: &Connection, fname: &String) -> (INode, Vec<BlockQuery>) {
let file = get_file_info(&conn, &fname);
let mut stmt = conn.prepare(
"SELECT address, port, cid FROM dnode, block WHERE dnode.nid = block.nid AND block.fid = ?1")
"SELECT dnode.nid, address, port, cid FROM dnode, block WHERE dnode.nid = block.nid AND block.fid = ?1")
.unwrap();
let iter = stmt.query_map(
&[&file.id],
|row| BlockQuery {
data_node: DataNode { id: 0, ip: row.get(0), port: row.get(1) },
chunk_id: row.get(2),
id: 0,
data_node: DataNode { id: row.get(0), ip: row.get(1), port: row.get(2) },
chunk_id: row.get(3),
}).unwrap();
let mut blocks: Vec<BlockQuery> = Vec::new();
for b in iter {
@ -187,158 +188,3 @@ fn remove_file(conn: &Connection, fname: String) {
(file, blocks)
}
#[cfg(test)]
mod tests {
use super::*;
fn create_tables(conn: &Connection) {
conn.execute(
"CREATE TABLE inode (
fid INTEGER PRIMARY KEY ASC AUTOINCREMENT,
fname TEXT UNIQUE NOT NULL DEFAULT \" \",
fsize INTEGER NOT NULL default \"0\")",
NO_PARAMS
).unwrap();
conn.execute(
"CREATE TABLE dnode (
nid INTEGER PRIMARY KEY ASC AUTOINCREMENT,
address TEXT NOT NULL DEFAULT \" \",
port INTEGER NOT NULL DEFAULT \"0\")",
NO_PARAMS,
).unwrap();
conn.execute(
"CREATE TABLE block (
bid INTEGER PRIMARY KEY ASC AUTOINCREMENT,
fid INTEGER NOT NULL DEFAULT \"0\",
nid INTEGER NOT NULL DEFAULT \"0\",
cid TEXT NOT NULL DEFAULT \"0\")",
NO_PARAMS
).unwrap();
// Create UNIQUE tuple for block
conn.execute("CREATE UNIQUE INDEX dnodeA ON dnode(address, port)", NO_PARAMS)
.unwrap();
// Create UNIQUE tuple for block
conn.execute("CREATE UNIQUE INDEX blocknc ON block(nid, cid)", NO_PARAMS)
.unwrap();
}
fn get_test_db() -> Connection {
let conn = Connection::open_in_memory().unwrap();
create_tables(&conn);
conn
}
#[test]
fn add_dnode_with_correct_ip_and_port() {
let conn = get_test_db();
let ip = "127.0.0.1";
let port = 65533;
add_data_node(&conn, &ip, port as i32);
let dnode = get_data_node(&conn, &ip, port as i32);
assert_eq!(dnode.id, 1);
assert_eq!(dnode.ip, ip);
assert_eq!(dnode.port, port);
}
#[test]
fn removes_dnode_with_correct_ip_and_port() {
// TODO: I don't know how to test a delete
let conn = get_test_db();
let ip = "127.0.0.1";
let port = 65533;
add_data_node(&conn, &ip, port as i32);
let dnode = get_data_node(&conn, &ip, port as i32);
assert_eq!(dnode.id, 1);
assert_eq!(dnode.ip, ip);
assert_eq!(dnode.port, port);
}
#[test]
fn gets_all_data_nodes() {
let conn = get_test_db();
let ip1 = "127.0.0.1";
let port1 = 65533;
let ip2 = "127.0.0.2";
let port2 = port1 + 1;
let ip3 = "127.0.0.3";
let port3 = port2 + 1;
add_data_node(&conn, &ip1, port1 as i32);
add_data_node(&conn, &ip2, port2 as i32);
add_data_node(&conn, &ip3, port3 as i32);
let ds = get_data_nodes(&conn);
for i in 0..ds.len() {
let d = &ds[i];
assert_eq!(d.ip, format!("127.0.0.{}", i + 1));
assert_eq!(d.port, 65533 + i as u32);
}
}
#[test]
fn adds_file() {
let conn = get_test_db();
add_file(&conn, &String::from("my_1337_virus"), 32);
let files = get_files(&conn);
assert_eq!(files.len(), 1);
assert_eq!(files[0], "my_1337_virus 32 bytes");
}
#[test]
fn deletes_file() {
let conn = get_test_db();
add_file(&conn, &String::from("my_1337_virus"), 32);
let files = get_files(&conn);
assert_eq!(files.len(), 1);
assert_eq!(files[0], "my_1337_virus 32 bytes");
}
#[test]
fn gets_all_file() {
let conn = get_test_db();
add_file(&conn, &String::from("file1"), 32);
add_file(&conn, &String::from("file2"), 64);
add_file(&conn, &String::from("file3"), 128);
let files = get_files(&conn);
assert_eq!(files.len(), 3);
assert_eq!(files[0], "file1 32 bytes");
assert_eq!(files[1], "file2 64 bytes");
assert_eq!(files[2], "file3 128 bytes");
}
#[test]
fn adds_blocks_to_inode() {
let conn = get_test_db();
let filename = String::from("main_file");
add_file(&conn, &filename, 128);
add_data_node(&conn, "127.0.0.1", 1337);
add_data_node(&conn, "127.0.0.2", 1338);
let inode = get_file_info(&conn, &filename);
let blocks = vec!(
Block {
file_id: inode.id,
id: 0,
node_id: 1,
chunk_id: String::from("c1"),
},
Block {
file_id: inode.id,
id: 0,
node_id: 2,
chunk_id: String::from("c2"),
},
);
add_blocks_to_inode(&conn, &filename, &blocks);
let (inode, blocks) = get_file_inode(&conn, &filename);
assert_eq!(inode.name, "main_file");
assert_eq!(inode.size, 128);
assert_eq!(blocks.len(), 2);
let dn1 = get_data_node(&conn, "127.0.0.1", 1337);
let dn2 = get_data_node(&conn, "127.0.0.2", 1338);
assert_eq!(dn1.id, 1);
assert_eq!(dn2.id, 2);
}
}

1
src/lib.rs
View File

@ -70,7 +70,6 @@ pub struct Block {
#[derive(Debug)]
pub struct BlockQuery {
pub id: u32,
pub data_node: DataNode,
pub chunk_id: String
}

158
src/tests.rs Normal file
View File

@ -0,0 +1,158 @@
#[cfg(test)]
mod tests {
use super::*;
fn get_test_db() -> Connection {
let conn = Connection::open_in_memory().unwrap();
conn.execute(
"CREATE TABLE inode (
fid INTEGER PRIMARY KEY ASC AUTOINCREMENT,
fname TEXT UNIQUE NOT NULL DEFAULT \" \",
fsize INTEGER NOT NULL default \"0\")",
NO_PARAMS
).unwrap();
conn.execute(
"CREATE TABLE dnode (
nid INTEGER PRIMARY KEY ASC AUTOINCREMENT,
address TEXT NOT NULL DEFAULT \" \",
port INTEGER NOT NULL DEFAULT \"0\")",
NO_PARAMS,
).unwrap();
conn.execute(
"CREATE TABLE block (
bid INTEGER PRIMARY KEY ASC AUTOINCREMENT,
fid INTEGER NOT NULL DEFAULT \"0\",
nid INTEGER NOT NULL DEFAULT \"0\",
cid TEXT NOT NULL DEFAULT \"0\")",
NO_PARAMS
).unwrap();
conn
}
#[test]
fn add_dnode_with_correct_ip_and_port() {
let conn = get_test_db();
let ip = "127.0.0.1";
let port = 65533;
add_data_node(&conn, &ip, port as i32);
let dnode = get_data_node(&conn, &ip, port as i32).unwrap();
assert_eq!(dnode.id, 1);
assert_eq!(dnode.ip, ip);
assert_eq!(dnode.port, port);
}
#[test]
fn removes_dnode_with_correct_ip_and_port() {
let conn = get_test_db();
let ip = "127.0.0.1";
let port = 65533;
let dnode = get_data_node(&conn, &ip, port as i32);
assert_eq!(dnode.is_none(), true);
add_data_node(&conn, &ip, port as i32);
let dnode = get_data_node(&conn, &ip, port as i32).unwrap();
assert_eq!(dnode.ip, ip);
assert_eq!(dnode.port, port);
remove_data_node(&conn, &ip, port as i32);
let dnode = get_data_node(&conn, &ip, port as i32);
assert_eq!(dnode.is_none(), true);
}
#[test]
fn gets_all_data_nodes() {
let conn = get_test_db();
let ip1 = "127.0.0.1";
let port1 = 65533;
let ip2 = "127.0.0.2";
let port2 = port1 + 1;
let ip3 = "127.0.0.3";
let port3 = port2 + 1;
add_data_node(&conn, &ip1, port1 as i32);
add_data_node(&conn, &ip2, port2 as i32);
add_data_node(&conn, &ip3, port3 as i32);
let ds = get_data_nodes(&conn);
for i in 0..ds.len() {
let d = &ds[i];
assert_eq!(d.id, (i + 1) as u32);
assert_eq!(d.ip, format!("127.0.0.{}", i + 1));
assert_eq!(d.port, 65533 + i as u32);
}
}
#[test]
fn adds_file() {
let conn = get_test_db();
add_file(&conn, &String::from("my_1337_virus"), 32);
let files = get_files(&conn);
assert_eq!(files.len(), 1);
assert_eq!(files[0], "my_1337_virus 32 bytes");
}
#[test]
fn removes_file() {
let conn = get_test_db();
add_file(&conn, &String::from("my_1337_virus"), 32);
let files = get_files(&conn);
assert_eq!(files.len(), 1);
assert_eq!(files[0], "my_1337_virus 32 bytes");
}
#[test]
fn gets_all_file() {
let conn = get_test_db();
add_file(&conn, &String::from("file1"), 32);
add_file(&conn, &String::from("file2"), 64);
add_file(&conn, &String::from("file3"), 128);
let files = get_files(&conn);
assert_eq!(files.len(), 3);
assert_eq!(files[0], "file1 32 bytes");
assert_eq!(files[1], "file2 64 bytes");
assert_eq!(files[2], "file3 128 bytes");
}
#[test]
fn returns_empty_list_if_no_files_exist() {
let conn = get_test_db();
let files = get_files(&conn);
assert_eq!(files.len(), 0);
}
#[test]
fn adds_blocks_to_inode() {
let conn = get_test_db();
let filename = String::from("main_file");
add_file(&conn, &filename, 128);
add_data_node(&conn, "127.0.0.1", 1337);
add_data_node(&conn, "127.0.0.2", 1338);
let inode = get_file_info(&conn, &filename);
let blocks = vec!(
Block {
file_id: inode.id,
id: 0,
node_id: 1,
chunk_id: String::from("c1"),
},
Block {
file_id: inode.id,
id: 0,
node_id: 2,
chunk_id: String::from("c2"),
},
);
add_blocks_to_inode(&conn, &filename, &blocks);
let (inode, blocks) = get_file_inode(&conn, &filename);
assert_eq!(inode.name, "main_file");
assert_eq!(inode.size, 128);
assert_eq!(blocks.len(), 2);
assert_eq!(blocks[0].chunk_id, "c1");
assert_eq!(blocks[0].data_node.id, 1);
assert_eq!(blocks[0].data_node.ip, "127.0.0.1");
assert_eq!(blocks[0].data_node.port, 1337);
assert_eq!(blocks[1].chunk_id, "c2");
assert_eq!(blocks[1].data_node.id, 2);
assert_eq!(blocks[1].data_node.ip, "127.0.0.2");
assert_eq!(blocks[1].data_node.port, 1338);
}
}