tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temp fix crash due to race condition

Browse Source 
we should fix the race condition though

Link: https://github.com/damus-io/nostrdb/issues/35
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-08-03 11:34:06 -07:00
parent ce5142656e
commit 0869cdde65
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/timeline.rs
View File

@@ -13,7 +13,7 @@ use std::cell::RefCell;
use std::collections::HashSet; use std::collections::HashSet;
use std::rc::Rc; use std::rc::Rc;
use tracing::debug; use tracing::{debug, error};
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub enum TimelineSource<'a> { pub enum TimelineSource<'a> {
@@ -89,26 +89,25 @@ impl<'a> TimelineSource<'a> {
debug!("{} new notes! {:?}", new_note_ids.len(), new_note_ids); debug!("{} new notes! {:?}", new_note_ids.len(), new_note_ids);
} }
let new_refs: Vec<(Note, NoteRef)> = new_note_ids let mut new_refs: Vec<(Note, NoteRef)> = Vec::with_capacity(new_note_ids.len());
.iter()
.map(|key| {
let note = app.ndb.get_note_by_key(txn, *key).expect("no note??");
let cached_note = app
.note_cache_mut()
.cached_note_or_insert(*key, &note)
.clone();
let _ = get_unknown_note_ids(&app.ndb, &cached_note, txn, &note, *key, ids);
let created_at = note.created_at(); for key in new_note_ids {
( let note = if let Ok(note) = app.ndb.get_note_by_key(txn, key) {
note, note
NoteRef { } else {
key: *key, error!("hit race condition in poll_notes_into_view: https://github.com/damus-io/nostrdb/issues/35 note {:?} was not added to timeline", key);
created_at, continue;
}, };
)
}) let cached_note = app
.collect(); .note_cache_mut()
.cached_note_or_insert(key, &note)
.clone();
let _ = get_unknown_note_ids(&app.ndb, &cached_note, txn, &note, key, ids);
let created_at = note.created_at();
new_refs.push((note, NoteRef { key, created_at }));
}
// ViewFilter::NotesAndReplies // ViewFilter::NotesAndReplies
{ {