From 310f5bae09e5a8887e204720186b05d5c9cd425b Mon Sep 17 00:00:00 2001 From: atyron Date: Thu, 29 Sep 2016 16:10:34 +0300 Subject: [PATCH 1/5] Depends on issue https://github.com/golang/go/issues/5562, added another Unmarshal mechanism --- goes.go | 5 +++-- goes_test.go | 50 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/goes.go b/goes.go index 107ce6a..1b7d46d 100644 --- a/goes.go +++ b/goes.go @@ -353,8 +353,9 @@ func (req *Request) Run() (*Response, error) { } if req.method != "HEAD" { - err = json.Unmarshal(body, &esResp) - if err != nil { + dec := json.NewDecoder(bytes.NewReader(body)) + dec.UseNumber() + if err := dec.Decode(&esResp); err != nil { return esResp, err } err = json.Unmarshal(body, &esResp.Raw) diff --git a/goes_test.go b/goes_test.go index a69fcb1..3c5ee86 100644 --- a/goes_test.go +++ b/goes_test.go @@ -13,6 +13,7 @@ import ( "time" . "github.com/go-check/check" + "encoding/json" ) var ( @@ -21,7 +22,9 @@ var ( ) // Hook up gocheck into the gotest runner. -func Test(t *testing.T) { TestingT(t) } +func Test(t *testing.T) { + TestingT(t) +} type GoesTestSuite struct{} @@ -56,7 +59,7 @@ func (s *GoesTestSuite) TestWithClient(c *C) { c.Assert(conn, DeepEquals, &Connection{ES_HOST, ES_PORT, cl}) c.Assert(conn.Client.Transport.(*http.Transport).DisableCompression, Equals, true) - c.Assert(conn.Client.Transport.(*http.Transport).ResponseHeaderTimeout, Equals, 1*time.Second) + c.Assert(conn.Client.Transport.(*http.Transport).ResponseHeaderTimeout, Equals, 1 * time.Second) } func (s *GoesTestSuite) TestUrl(c *C) { @@ -71,21 +74,21 @@ func (s *GoesTestSuite) TestUrl(c *C) { api: "_search", } - c.Assert(r.Url(), Equals, "http://"+ES_HOST+":"+ES_PORT+"/i/_search") + c.Assert(r.Url(), Equals, "http://" + ES_HOST + ":" + ES_PORT + "/i/_search") r.IndexList = []string{"a", "b"} - c.Assert(r.Url(), Equals, "http://"+ES_HOST+":"+ES_PORT+"/a,b/_search") + c.Assert(r.Url(), Equals, "http://" + ES_HOST + ":" + ES_PORT + "/a,b/_search") r.TypeList = []string{"c", "d"} - c.Assert(r.Url(), Equals, "http://"+ES_HOST+":"+ES_PORT+"/a,b/c,d/_search") + c.Assert(r.Url(), Equals, "http://" + ES_HOST + ":" + ES_PORT + "/a,b/c,d/_search") r.ExtraArgs = make(url.Values, 1) r.ExtraArgs.Set("version", "1") - c.Assert(r.Url(), Equals, "http://"+ES_HOST+":"+ES_PORT+"/a,b/c,d/_search?version=1") + c.Assert(r.Url(), Equals, "http://" + ES_HOST + ":" + ES_PORT + "/a,b/c,d/_search?version=1") r.id = "1234" r.api = "" - c.Assert(r.Url(), Equals, "http://"+ES_HOST+":"+ES_PORT+"/a,b/c,d/1234/?version=1") + c.Assert(r.Url(), Equals, "http://" + ES_HOST + ":" + ES_PORT + "/a,b/c,d/1234/?version=1") } func (s *GoesTestSuite) TestEsDown(c *C) { @@ -735,6 +738,13 @@ func (s *GoesTestSuite) TestSearch(c *C) { } response, err := conn.Search(query, []string{indexName}, []string{docType}, url.Values{}) + + //Type of response.Hits.MaxScore is json.Number, and DeepEquals will return false, + // so we need to change it manualy + jsonNumberMaxScore, _ := response.Hits.MaxScore.(json.Number) + maxScore, _ := jsonNumberMaxScore.Float64() + response.Hits.MaxScore = maxScore + expectedHits := Hits{ Total: 1, MaxScore: 1.0, @@ -1066,18 +1076,30 @@ func (s *GoesTestSuite) TestAggregations(c *C) { c.Assert(user.Buckets()[1].Key(), Equals, "foo") barAge := user.Buckets()[0].Aggregation("age") - c.Assert(barAge["count"], Equals, 1.0) - c.Assert(barAge["sum"], Equals, 30.0) + jCount, _ := barAge["count"].(json.Number) + countInt64, _ := jCount.Int64() + c.Assert(countInt64, Equals, int64(1)) + jSum, _ := barAge["sum"].(json.Number) + sumFloat64, _ := jSum.Float64() + c.Assert(sumFloat64, Equals, 30.0) fooAge := user.Buckets()[1].Aggregation("age") - c.Assert(fooAge["count"], Equals, 1.0) - c.Assert(fooAge["sum"], Equals, 25.0) + jCount, _ = fooAge["count"].(json.Number) + countInt64, _ = jCount.Int64() + c.Assert(countInt64, Equals, int64(1)) + jSum, _ = fooAge["sum"].(json.Number) + sumFloat64, _ = jSum.Float64() + c.Assert(sumFloat64, Equals, 25.0) age, ok := resp.Aggregations["age"] c.Assert(ok, Equals, true) - c.Assert(age["count"], Equals, 2.0) - c.Assert(age["sum"], Equals, 25.0+30.0) + jCount, _ = age["count"].(json.Number) + countInt64, _ = jCount.Int64() + c.Assert(countInt64, Equals, int64(2)) + jSum, _ = age["sum"].(json.Number) + sumFloat64, _ = jSum.Float64() + c.Assert(sumFloat64, Equals, 25.0 + 30.0) } func (s *GoesTestSuite) TestPutMapping(c *C) { @@ -1397,7 +1419,7 @@ func (s *GoesTestSuite) TestRemoveAlias(c *C) { // Get document via alias _, err = conn.Get(aliasName, docType, docId, url.Values{}) - c.Assert(err.Error(), Equals, "[404] IndexMissingException[["+aliasName+"] missing]") + c.Assert(err.Error(), Equals, "[404] IndexMissingException[[" + aliasName + "] missing]") } func (s *GoesTestSuite) TestAliasExists(c *C) { From 229bcec3856e70da94f1836633b0308b77f92fb7 Mon Sep 17 00:00:00 2001 From: atyron Date: Thu, 29 Sep 2016 18:35:59 +0300 Subject: [PATCH 2/5] Fixed TestUpdate from goes_test --- goes_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/goes_test.go b/goes_test.go index 3c5ee86..418f197 100644 --- a/goes_test.go +++ b/goes_test.go @@ -1232,7 +1232,9 @@ func (s *GoesTestSuite) TestUpdate(c *C) { response, err = conn.Get(indexName, docType, docId, url.Values{}) c.Assert(err, Equals, nil) - c.Assert(response.Source["counter"], Equals, float64(6)) + jsonCounter, _ := response.Source["counter"].(json.Number) + counter, _ := jsonCounter.Float64() + c.Assert(counter, Equals, float64(6)) c.Assert(response.Source["user"], Equals, "foo") c.Assert(response.Source["message"], Equals, "bar") From f26a350c81720d8513f233d7a2768352cd606210 Mon Sep 17 00:00:00 2001 From: atyron Date: Thu, 29 Sep 2016 18:39:33 +0300 Subject: [PATCH 3/5] Changed glide config --- glide.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glide.yaml b/glide.yaml index 1942ac4..d56e044 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/OwnLocal/goes +package: github.com/arhitiron/goes import: [] testImport: - package: github.com/go-check/check From 273f50efb6a023935550b1c1eb4765c3fd8b06ed Mon Sep 17 00:00:00 2001 From: atyron Date: Thu, 29 Sep 2016 18:43:24 +0300 Subject: [PATCH 4/5] Fixed panic in TestIndexStatus --- goes_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/goes_test.go b/goes_test.go index 418f197..0b11c49 100644 --- a/goes_test.go +++ b/goes_test.go @@ -835,7 +835,8 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) { expectedShards := Shard{Total: 2, Successful: 1, Failed: 0} c.Assert(response.Shards, Equals, expectedShards) - primarySizeInBytes := response.Indices[indexName].Index["primary_size_in_bytes"].(float64) + jsonPrimarySizeInBytes, _ := response.Indices[indexName].Index["primary_size_in_bytes"].(json.Number) + primarySizeInBytes, _ := jsonPrimarySizeInBytes.Float64() sizeInBytes := response.Indices[indexName].Index["size_in_bytes"].(float64) refreshTotal := response.Indices[indexName].Refresh["total"].(float64) From 7cfa743cd0449d2599bfbbe10d36552e8dfc1031 Mon Sep 17 00:00:00 2001 From: atyron Date: Thu, 29 Sep 2016 18:47:38 +0300 Subject: [PATCH 5/5] Fixed panic: interface conversion: interface is json.Number, not float64 (PC=0x45C1DE) --- goes_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/goes_test.go b/goes_test.go index 0b11c49..a5d232d 100644 --- a/goes_test.go +++ b/goes_test.go @@ -837,8 +837,10 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) { jsonPrimarySizeInBytes, _ := response.Indices[indexName].Index["primary_size_in_bytes"].(json.Number) primarySizeInBytes, _ := jsonPrimarySizeInBytes.Float64() - sizeInBytes := response.Indices[indexName].Index["size_in_bytes"].(float64) - refreshTotal := response.Indices[indexName].Refresh["total"].(float64) + jsonSizeInBytes, _ := response.Indices[indexName].Index["size_in_bytes"].(json.Number) + sizeInBytes, _ := jsonSizeInBytes.Float64() + jsonRefreshTotal, _ := response.Indices[indexName].Refresh["total"].(json.Number) + refreshTotal, _ := jsonRefreshTotal.Float64() c.Assert(primarySizeInBytes > 0, Equals, true) c.Assert(sizeInBytes > 0, Equals, true)