Skip to content

Fix index corruption on reindex #170

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 8 commits into from
Jan 23, 2023
Merged

Fix index corruption on reindex #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cfb761b
Small improvements
arkpar Oct 24, 2022
aee231c
Merge commit 'refs/pull/151/head' of github.com:paritytech/parity-db
arkpar Oct 24, 2022
db23e9e
Merge branch 'master' of github.com:paritytech/parity-db
arkpar Jan 18, 2023
4f1f412
Fixed reindexing creating duplicate entries
arkpar Jan 23, 2023
e89c18e
Version bump
arkpar Jan 23, 2023
9df92fc
Restored trace
arkpar Jan 23, 2023
cf3713e
Updated log levels
arkpar Jan 23, 2023
e9d6ce2
Allow shutdown on reindex
arkpar Jan 23, 2023
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
Next Next commit
Small improvements
  • Loading branch information
@arkpar
arkpar committed Oct 24, 2022
commit cfb761b5229b033344c43277cf2df9bf926cc98d
2 changes: 1 addition & 1 deletion src/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ impl DbInner {
if let Some(mut reader) = reader {
log::debug!(
target: "parity-db",
"Enacting log {}",
"Enacting log record {}",
reader.record_id(),
);
if validation_mode {
Expand Down
2 changes: 1 addition & 1 deletion src/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ impl TableId {

impl std::fmt::Display for TableId {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:02}-{:02}", self.col(), self.index_bits())
write!(f, "i{:02}-{:02}", self.col(), self.index_bits())
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ impl TableId {

impl std::fmt::Display for TableId {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:02}-{:02}", self.col(), hex(&[self.size_tier()]))
write!(f, "t{:02}-{:02}", self.col(), hex(&[self.size_tier()]))
}
}

Expand Down Expand Up @@ -455,7 +455,7 @@ impl ValueTable {
self.id,
index,
k,
to_fetch,
to_fetch.as_ref().map(hex),
self.entry_size,
);
return Ok((0, false))
Expand Down Expand Up @@ -849,6 +849,7 @@ impl ValueTable {
let mut header = Header::default();
log.read(&mut header.0)?;
self.file.write_at(&header.0, 0)?;
log::trace!(target: "parity-db", "{}: Enacted header, {} filled", self.id, header.filled());
return Ok(())
}

Expand Down