Merge pull request #112 from quickwit-oss/fmassot/fix-msearch-with-multi-indexes

Fix msearch with multi indexes.

Author: fmassot

pkg/quickwit/client/client.go

@@ -205,7 +205,7 @@ func (c *baseClientImpl) createMultiSearchRequests(searchRequests []*SearchReque
 		mr := multiRequest{
 			header: map[string]interface{}{
 				"ignore_unavailable": true,
-				"index":              c.index,
+				"index":              strings.Split(c.index, ","),
 			},
 			body:     searchReq,
 			interval: searchReq.Interval,

pkg/quickwit/client/client_test.go

@@ -93,7 +93,7 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 		jBody, err := simplejson.NewJson(bodyBytes)
 		require.NoError(t, err)
 
-		assert.Equal(t, "my-index", jHeader.Get("index").MustString())
+		assert.Equal(t, "my-index", jHeader.Get("index").MustStringArray()[0])
 		assert.True(t, jHeader.Get("ignore_unavailable").MustBool(false))
 		assert.Empty(t, jHeader.Get("max_concurrent_shard_requests"))
 		assert.False(t, jHeader.Get("ignore_throttled").MustBool())

pkg/quickwit/client/models.go

@@ -8,7 +8,7 @@ import (
 
 // SearchRequest represents a search request
 type SearchRequest struct {
-	Index       string
+	Index       []string
 	Interval    time.Duration
 	Size        int
 	Sort        []map[string]map[string]interface{}

pkg/quickwit/client/search_request.go

@@ -37,7 +37,7 @@ func NewSearchRequestBuilder(interval time.Duration) *SearchRequestBuilder {
 // Build builds and return a search request
 func (b *SearchRequestBuilder) Build() (*SearchRequest, error) {
 	sr := SearchRequest{
-		Index:       b.index,
+		Index:       strings.Split(b.index, ","),
 		Interval:    b.interval,
 		Size:        b.size,
 		Sort:        b.sort,