Fix Query Not Returning Correct Result Count

datastore.go

@@ -90,47 +90,36 @@ func (d *Datastore) GetSize(key datastore.Key) (int, error) {
 // https://github.com/ipfs/go-datastore/blob/aa9190c18f1576be98e974359fd08c64ca0b5a94/examples/fs.go#L96
 // https://github.com/etcd-io/bbolt#prefix-scans
 func (d *Datastore) Query(q query.Query) (query.Results, error) {
-	resBuilder := query.NewResultBuilder(q)
+	var entries []query.Entry
 	if err := d.db.View(func(tx *bbolt.Tx) error {
 		cursor := tx.Bucket(d.bucket).Cursor()
 		if q.Prefix == "" {
 			for k, v := cursor.First(); k != nil; k, v = cursor.Next() {
-				result := query.Result{}
-				key := datastore.NewKey(string(k))
-				result.Entry.Key = key.String()
+				var entry query.Entry
+				entry.Key = string(k)
 				if !q.KeysOnly {
-					result.Entry.Value = v
-				}
-				select {
-				case resBuilder.Output <- result:
-				default:
-					continue
+					entry.Value = v
 				}
+				entries = append(entries, entry)
 			}
 			return nil
 		}
 		pref := []byte(q.Prefix)
 		for k, v := cursor.Seek(pref); k != nil && bytes.HasPrefix(k, pref); k, v = cursor.Next() {
-			result := query.Result{}
-			key := datastore.NewKey(string(k))
-			result.Entry.Key = key.String()
+			var entry query.Entry
+			entry.Key = string(k)
 			if !q.KeysOnly {
-				result.Entry.Value = v
-			}
-			// initiate a non-blocking channel send
-			select {
-			case resBuilder.Output <- result:
-			default:
-				continue
+				entry.Value = v
 			}
+			entries = append(entries, entry)
 		}
 		return nil
 	}); err != nil {
 		return nil, err
 	}
+	results := query.ResultsWithEntries(q, entries)
 	// close the result builder since we are done using it
-	resBuilder.Process.Close()
-	return resBuilder.Results(), nil
+	return results, nil
 }
 
 // Batch returns a basic batched bolt datastore wrapper

datastore_test.go

@@ -1,6 +1,7 @@
 package dsbbolt
 
 import (
+	"fmt"
 	"testing"
 
 	"reflect"
@@ -41,9 +42,13 @@ func Test_Datastore(t *testing.T) {
 	}
 	defer ds.Close()
 	key := datastore.NewKey("keks")
+	key2 := datastore.NewKey("keks2")
 	if err := ds.Put(key, []byte("hello world")); err != nil {
 		t.Fatal(err)
 	}
+	if err := ds.Put(key2, []byte("hello world")); err != nil {
+		t.Fatal(err)
+	}
 	data, err := ds.Get(key)
 	if err != nil {
 		t.Fatal(err)
@@ -70,7 +75,11 @@ func Test_Datastore(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(res) == 0 {
+	if len(res) != 2 {
+		fmt.Printf("only found %v results \n", len(res))
+		for _, v := range res {
+			fmt.Printf("%+v\n", v)
+		}
 		t.Fatal("bad number of results")
 	}
 	// test a query where we dont specify a search key