mleku/eventstore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lmdb: remove prefix matching support.
Some checks failed
build cli / make-release (push) Has been cancelled
Details
build cli / build-linux (push) Has been cancelled
Details

Browse Source
This commit is contained in:
fiatjaf
2024-04-15 20:03:33 -03:00
parent 2c866d0852
commit 13db9b84a7
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lmdb/count.go
View File

@@ -46,12 +46,15 @@ func (b *LMDBBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int
for { for {
// we already have a k and a v and an err from the cursor setup, so check and use these // we already have a k and a v and an err from the cursor setup, so check and use these
if iterr != nil || !bytes.HasPrefix(k, q.prefix) { if iterr != nil ||
break len(k) != q.prefixSize+q.timestampSize ||
!bytes.Equal(k[:q.prefixSize], q.prefix) {
// either iteration has errored or we reached the end of this prefix
break // stop this cursor and move to the next one
} }
// "id" indexes don't contain a timestamp // "id" indexes don't contain a timestamp
if !q.skipTimestamp { if q.timestampSize == 4 {
createdAt := binary.BigEndian.Uint32(k[len(k)-4:]) createdAt := binary.BigEndian.Uint32(k[len(k)-4:])
if createdAt < since { if createdAt < since {
break break

23
lmdb/query.go
View File

@@ -18,9 +18,10 @@ type query struct {
i int i int
dbi lmdb.DBI dbi lmdb.DBI
prefix []byte prefix []byte
startingPoint []byte
results chan *nostr.Event results chan *nostr.Event
skipTimestamp bool prefixSize int
timestampSize int
startingPoint []byte
} }
type queryEvent struct { type queryEvent struct {
@@ -70,13 +71,15 @@ func (b *LMDBBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (cha
for { for {
// we already have a k and a v and an err from the cursor setup, so check and use these // we already have a k and a v and an err from the cursor setup, so check and use these
if iterr != nil || !bytes.HasPrefix(k, q.prefix) { if iterr != nil ||
len(k) != q.prefixSize+q.timestampSize ||
!bytes.Equal(k[:q.prefixSize], q.prefix) {
// either iteration has errored or we reached the end of this prefix // either iteration has errored or we reached the end of this prefix
break // stop this cursor and move to the next one break // stop this cursor and move to the next one
} }
// "id" indexes don't contain a timestamp // "id" indexes don't contain a timestamp
if !q.skipTimestamp { if q.timestampSize == 4 {
createdAt := binary.BigEndian.Uint32(k[len(k)-4:]) createdAt := binary.BigEndian.Uint32(k[len(k)-4:])
if createdAt < since { if createdAt < since {
break break
@@ -212,7 +215,7 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
return nil, nil, 0, fmt.Errorf("invalid id '%s'", idHex) return nil, nil, 0, fmt.Errorf("invalid id '%s'", idHex)
} }
prefix, _ := hex.DecodeString(idHex[0 : 8*2]) prefix, _ := hex.DecodeString(idHex[0 : 8*2])
queries[i] = query{i: i, dbi: b.indexId, prefix: prefix, skipTimestamp: true} queries[i] = query{i: i, dbi: b.indexId, prefix: prefix, prefixSize: 8, timestampSize: 0}
} }
} else if len(filter.Authors) > 0 { } else if len(filter.Authors) > 0 {
if len(filter.Kinds) == 0 { if len(filter.Kinds) == 0 {
@@ -222,7 +225,7 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
return nil, nil, 0, fmt.Errorf("invalid pubkey '%s'", pubkeyHex) return nil, nil, 0, fmt.Errorf("invalid pubkey '%s'", pubkeyHex)
} }
prefix, _ := hex.DecodeString(pubkeyHex[0 : 8*2]) prefix, _ := hex.DecodeString(pubkeyHex[0 : 8*2])
queries[i] = query{i: i, dbi: b.indexPubkey, prefix: prefix} queries[i] = query{i: i, dbi: b.indexPubkey, prefix: prefix, prefixSize: 8, timestampSize: 4}
} }
} else { } else {
queries = make([]query, len(filter.Authors)*len(filter.Kinds)) queries = make([]query, len(filter.Authors)*len(filter.Kinds))
@@ -234,7 +237,7 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
} }
pubkey, _ := hex.DecodeString(pubkeyHex[0 : 8*2]) pubkey, _ := hex.DecodeString(pubkeyHex[0 : 8*2])
prefix := binary.BigEndian.AppendUint16(pubkey, uint16(kind)) prefix := binary.BigEndian.AppendUint16(pubkey, uint16(kind))
queries[i] = query{i: i, dbi: b.indexPubkeyKind, prefix: prefix} queries[i] = query{i: i, dbi: b.indexPubkeyKind, prefix: prefix, prefixSize: 10, timestampSize: 4}
i++ i++
} }
} }
@@ -260,7 +263,7 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
dbi, k, offset := b.getTagIndexPrefix(value) dbi, k, offset := b.getTagIndexPrefix(value)
// remove the last parts part to get just the prefix we want here // remove the last parts part to get just the prefix we want here
prefix := k[0:offset] prefix := k[0:offset]
queries[i] = query{i: i, dbi: dbi, prefix: prefix} queries[i] = query{i: i, dbi: dbi, prefix: prefix, prefixSize: len(prefix), timestampSize: 4}
i++ i++
} }
} }
@@ -269,12 +272,12 @@ func (b *LMDBBackend) prepareQueries(filter nostr.Filter) (
for i, kind := range filter.Kinds { for i, kind := range filter.Kinds {
prefix := make([]byte, 2) prefix := make([]byte, 2)
binary.BigEndian.PutUint16(prefix[:], uint16(kind)) binary.BigEndian.PutUint16(prefix[:], uint16(kind))
queries[i] = query{i: i, dbi: b.indexKind, prefix: prefix} queries[i] = query{i: i, dbi: b.indexKind, prefix: prefix, prefixSize: 2, timestampSize: 4}
} }
} else { } else {
queries = make([]query, 1) queries = make([]query, 1)
prefix := make([]byte, 0) prefix := make([]byte, 0)
queries[0] = query{i: 0, dbi: b.indexCreatedAt, prefix: prefix} queries[0] = query{i: 0, dbi: b.indexCreatedAt, prefix: prefix, prefixSize: 0, timestampSize: 4}
extraFilter = nil extraFilter = nil
} }