Skip to content

Commit

Permalink
Build successful, changed DB format, testing remains
Browse files Browse the repository at this point in the history
  • Loading branch information
@krshrimali
krshrimali committed Dec 7, 2024
1 parent 6e29eb3 commit 3f25300
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 16 deletions.
50 changes: 37 additions & 13 deletions src/db.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use std::{collections::HashMap, fs::File, path::Path};
use crate::config::MAX_ITEMS_IN_EACH_DB_FILE;
use crate::{config, contextgpt_structs::AuthorDetails};

// workspace_path: file_path: 1: AuthorDetails
type DBType = HashMap<String, HashMap<String, HashMap<u32, Vec<AuthorDetails>>>>;
type MappingDBType = HashMap<String, Vec<u32>>;

Expand Down Expand Up @@ -59,16 +60,26 @@ impl DB {
return HashMap::new();
}
let current_data = self.read();
let values = current_data.get(&self.curr_file_path);
let values = current_data
.get(&self.workspace_path)
.unwrap()
.get(&self.curr_file_path);
if let Some(valid_values) = values {
let mut default: HashMap<u32, Vec<AuthorDetails>> = HashMap::new();
let mut default: HashMap<u32, Vec<AuthorDetails>> = HashMap::new(); // Empty
// hashmap for some default
let insert_data_here = init_data
.get_mut(&self.workspace_path)
.unwrap() // TODO: This might fail one
// day.
.get_mut(&self.curr_file_path)
.unwrap_or(&mut default);
insert_data_here.extend(valid_values.clone());
let copy_data = insert_data_here.clone();
init_data.insert(self.curr_file_path.clone(), copy_data);
// init_data.insert(self.curr_file_path.clone(), copy_data);
let mut temp_map: HashMap<String, HashMap<u32, Vec<AuthorDetails>>> =
HashMap::new();
temp_map.insert(self.curr_file_path.clone(), copy_data);
init_data.insert(self.workspace_path.clone(), temp_map);
}
}
init_data
Expand Down Expand Up @@ -106,13 +117,18 @@ impl DB {
.unwrap_or_else(|_| panic!("Unable to create folder for: {}", self.folder_path));

// Search for the index
let db_file_index = self.find_index(curr_file_path);
let db_file_index = self.find_index(curr_file_path.unwrap_or(""));
// Filename will be: <db_file_index>.json
let valid_indices = db_file_index.unwrap_or(vec![self.index]);
self.current_data = self.read_all(valid_indices.clone());
}

fn find_index(&mut self, curr_file_path: &str) -> Option<Vec<u32>> {
// In case the input path is empty.
if curr_file_path.is_empty() {
return None;
}

// In each folder -> we'll have a mapping file which contains which filename corresponds to which index (to be used in the DB file)
self.mapping_file_name = "mapping.json".to_string();
self.mapping_file_path = format!("{}/{}", self.folder_path, self.mapping_file_name);
Expand Down Expand Up @@ -188,16 +204,17 @@ impl DB {
if all_data.is_empty() {
return;
}
let end_line_idx = all_data[0].end_line_number as usize;
let end_line_idx = all_data[0].end_line_number;
for line_idx in start_line_idx..end_line_idx + 1 {
let line_idx = line_idx as u32;
let mut existing_data = vec![];
if self.current_data.contains_key(self.workspace_path) {
let workspace_data = self.current_data.get(self.workspace_path).unwrap();
if self.current_data.contains_key(&self.workspace_path) {
let workspace_data = self.current_data.get_mut(&self.workspace_path).unwrap();
if workspace_data.contains_key(configured_file_path) {
let file_data = workspace_data.get(configured_file_path).unwrap();
let file_data = workspace_data.get_mut(configured_file_path).unwrap();
if file_data.contains_key(&line_idx) {
existing_data = file_data.get(&line_idx).unwrap().clone();
// TODO: Add this to self.current_data once testing is successful.
}
match file_data.contains_key(&line_idx) {
false => {
Expand All @@ -213,10 +230,13 @@ impl DB {
}
} else {
existing_data.extend(all_data.clone());
let mut map = HashMap::new();
map.insert(line_idx, existing_data);
let mut to_insert_map: HashMap<String, HashMap<u32, Vec<AuthorDetails>>> =
HashMap::new();
let mut another_map: HashMap<u32, Vec<AuthorDetails>> = HashMap::new();
another_map.insert(line_idx, existing_data);
to_insert_map.insert(configured_file_path.clone(), another_map);
self.current_data
.insert(configured_file_path.to_string(), map);
.insert(self.workspace_path.clone(), to_insert_map);
}
}
}
Expand Down Expand Up @@ -284,8 +304,12 @@ impl DB {
let mut already_computed_data: Vec<&AuthorDetails> = vec![];
let mut uncovered_indices: Vec<u32> = vec![];
println!("Searching for the given field: {}", search_field_first);
if self.current_data.contains_key(search_field_first) {
let output = self.current_data.get_mut(search_field_first);
if self.current_data.contains_key(&self.workspace_path.clone()) {
let output = self
.current_data
.get_mut(&self.workspace_path.clone())
.unwrap()
.get_mut(search_field_first);
if let Some(all_line_data) = output {
for each_line_idx in *start_line_number..*end_line_number + 1 {
let each_line_idx = each_line_idx as u32;
Expand Down
13 changes: 10 additions & 3 deletions src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ impl Server {
let origin_file_path = self.state_db_handler.metadata.workspace_path.clone();
let start_line_number = 0;
db.lock().unwrap().append(
&workspace_path.to_str().unwrap().to_string(),
// &workspace_path.to_str().unwrap().to_string(),
// &origin_file_path,
&origin_file_path,
start_line_number,
output_authordetails.clone(),
Expand Down Expand Up @@ -247,7 +248,10 @@ impl Server {
..Default::default()
};
let curr_db: Arc<Mutex<DB>> = Arc::new(db.into());
curr_db.lock().unwrap().init_db(workspace_path.as_str());
curr_db
.lock()
.unwrap()
.init_db(workspace_path.as_str(), None);
let mut server = Server::new(State::Dead, DBHandler::new(metadata.clone()));
server.init_server(curr_db);
let _ = server
Expand All @@ -274,7 +278,10 @@ impl Server {
..Default::default()
};
let curr_db: Arc<Mutex<DB>> = Arc::new(db.into());
curr_db.lock().unwrap().init_db(workspace_path);
curr_db
.lock()
.unwrap()
.init_db(workspace_path, file_path.clone().as_deref());
// let mut server = Server::new(State::Dead, DBHandler::new(metadata.clone()));
self.init_server(curr_db);
// Then you query
Expand Down

0 comments on commit 3f25300

Please sign in to comment.