Skip to content

Return &str from provenance table getters #403

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
merged 2 commits into from
Nov 9, 2022
Merged

Return &str from provenance table getters #403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3684efb
refactor: provenance getters now return Option<&str>
molpopgen Nov 9, 2022
f50d651
reduce internal code duplication
molpopgen Nov 9, 2022
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
82 changes: 20 additions & 62 deletions src/provenance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ impl std::fmt::Display for ProvenanceTableRow {
fn make_provenance_row(table: &ProvenanceTable, pos: tsk_id_t) -> Option<ProvenanceTableRow> {
Some(ProvenanceTableRow {
id: pos.into(),
timestamp: table.timestamp(pos)?,
record: table.record(pos)?,
timestamp: table.timestamp(pos)?.to_string(),
record: table.record(pos)?.to_string(),
})
}

Expand Down Expand Up @@ -122,35 +122,10 @@ impl<'a> streaming_iterator::StreamingIterator for ProvenanceTableRowView<'a> {

row_lending_iterator_get!();

// FIXME: bad duplication
fn advance(&mut self) {
self.id = (i32::from(self.id) + 1).into();
let record_slice = unsafe_tsk_ragged_char_column_access_to_slice_u8!(
self.id.0,
0,
self.table.num_rows(),
self.table.as_ref(),
record,
record_offset,
record_length
);
self.record = match record_slice {
Some(r) => std::str::from_utf8(r).unwrap(),
None => "",
};
let timestamp_slice = unsafe_tsk_ragged_char_column_access_to_slice_u8!(
self.id.0,
0,
self.table.num_rows(),
self.table.as_ref(),
timestamp,
timestamp_offset,
timestamp_length
);
self.timestamp = match timestamp_slice {
Some(t) => std::str::from_utf8(t).unwrap(),
None => "",
};
self.record = self.table.record(self.id).unwrap_or("");
self.timestamp = self.table.timestamp(self.id).unwrap_or("");
}
}

Expand Down Expand Up @@ -209,16 +184,20 @@ impl ProvenanceTable {
/// # panic!("Expected Some(timestamp)");
/// # }
/// ```
pub fn timestamp<P: Into<ProvenanceId> + Copy>(&self, row: P) -> Option<String> {
unsafe_tsk_ragged_char_column_access!(
pub fn timestamp<P: Into<ProvenanceId> + Copy>(&self, row: P) -> Option<&str> {
let timestamp_slice = unsafe_tsk_ragged_char_column_access_to_slice_u8!(
row.into().0,
0,
self.num_rows(),
self.as_ref(),
timestamp,
timestamp_offset,
timestamp_length
)
);
match timestamp_slice {
Some(tstamp) => std::str::from_utf8(tstamp).ok(),
None => None,
}
}

/// Get the provenance record for row `row`.
Expand All @@ -241,16 +220,20 @@ impl ProvenanceTable {
/// # else {
/// # panic!("Expected Some(timestamp)");
/// # }
pub fn record<P: Into<ProvenanceId> + Copy>(&self, row: P) -> Option<String> {
unsafe_tsk_ragged_char_column_access!(
pub fn record<P: Into<ProvenanceId> + Copy>(&self, row: P) -> Option<&str> {
let record_slice = unsafe_tsk_ragged_char_column_access_to_slice_u8!(
row.into().0,
0,
self.num_rows(),
self.as_ref(),
record,
record_offset,
record_length
)
);
match record_slice {
Some(rec) => std::str::from_utf8(rec).ok(),
None => None,
}
}

/// Obtain a [`ProvenanceTableRow`] for row `row`.
Expand All @@ -271,37 +254,12 @@ impl ProvenanceTable {
/// * `None` otherwise
pub fn row_view<P: Into<ProvenanceId> + Copy>(&self, row: P) -> Option<ProvenanceTableRowView> {
match u64::try_from(row.into().0).ok() {
// FIXME: bad duplication
Some(x) if x < self.num_rows() => {
let record_slice = unsafe_tsk_ragged_char_column_access_to_slice_u8!(
row.into().0,
0,
self.num_rows(),
self.as_ref(),
record,
record_offset,
record_length
);
let timestamp_slice = unsafe_tsk_ragged_char_column_access_to_slice_u8!(
row.into().0,
0,
self.num_rows(),
self.as_ref(),
timestamp,
timestamp_offset,
timestamp_length
);
let view = ProvenanceTableRowView {
table: self,
id: row.into(),
record: match record_slice {
Some(r) => std::str::from_utf8(r).unwrap(),
None => "",
},
timestamp: match timestamp_slice {
Some(t) => std::str::from_utf8(t).unwrap(),
None => "",
},
record: self.record(row)?,
timestamp: self.timestamp(row)?,
};
Some(view)
}
Expand Down