nostr/gossip
1
0
Fork 0
mirror of https://github.com/mikedilger/gossip.git synced 2024-09-20 03:57:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage: Switch interface to indexing functions

Browse Source
This commit is contained in:
Mike Dilger 2024-02-03 03:56:45 +13:00
parent ff839ad773
commit 618b25ebec
3 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gossip-lib/src/storage/events2.rs
View File

@ -55,10 +55,23 @@ impl Storage {
let f = |txn: &mut RwTxn<'a>| -> Result<(), Error> {
self.db_events2()?.put(txn, event.id.as_slice(), &bytes)?;
// If giftwrap, index the inner rumor instead
let mut eventptr: &EventV2 = event;
let rumor: EventV2;
if let Some(r) = self.switch_to_rumor(event, txn)? {
rumor = r;
eventptr = &rumor;
}
// also index the event
self.write_event_ek_pk_index(event, Some(txn))?;
self.write_event_ek_c_index(event, Some(txn))?;
self.write_event_tag_index(event, Some(txn))?;
self.write_event_ek_pk_index(eventptr.id, eventptr.kind, eventptr.pubkey, Some(txn))?;
self.write_event_ek_c_index(
eventptr.id,
eventptr.kind,
eventptr.created_at,
Some(txn),
)?;
self.write_event_tag_index(eventptr, Some(txn))?;
for hashtag in event.hashtags() {
if hashtag.is_empty() {
continue;

63
gossip-lib/src/storage/mod.rs
View File

@ -1682,23 +1682,16 @@ impl Storage {
// We don't call this externally. Whenever we write an event, we do this.
fn write_event_ek_pk_index<'a>(
&'a self,
event: &Event,
id: Id,
kind: EventKind,
pubkey: PublicKey,
rw_txn: Option<&mut RwTxn<'a>>,
) -> Result<(), Error> {
let f = |txn: &mut RwTxn<'a>| -> Result<(), Error> {
let mut event = event;
// If giftwrap, index the inner rumor instead
let rumor_event: Event;
if let Some(rumor) = self.switch_to_rumor(event, txn)? {
rumor_event = rumor;
event = &rumor_event;
}
let ek: u32 = event.kind.into();
let ek: u32 = kind.into();
let mut key: Vec<u8> = ek.to_be_bytes().as_slice().to_owned(); // event kind
key.extend(event.pubkey.as_bytes()); // pubkey
let bytes = event.id.as_slice();
key.extend(pubkey.as_bytes()); // pubkey
let bytes = id.as_slice();
self.db_event_ek_pk_index()?.put(txn, &key, bytes)?;
Ok(())
@ -1719,23 +1712,16 @@ impl Storage {
// We don't call this externally. Whenever we write an event, we do this.
fn write_event_ek_c_index<'a>(
&'a self,
event: &Event,
id: Id,
kind: EventKind,
created_at: Unixtime,
rw_txn: Option<&mut RwTxn<'a>>,
) -> Result<(), Error> {
let f = |txn: &mut RwTxn<'a>| -> Result<(), Error> {
let mut event = event;
// If giftwrap, index the inner rumor instead
let rumor_event: Event;
if let Some(rumor) = self.switch_to_rumor(event, txn)? {
rumor_event = rumor;
event = &rumor_event;
}
let ek: u32 = event.kind.into();
let ek: u32 = kind.into();
let mut key: Vec<u8> = ek.to_be_bytes().as_slice().to_owned(); // event kind
key.extend((i64::MAX - event.created_at.0).to_be_bytes().as_slice()); // reverse created_at
let bytes = event.id.as_slice();
key.extend((i64::MAX - created_at.0).to_be_bytes().as_slice()); // reverse created_at
let bytes = id.as_slice();
self.db_event_ek_c_index()?.put(txn, &key, bytes)?;
Ok(())
@ -2327,9 +2313,28 @@ impl Storage {
for result in self.db_events()?.iter(&loop_txn)? {
let (_key, val) = result?;
let event = Event::read_from_buffer(val)?;
self.write_event_ek_pk_index(&event, Some(txn))?;
self.write_event_ek_c_index(&event, Some(txn))?;
self.write_event_tag_index(&event, Some(txn))?;
// If giftwrap, index the inner rumor instead
let mut eventptr: &Event = &event;
let rumor: Event;
if let Some(r) = self.switch_to_rumor(&event, txn)? {
rumor = r;
eventptr = &rumor;
}
self.write_event_ek_pk_index(
eventptr.id,
eventptr.kind,
eventptr.pubkey,
Some(txn),
)?;
self.write_event_ek_c_index(
eventptr.id,
eventptr.kind,
eventptr.created_at,
Some(txn),
)?;
self.write_event_tag_index(&eventptr, Some(txn))?;
for hashtag in event.hashtags() {
if hashtag.is_empty() {
continue;

9
gossip-lib/src/storage/unindexed_giftwraps1.rs
View File

@ -61,8 +61,13 @@ impl Storage {
let mut txn = self.env.write_txn()?;
for id in ids {
if let Some(event) = self.read_event(id)? {
self.write_event_ek_pk_index(&event, Some(&mut txn))?;
self.write_event_ek_c_index(&event, Some(&mut txn))?;
self.write_event_ek_pk_index(event.id, event.kind, event.pubkey, Some(&mut txn))?;
self.write_event_ek_c_index(
event.id,
event.kind,
event.created_at,
Some(&mut txn),
)?;
self.write_event_tag_index(&event, Some(&mut txn))?;
}
self.db_unindexed_giftwraps1()?