From 0041a3621e1f1bc5c9ca6150474f24640441502b Mon Sep 17 00:00:00 2001
From: fiatjaf <fiatjaf@gmail.com>
Date: Thu, 9 Nov 2023 13:27:41 -0300
Subject: [PATCH] cleanup.

---
 badger/delete.go       |  9 +++++++--
 badger/lib.go          | 20 --------------------
 badger/query.go        |  3 ++-
 elasticsearch/query.go |  2 --
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/badger/delete.go b/badger/delete.go
index bf7a9fa..d32887c 100644
--- a/badger/delete.go
+++ b/badger/delete.go
@@ -10,6 +10,8 @@ import (
 	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
+var serialDelete uint32 = 0
+
 func (b *BadgerBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
 	deletionHappened := false
 
@@ -70,8 +72,11 @@ func (b *BadgerBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error
 
 	// after deleting, run garbage collector
 	if deletionHappened {
-		if err := b.RunValueLogGC(0.8); err != nil && err != badger.ErrNoRewrite {
-			log.Println("badger gc errored:" + err.Error())
+		serialDelete = (serialDelete + 1) % 256
+		if serialDelete == 0 {
+			if err := b.RunValueLogGC(0.8); err != nil && err != badger.ErrNoRewrite {
+				log.Println("badger gc errored:" + err.Error())
+			}
 		}
 	}
 
diff --git a/badger/lib.go b/badger/lib.go
index 67d3db8..f895589 100644
--- a/badger/lib.go
+++ b/badger/lib.go
@@ -44,26 +44,6 @@ func (b *BadgerBackend) Init() error {
 		b.MaxLimit = 500
 	}
 
-	// DEBUG: inspecting keys on startup
-	// db.View(func(txn *badger.Txn) error {
-	// 	opts := badger.DefaultIteratorOptions
-	// 	opts.PrefetchSize = 10
-	// 	it := txn.NewIterator(opts)
-	// 	defer it.Close()
-	// 	for it.Rewind(); it.Valid(); it.Next() {
-	// 		item := it.Item()
-	// 		k := item.Key()
-	// 		err := item.Value(func(v []byte) error {
-	// 			fmt.Println("key:", k)
-	// 			return nil
-	// 		})
-	// 		if err != nil {
-	// 			return err
-	// 		}
-	// 	}
-	// 	return nil
-	// })
-
 	return nil
 }
 
diff --git a/badger/query.go b/badger/query.go
index bc8e1f1..b408dc6 100644
--- a/badger/query.go
+++ b/badger/query.go
@@ -71,7 +71,8 @@ func (b BadgerBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (ch
 							if err == badger.ErrDiscardedTxn {
 								return
 							}
-							log.Printf("badger: (%v) failed to get %d from raw event store: %s\n", q, idx, err)
+							log.Printf("badger: failed to get %d based on prefix %x from raw event store: %s\n",
+								idx, q.prefix, err)
 							return
 						}
 						err = item.Value(func(val []byte) error {
diff --git a/elasticsearch/query.go b/elasticsearch/query.go
index 1167012..fb29f09 100644
--- a/elasticsearch/query.go
+++ b/elasticsearch/query.go
@@ -158,7 +158,6 @@ func (ess *ElasticsearchStorage) QueryEvents(ctx context.Context, filter nostr.F
 
 	if res.IsError() {
 		txt, _ := io.ReadAll(res.Body)
-		fmt.Println("oh no", string(txt))
 		return nil, fmt.Errorf("%s", txt)
 	}
 
@@ -248,7 +247,6 @@ func (ess *ElasticsearchStorage) CountEvents(ctx context.Context, filter nostr.F
 
 	if res.IsError() {
 		txt, _ := io.ReadAll(res.Body)
-		fmt.Println("oh no", string(txt))
 		return 0, fmt.Errorf("%s", txt)
 	}