eventstore: a COUNT test and fix many bugs.

eventstore/mmm/count.go

@@ -31,7 +31,8 @@ func (il *IndexingLayer) CountEvents(filter nostr.Filter) (uint32, error) {
 
 			for {
 				// we already have a k and a v and an err from the cursor setup, so check and use these
-				if it.err != nil ||
+				if it.exhausted ||
+					it.err != nil ||
 					len(it.key) != q.keySize ||
 					!bytes.HasPrefix(it.key, q.prefix) {
 					// either iteration has errored or we reached the end of this prefix
@@ -66,16 +67,18 @@ func (il *IndexingLayer) CountEvents(filter nostr.Filter) (uint32, error) {
 					}
 
 					// decode the entire thing (TODO: do a conditional decode while also checking the extra tag)
-					event := &nostr.Event{}
-					if err := betterbinary.Unmarshal(bin, event); err != nil {
-						it.next()
-						continue
-					}
+					if extraTagKey != "" {
+						event := &nostr.Event{}
+						if err := betterbinary.Unmarshal(bin, event); err != nil {
+							it.next()
+							continue
+						}
 
-					// if there is still a tag to be checked, do it now
-					if !event.Tags.ContainsAny(extraTagKey, extraTagValues) {
-						it.next()
-						continue
+						// if there is still a tag to be checked, do it now
+						if !event.Tags.ContainsAny(extraTagKey, extraTagValues) {
+							it.next()
+							continue
+						}
 					}
 
 					count++

eventstore/mmm/mmmm.go

@@ -175,6 +175,21 @@ func (b *MultiMmapManager) EnsureLayer(name string) (*IndexingLayer, error) {
 		err = b.lmdbEnv.View(func(txn *lmdb.Txn) error {
 			txn.RawRead = true
 
+			nameb := []byte(name)
+			if idv, err := txn.Get(b.knownLayers, nameb); err == nil {
+				if err := il.Init(); err != nil {
+					return fmt.Errorf("failed to init read-only layer %s: %w", name, err)
+				}
+				il.id = binary.BigEndian.Uint16(idv)
+				return nil
+			} else {
+				return err
+			}
+		})
+	} else {
+		err = b.lmdbEnv.Update(func(txn *lmdb.Txn) error {
+			txn.RawRead = true
+
 			nameb := []byte(name)
 			if idv, err := txn.Get(b.knownLayers, nameb); lmdb.IsNotFound(err) {
 				if id, err := b.getNextAvailableLayerId(txn); err != nil {
@@ -195,21 +210,6 @@ func (b *MultiMmapManager) EnsureLayer(name string) (*IndexingLayer, error) {
 					return fmt.Errorf("failed to init old layer %s: %w", name, err)
 				}
 
-				return nil
-			} else {
-				return err
-			}
-		})
-	} else {
-		err = b.lmdbEnv.Update(func(txn *lmdb.Txn) error {
-			txn.RawRead = true
-
-			nameb := []byte(name)
-			if idv, err := txn.Get(b.knownLayers, nameb); err == nil {
-				if err := il.Init(); err != nil {
-					return fmt.Errorf("failed to init read-only layer %s: %w", name, err)
-				}
-				il.id = binary.BigEndian.Uint16(idv)
 				return nil
 			} else {
 				return err