nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-09-29 16:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ndb/note: always track note size, add to_owned

Browse Source
This commit is contained in:
William Casarin 2023-12-03 22:12:31 -08:00
parent 59cde41764
commit 9c3b052de2
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Nostr/NostrResponse.swift
View File

@ -84,7 +84,7 @@ enum NostrResponse {
return nil
}
let new_note = note_data.assumingMemoryBound(to: ndb_note.self)
let note = NdbNote(note: new_note, owned_size: Int(len), key: nil)
let note = NdbNote(note: new_note, size: Int(len), owned: true, key: nil)
guard let subid = sized_cstr(cstr: tce.subid, len: tce.subid_len) else {
free(data)

10
nostrdb/Ndb.swift
View File

@ -132,10 +132,11 @@ class Ndb {
}
func lookup_note_by_key_with_txn<Y>(_ key: NoteKey, txn: NdbTxn<Y>) -> NdbNote? {
guard let note_p = ndb_get_note_by_key(&txn.txn, key, nil) else {
var size: Int = 0
guard let note_p = ndb_get_note_by_key(&txn.txn, key, &size) else {
return nil
}
return NdbNote(note: note_p, owned_size: nil, key: key)
return NdbNote(note: note_p, size: size, owned: false, key: key)
}
func text_search(query: String, limit: Int = 32, order: NdbSearchOrder = .newest_first) -> [NoteKey] {
@ -207,11 +208,12 @@ class Ndb {
private func lookup_note_with_txn_inner<Y>(id: NoteId, txn: NdbTxn<Y>) -> NdbNote? {
return id.id.withUnsafeBytes { (ptr: UnsafeRawBufferPointer) -> NdbNote? in
var key: UInt64 = 0
var size: Int = 0
guard let baseAddress = ptr.baseAddress,
let note_p = ndb_get_note_by_id(&txn.txn, baseAddress, nil, &key) else {
let note_p = ndb_get_note_by_id(&txn.txn, baseAddress, &size, &key) else {
return nil
}
return NdbNote(note: note_p, owned_size: nil, key: key)
return NdbNote(note: note_p, size: size, owned: false, key: key)
}
}

20
nostrdb/NdbNote.swift
View File

@ -49,10 +49,10 @@ class NdbNote: Encodable, Equatable, Hashable {
// cached stuff (TODO: remove these)
var decrypted_content: String? = nil
init(note: UnsafeMutablePointer<ndb_note>, owned_size: Int?, key: NoteKey?) {
init(note: UnsafeMutablePointer<ndb_note>, size: Int, owned: Bool, key: NoteKey?) {
self.note = note
self.owned = owned_size != nil
self.count = owned_size ?? 0
self.owned = owned
self.count = size
self.key = key
#if DEBUG_NOTE_SIZE
@ -66,6 +66,18 @@ class NdbNote: Encodable, Equatable, Hashable {
}
func to_owned() -> NdbNote {
if self.owned {
return self
}
let buf = malloc(self.count)!
memcpy(buf, &self.note.pointee, self.count)
let new_note = buf.assumingMemoryBound(to: ndb_note.self)
return NdbNote(note: new_note, size: self.count, owned: true, key: self.key)
}
var content: String {
String(cString: content_raw, encoding: .utf8) ?? ""
}
@ -248,7 +260,7 @@ class NdbNote: Encodable, Equatable, Hashable {
guard let note_data = realloc(data, Int(len)) else { return nil }
let new_note = note_data.assumingMemoryBound(to: ndb_note.self)
return NdbNote(note: new_note, owned_size: Int(len), key: nil)
return NdbNote(note: new_note, size: Int(len), owned: true, key: nil)
}
}

2
nostrdb/NdbTagsIterator.swift
View File

@ -70,7 +70,7 @@ struct TagsSequence: Encodable, Sequence {
}
precondition(false, "sequence subscript oob")
// it seems like the compiler needs this or it gets bitchy
return .init(note: .init(note: .allocate(capacity: 1), owned_size: nil, key: nil), tag: .allocate(capacity: 1))
return .init(note: .init(note: .allocate(capacity: 1), size: 0, owned: true, key: nil), tag: .allocate(capacity: 1))
}
func makeIterator() -> TagsIterator {