Skip to content

Fix clear column #85

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

Merged
arkpar merged 1 commit into from
Jul 22, 2022
Merged

Fix clear column #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@ pub fn clear_column(path: &Path, column: ColId) -> Result<()> {

// Validate the database by opening. This also makes sure all the logs are enacted,
// so that after deleting a column there are no leftover commits that may write to it.
let _db = Db::with_columns(path, meta.columns.len() as u8)?;
let mut options = Options::with_columns(path, meta.columns.len() as u8);
options.columns = meta.columns;
options.salt = Some(meta.salt);
let _db = Db::open(&options)?;
std::mem::drop(_db);

// It is not specified how read_dir behaves when deleting and iterating in the same loop
Expand Down Expand Up @@ -286,17 +289,22 @@ mod test {
fn clear_column() {
let dir = TempDir::new("clear_column");
let source_dir = dir.path("db");
let mut options = Options::with_columns(&source_dir, 3);
options.columns = vec![Default::default(); 3];
options.columns[1].btree_index = true;
{
let db = Db::with_columns(&source_dir, 3).unwrap();
let db = Db::open_or_create(&options).unwrap();

db.commit(vec![
(0, b"0".to_vec(), Some(b"value0".to_vec())),
(1, b"1".to_vec(), Some(b"value1".to_vec())),
(2, b"2".to_vec(), Some(b"value2".to_vec())),
])
.unwrap();
}

migration::clear_column(&source_dir, 1).unwrap();
let db = Db::with_columns(&source_dir, 3).unwrap();
let db = Db::open(&options).unwrap();
assert_eq!(db.get(0, b"0").unwrap(), Some("value0".as_bytes().to_vec()));
assert_eq!(db.get(1, b"1").unwrap(), None);
assert_eq!(db.get(2, b"2").unwrap(), Some("value2".as_bytes().to_vec()));
Expand Down