Chewing_Bever
/
lander
1
0
Fork 0
Code Issues 30 Packages Projects 1 Activity

feat(lsm): add valid entry marker to idx entries

lsm
Jef Roosens 2023-11-09 21:48:15 +01:00
parent 2f58d1ee48
commit d4b21fb84d
Signed by: Jef Roosens
GPG Key ID: 02D4C0997E74717B
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lsm/src/store/lsm_store_disk_read.c
View File

@ -142,6 +142,7 @@ lsm_error lsm_store_load_db(lsm_store *store) {
uint64_t db_dim[2]; uint64_t db_dim[2];
lsm_str *key; lsm_str *key;
lsm_entry_handle *handle; lsm_entry_handle *handle;
bool valid_entry;
rewind(store->idx_file); rewind(store->idx_file);
@ -152,24 +153,43 @@ lsm_error lsm_store_load_db(lsm_store *store) {
for (uint64_t i = 0; i < store->idx_file_block_count; i++) { for (uint64_t i = 0; i < store->idx_file_block_count; i++) {
uint64_t idx_file_offset = store->idx_file_size; uint64_t idx_file_offset = store->idx_file_size;
LSM_RES(lsm_entry_read_str(&key, &store->idx_file_size, store->idx_file)); LSM_RES(lsm_fread(&valid_entry, &store->idx_file_size, store->idx_file,
LSM_RES(lsm_fread(&db_dim, &store->idx_file_size, store->idx_file, sizeof(bool), 1));
sizeof(uint64_t), 2));
LSM_RES(lsm_store_insert(&handle, store, key));
// Read attributes from database file if (valid_entry) {
if (fseek(store->db_file, db_dim[0], SEEK_SET) != 0) { LSM_RES(lsm_entry_read_str(&key, &store->idx_file_size, store->idx_file));
return lsm_error_failed_io; LSM_RES(lsm_fread(&db_dim, &store->idx_file_size, store->idx_file,
sizeof(uint64_t), 2));
LSM_RES(lsm_store_insert(&handle, store, key));
// Read attributes from database file
if (fseek(store->db_file, db_dim[0], SEEK_SET) != 0) {
return lsm_error_failed_io;
}
LSM_RES(lsm_fread(&handle->wrapper->entry->data_len, NULL, store->db_file,
sizeof(uint64_t), 1));
LSM_RES(lsm_entry_read_attrs(NULL, handle, store->db_file));
handle->wrapper->entry->idx_file_offset = idx_file_offset;
lsm_entry_close(handle);
store->db_file_size += db_dim[1];
} }
// Simply skip the invalid entry
else {
uint64_t key_len;
LSM_RES(lsm_fread(&key_len, &store->idx_file_size, store->idx_file,
sizeof(uint64_t), 1));
LSM_RES(lsm_fread(&handle->wrapper->entry->data_len, NULL, store->db_file, uint64_t remaining = key_len + 2 * sizeof(uint64_t);
sizeof(uint64_t), 1));
LSM_RES(lsm_entry_read_attrs(NULL, handle, store->db_file));
handle->wrapper->entry->idx_file_offset = idx_file_offset; if (fseek(store->idx_file, remaining, SEEK_CUR) != 0) {
lsm_entry_close(handle); return lsm_error_failed_io;
}
store->db_file_size += db_dim[1]; store->idx_file_size += remaining;
}
} }
return lsm_error_ok; return lsm_error_ok;

3
lsm/src/store/lsm_store_disk_write.c
View File

@ -65,6 +65,9 @@ lsm_error lsm_write_idx_entry(uint64_t *size, FILE *idx_file, lsm_entry *entry,
LSM_RES(lsm_fseek(idx_file, pos)); LSM_RES(lsm_fseek(idx_file, pos));
bool valid_entry_marker = true;
LSM_RES(lsm_fwrite(size, idx_file, sizeof(bool), 1, &valid_entry_marker));
LSM_RES(lsm_write_str(size, idx_file, entry->key)); LSM_RES(lsm_write_str(size, idx_file, entry->key));
LSM_RES(lsm_fwrite(size, idx_file, sizeof(uint64_t), 1, &offset)); LSM_RES(lsm_fwrite(size, idx_file, sizeof(uint64_t), 1, &offset));
LSM_RES(lsm_fwrite(size, idx_file, sizeof(uint64_t), 1, &len)); LSM_RES(lsm_fwrite(size, idx_file, sizeof(uint64_t), 1, &len));