Fixed multi error and added some tests

Author: dvirsky

redisearch/client.go

@@ -148,16 +148,6 @@ type IndexingOptions struct {
 	Replace  bool
 }
 
-// MultiError Represents one or more errors
-type MultiError map[int]error
-
-func (e MultiError) Error() string {
-	for _, err := range e {
-		return err.Error()
-	}
-	return ""
-}
-
 // DefaultIndexingOptions are the default options for document indexing
 var DefaultIndexingOptions = IndexingOptions{
 	Language: "",
@@ -166,13 +156,13 @@ var DefaultIndexingOptions = IndexingOptions{
 }
 
 // Index indexes multiple documents on the index, with optional Options passed to options
-func (i *Client) IndexOptions(opts IndexingOptions, docs ...Document) (errors MultiError) {
+func (i *Client) IndexOptions(opts IndexingOptions, docs ...Document) error {
 
 	conn := i.pool.Get()
 	defer conn.Close()
 
 	n := 0
-	errors = make(map[int]error)
+	var merr MultiError
 
 	for ii, doc := range docs {
 		args := make(redis.Args, 0, 6+len(doc.Properties))
@@ -199,29 +189,35 @@ func (i *Client) IndexOptions(opts IndexingOptions, docs ...Document) (errors Mu
 		}
 
 		if err := conn.Send("FT.ADD", args...); err != nil {
-			errors[ii] = err
-			return
+			if merr == nil {
+				merr = NewMultiError(len(docs))
+			}
+			merr[ii] = err
+
+			return merr
 		}
 		n++
 	}
 
 	if err := conn.Flush(); err != nil {
-		errors[-1] = err
-		return
+		return err
 	}
 
 	for n > 0 {
 		if _, err := conn.Receive(); err != nil {
-			errors[n-1] = err
+			if merr == nil {
+				merr = NewMultiError(len(docs))
+			}
+			merr[n-1] = err
 		}
 		n--
 	}
 
-	if len(errors) == 0 {
+	if merr == nil {
 		return nil
 	}
 
-	return
+	return merr
 }
 
 // convert the result from a redis query to a proper Document object
@@ -260,7 +256,7 @@ func loadDocument(arr []interface{}, idIdx, scoreIdx, payloadIdx, fieldsIdx int)
 	return doc, nil
 }
 
-func (i *Client) Index(docs ...Document) map[int]error {
+func (i *Client) Index(docs ...Document) error {
 	return i.IndexOptions(DefaultIndexingOptions, docs...)
 }
 

redisearch/multi_error.go

@@ -0,0 +1,25 @@
+package redisearch
+
+import (
+	"fmt"
+)
+
+// MultiError Represents one or more errors
+type MultiError []error
+
+// NewMultiError initializes a multierror with the given len, and all sub-errors set to nil
+func NewMultiError(len int) MultiError {
+	return make(MultiError, len)
+}
+
+// Error returns a string representation of the error, in this case it just chains all the sub errors if they are not nil
+func (e MultiError) Error() string {
+
+	var ret string
+	for i, err := range e {
+		if err != nil {
+			ret += fmt.Sprintf("[%d] %s\n", i, err.Error())
+		}
+	}
+	return ret
+}

redisearch/redisearch_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/RedisLabs/redisearch-go/redisearch"
+	"github.com/stretchr/testify/assert"
 )
 
 func createClient(indexName string) *redisearch.Client {
@@ -42,14 +43,68 @@ func TestClient(t *testing.T) {
 	// Test it again
 	if err := c.IndexOptions(redisearch.DefaultIndexingOptions, docs...); err == nil {
 		t.Fatal("Expected error for duplicate document")
-	} else if len(err) != 100 {
-		t.Fatal("Not enough errors received")
+	} else {
+		if merr, ok := err.(redisearch.MultiError); !ok {
+			t.Fatal("error not a multi error")
+		} else {
+			assert.Equal(t, 100, len(merr))
+			assert.NotEmpty(t, merr)
+			//fmt.Println("Got errors: ", merr)
+		}
 	}
 
 	docs, total, err := c.Search(redisearch.NewQuery("hello world"))
+	assert.Nil(t, err)
+	assert.Equal(t, 100, total)
+	assert.Equal(t, 10, len(docs))
+
 	fmt.Println(docs, total, err)
 }
 
+func TestNumeric(t *testing.T) {
+	c := createClient("testung")
+
+	sc := redisearch.NewSchema(redisearch.DefaultOptions).
+		AddField(redisearch.NewTextField("foo")).
+		AddField(redisearch.NewSortableNumericField("bar"))
+	c.Drop()
+	assert.Nil(t, c.CreateIndex(sc))
+
+	docs := make([]redisearch.Document, 100)
+	for i := 0; i < 100; i++ {
+		docs[i] = redisearch.NewDocument(fmt.Sprintf("doc%d", i), 1).Set("foo", "hello world").Set("bar", i)
+	}
+
+	assert.Nil(t, c.Index(docs...))
+
+	docs, total, err := c.Search(redisearch.NewQuery("hello world @bar:[50 100]").SetFlags(redisearch.QueryNoContent | redisearch.QueryWithScores))
+	assert.Nil(t, err)
+	assert.Equal(t, 10, len(docs))
+	assert.Equal(t, 50, total)
+
+	docs, total, err = c.Search(redisearch.NewQuery("hello world @bar:[40 90]").SetSortBy("bar", false))
+	assert.Nil(t, err)
+	assert.Equal(t, 10, len(docs))
+	assert.Equal(t, 51, total)
+	assert.Equal(t, "doc90", docs[0].Id)
+	assert.Equal(t, "doc89", docs[1].Id)
+	assert.Equal(t, "doc81", docs[9].Id)
+
+	docs, total, err = c.Search(redisearch.NewQuery("hello world @bar:[40 90]").
+		SetSortBy("bar", true).
+		SetReturnFields("foo"))
+	assert.Nil(t, err)
+	assert.Equal(t, 10, len(docs))
+	assert.Equal(t, 51, total)
+	assert.Equal(t, "doc40", docs[0].Id)
+	assert.Equal(t, "hello world", docs[0].Properties["foo"])
+	assert.Nil(t, docs[0].Properties["bar"])
+	assert.Equal(t, "doc41", docs[1].Id)
+	assert.Equal(t, "doc49", docs[9].Id)
+	fmt.Println(docs)
+
+}
+
 func ExampleClient() {
 
 	// Create a client. By default a client is schemaless