Revert "fix(skiplist-handler): Iterate over skiplist and send updates to publisher (#1697)"

This reverts commit e4002b7.

Author: joshua-goldstein

db.go

@@ -941,7 +941,8 @@ func (db *DB) doWrites(lc *z.Closer) {
 
 // batchSet applies a list of badger.Entry. If a request level error occurs it
 // will be returned.
-//   Check(kv.BatchSet(entries))
+//
+//	Check(kv.BatchSet(entries))
 func (db *DB) batchSet(entries []*Entry) error {
 	req, err := db.sendToWriteCh(entries)
 	if err != nil {
@@ -954,9 +955,10 @@ func (db *DB) batchSet(entries []*Entry) error {
 // batchSetAsync is the asynchronous version of batchSet. It accepts a callback
 // function which is called when all the sets are complete. If a request level
 // error occurs, it will be passed back via the callback.
-//   err := kv.BatchSetAsync(entries, func(err error)) {
-//      Check(err)
-//   }
+//
+//	err := kv.BatchSetAsync(entries, func(err error)) {
+//	   Check(err)
+//	}
 func (db *DB) batchSetAsync(entries []*Entry, f func(error)) error {
 	req, err := db.sendToWriteCh(entries)
 	if err != nil {
@@ -1028,26 +1030,6 @@ func (db *DB) HandoverSkiplist(skl *skl.Skiplist, callback func()) error {
 
 	mt := &memTable{sl: skl}
 
-	// Iterate over the skiplist and send the entries to the publisher.
-	it := skl.NewIterator()
-
-	var entries []*Entry
-	for it.SeekToFirst(); it.Valid(); it.Next() {
-		v := it.Value()
-		e := &Entry{
-			Key:       it.Key(),
-			Value:     v.Value,
-			ExpiresAt: v.ExpiresAt,
-			UserMeta:  v.UserMeta,
-		}
-		entries = append(entries, e)
-	}
-	req := &request{
-		Entries: entries,
-	}
-	reqs := []*request{req}
-	db.pub.sendUpdates(reqs)
-
 	select {
 	case db.flushChan <- flushTask{mt: mt, cb: callback}:
 		db.imm = append(db.imm, mt)
@@ -1945,16 +1927,16 @@ func (db *DB) DropPrefix(prefixes ...[]byte) error {
 }
 
 // DropPrefix would drop all the keys with the provided prefix. It does this in the following way:
-// - Stop accepting new writes.
-// - Stop memtable flushes before acquiring lock. Because we're acquring lock here
-//   and memtable flush stalls for lock, which leads to deadlock
-// - Flush out all memtables, skipping over keys with the given prefix, Kp.
-// - Write out the value log header to memtables when flushing, so we don't accidentally bring Kp
-//   back after a restart.
-// - Stop compaction.
-// - Compact L0->L1, skipping over Kp.
-// - Compact rest of the levels, Li->Li, picking tables which have Kp.
-// - Resume memtable flushes, compactions and writes.
+//   - Stop accepting new writes.
+//   - Stop memtable flushes before acquiring lock. Because we're acquring lock here
+//     and memtable flush stalls for lock, which leads to deadlock
+//   - Flush out all memtables, skipping over keys with the given prefix, Kp.
+//   - Write out the value log header to memtables when flushing, so we don't accidentally bring Kp
+//     back after a restart.
+//   - Stop compaction.
+//   - Compact L0->L1, skipping over Kp.
+//   - Compact rest of the levels, Li->Li, picking tables which have Kp.
+//   - Resume memtable flushes, compactions and writes.
 func (db *DB) DropPrefixBlocking(prefixes ...[]byte) error {
 	if len(prefixes) == 0 {
 		return nil

db2_test.go

@@ -996,7 +996,7 @@ func TestKeyCount(t *testing.T) {
 		}()
 
 		write := func(kvs *pb.KVList) error {
-			buf := z.NewBuffer(1<<20, "test")
+			buf := z.NewBuffer(1 << 20, "test")
 			defer buf.Release()
 
 			for _, kv := range kvs.Kv {

db_test.go

@@ -2134,7 +2134,7 @@ func TestMain(m *testing.M) {
 
 func removeDir(dir string) {
 	if err := os.RemoveAll(dir); err != nil {
-		fmt.Printf("Error while removing dir: %v\n", err)
+		panic(err)
 	}
 }