Skip to content

[WIP - DON'T MERGE] Tag storage msg #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabricedesre wants to merge 18 commits into
base: master
Choose a base branch
from
Open

[WIP - DON'T MERGE] Tag storage msg #102

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c88b4af
Tags persistence
fabricedesre Apr 1, 2016
9b1cbcf
Update tags when calling add_getter() and add_setter()
fabricedesre Apr 2, 2016
b1107b5
merging master
fabricedesre Apr 2, 2016
ae55cea
some progress
fabricedesre Apr 14, 2016
75ff610
merge
fabricedesre Apr 14, 2016
b01e8cc
fixing tests
fabricedesre Apr 14, 2016
5e6d4cb
Addressing comments
fabricedesre Apr 14, 2016
afe85c3
Removing dead code
fabricedesre Apr 14, 2016
757d180
merge
fabricedesre Apr 14, 2016
fdae71f
Lazy database
fabricedesre Apr 15, 2016
58abb9c
Ensure we always remove the test db
fabricedesre Apr 15, 2016
e7ed7ca
Testing service tags
fabricedesre Apr 15, 2016
d8fa7d0
Adding more tests
fabricedesre Apr 15, 2016
498bc55
Small optimization when removing tags
fabricedesre Apr 15, 2016
1fcabf8
Merge branch 'master' into tag-persistence
fabricedesre Apr 16, 2016
6220110
Adding comment to clarify cost of TagStorage creation
fabricedesre Apr 17, 2016
abba865
Add some messages to track why we instanciate the tag database
fabricedesre Apr 18, 2016
9caedbf
master merge
fabricedesre Apr 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/tag_storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ impl TagStorage {

// Ensures that we have a database ready. If we fail to open or create the database,
// this will panic.
fn ensure_db(&mut self) {
fn ensure_db(&mut self, msg: &str) {
if self.db.is_some() {
return;
}

info!("Opening taxonomy tags database at {}", self.path.display());
info!("Opening taxonomy tags database at {} for {}", self.path.display(), msg);
let db = Connection::open(self.path.clone()).unwrap_or_else(|err| {
panic!("Unable to open taxonomy tags database: {}", err);
});
Expand Down Expand Up @@ -80,7 +80,7 @@ impl TagStorage {
}

pub fn add_tag<T>(&mut self, id: &Id<T>, tag: &Id<TagId>) -> Result<()> {
self.ensure_db();
self.ensure_db(&format!("add_tag {} on {}", tag, id));
try!(self.db.as_ref().unwrap().execute("INSERT OR IGNORE INTO tags VALUES ($1, $2, $3)",
&[&create_key(id, tag), &escape(&id), &escape(&tag)]));
Ok(())
Expand All @@ -95,7 +95,7 @@ impl TagStorage {
}

pub fn remove_tag<T>(&mut self, id: &Id<T>, tag: &Id<TagId>) -> Result<()> {
self.ensure_db();
self.ensure_db(&format!("remove_tag {} on {}", tag, id));
try!(self.db.as_ref().unwrap().execute("DELETE FROM tags WHERE key=$1", &[&create_key(id, tag)]));
Ok(())
}
Expand All @@ -108,13 +108,13 @@ impl TagStorage {
}

pub fn remove_all_tags_for<T>(&mut self, id: &Id<T>) -> Result<()> {
self.ensure_db();
self.ensure_db(&format!("remove_all_tags on {}", id));
try!(self.db.as_ref().unwrap().execute("DELETE FROM tags WHERE id=$1", &[&escape(id)]));
Ok(())
}

pub fn get_tags_for<T>(&mut self, id: &Id<T>) -> Result<Vec<Id<TagId>>> {
self.ensure_db();
self.ensure_db(&format!("get_tags_for {}", id));
let mut subs = Vec::new();
let mut stmt = try!(self.db.as_ref().unwrap().prepare("SELECT tag FROM tags WHERE id=$1"));
let rows = try!(stmt.query(&[&escape(&id)]));
Expand Down