From 310f5bae09e5a8887e204720186b05d5c9cd425b Mon Sep 17 00:00:00 2001
From: atyron <ant@norse.digital>
Date: Thu, 29 Sep 2016 16:10:34 +0300
Subject: [PATCH 1/9] 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 <ant@norse.digital>
Date: Thu, 29 Sep 2016 18:35:59 +0300
Subject: [PATCH 2/9] 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 <ant@norse.digital>
Date: Thu, 29 Sep 2016 18:39:33 +0300
Subject: [PATCH 3/9] 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 <ant@norse.digital>
Date: Thu, 29 Sep 2016 18:43:24 +0300
Subject: [PATCH 4/9] 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 <ant@norse.digital>
Date: Thu, 29 Sep 2016 18:47:38 +0300
Subject: [PATCH 5/9] 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)
From c90b310032b839067e3561d678564fd1a4a2bb40 Mon Sep 17 00:00:00 2001
From: atyron <ant@norse.digital>
Date: Thu, 29 Sep 2016 18:57:24 +0300
Subject: [PATCH 6/9] Changed GoesTestSuite.TestIndexStatus, put json.Numbers
as a field in expected map
---
goes_test.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/goes_test.go b/goes_test.go
index a5d232d..c108c41 100644
--- a/goes_test.go
+++ b/goes_test.go
@@ -849,8 +849,8 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
expectedIndices := map[string]IndexStatus{
indexName: {
Index: map[string]interface{}{
- "primary_size_in_bytes": primarySizeInBytes,
- "size_in_bytes": sizeInBytes,
+ "primary_size_in_bytes": jsonPrimarySizeInBytes,
+ "size_in_bytes": jsonSizeInBytes,
},
Translog: map[string]uint64{
"operations": 0,
@@ -870,7 +870,7 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
"total_size_in_bytes": float64(0),
},
Refresh: map[string]interface{}{
- "total": refreshTotal,
+ "total": jsonRefreshTotal,
"total_time_in_millis": float64(0),
},
Flush: map[string]interface{}{
From dacbc705393b1a20f091497703b650bcc40ec416 Mon Sep 17 00:00:00 2001
From: atyron <ant@norse.digital>
Date: Thu, 29 Sep 2016 19:38:49 +0300
Subject: [PATCH 7/9] Changed GoesTestSuite.TestIndexStatus, put json.Numbers
as a field in expected map
---
goes_test.go | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/goes_test.go b/goes_test.go
index c108c41..5afcba4 100644
--- a/goes_test.go
+++ b/goes_test.go
@@ -846,6 +846,9 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
c.Assert(sizeInBytes > 0, Equals, true)
c.Assert(refreshTotal > 0, Equals, true)
+ var mockNullValue json.Number
+ mockNullValue = "0"
+
expectedIndices := map[string]IndexStatus{
indexName: {
Index: map[string]interface{}{
@@ -861,21 +864,21 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
"deleted_docs": 0,
},
Merges: map[string]interface{}{
- "current": float64(0),
- "current_docs": float64(0),
- "current_size_in_bytes": float64(0),
- "total": float64(0),
- "total_time_in_millis": float64(0),
- "total_docs": float64(0),
- "total_size_in_bytes": float64(0),
+ "current": mockNullValue,
+ "current_docs": mockNullValue,
+ "current_size_in_bytes": mockNullValue,
+ "total": mockNullValue,
+ "total_time_in_millis": mockNullValue,
+ "total_docs": mockNullValue,
+ "total_size_in_bytes": mockNullValue,
},
Refresh: map[string]interface{}{
"total": jsonRefreshTotal,
- "total_time_in_millis": float64(0),
+ "total_time_in_millis": mockNullValue,
},
Flush: map[string]interface{}{
- "total": float64(0),
- "total_time_in_millis": float64(0),
+ "total": mockNullValue,
+ "total_time_in_millis": mockNullValue,
},
},
}
From d5bd8993110f5d8c292b1e9ebf1285504356054d Mon Sep 17 00:00:00 2001
From: atyron <ant@norse.digital>
Date: Thu, 29 Sep 2016 19:45:22 +0300
Subject: [PATCH 8/9] Fixed tests, returns glide config
---
glide.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glide.yaml b/glide.yaml
index d56e044..1942ac4 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,4 +1,4 @@
-package: github.com/arhitiron/goes
+package: github.com/OwnLocal/goes
import: []
testImport:
- package: github.com/go-check/check
From 658df7cd947e847a11debb8ebc5dca22dd268878 Mon Sep 17 00:00:00 2001
From: atyron <ant@norse.digital>
Date: Wed, 5 Oct 2016 09:30:45 +0300
Subject: [PATCH 9/9] Added field, which specify alternative unmarshal
behaviour
---
goes.go | 28 ++++++++++++---
goes_test.go | 96 ++++++++++++++++++----------------------------------
structs.go | 3 ++
3 files changed, 60 insertions(+), 67 deletions(-)
diff --git a/goes.go b/goes.go
index 1b7d46d..7a57c72 100644
--- a/goes.go
+++ b/goes.go
@@ -32,7 +32,7 @@ func (err *SearchError) Error() string {
// This function is pretty useless for now but might be useful in a near future
// if wee need more features like connection pooling or load balancing.
func NewConnection(host string, port string) *Connection {
- return &Connection{host, port, http.DefaultClient}
+ return &Connection{host, port, http.DefaultClient, false}
}
func (c *Connection) WithClient(cl *http.Client) *Connection {
@@ -342,6 +342,27 @@ func (c *Connection) Delete(d Document, extraArgs url.Values) (*Response, error)
return r.Run()
}
+// Enable use number behaviour
+func (c *Connection) UseNumberEnable() {
+ c.UseNumber = true
+}
+
+func (req *Request) unmarshalBody(body []byte, esResp *Response) error {
+ if !req.Conn.UseNumber {
+ err := json.Unmarshal(body, esResp)
+ if err != nil {
+ return err
+ }
+ } else {
+ dec := json.NewDecoder(bytes.NewReader(body))
+ dec.UseNumber()
+ if err := dec.Decode(esResp); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
// Run executes an elasticsearch Request. It converts data to Json, sends the
// request and returns the Response obtained
func (req *Request) Run() (*Response, error) {
@@ -353,9 +374,8 @@ func (req *Request) Run() (*Response, error) {
}
if req.method != "HEAD" {
- dec := json.NewDecoder(bytes.NewReader(body))
- dec.UseNumber()
- if err := dec.Decode(&esResp); err != nil {
+ err = req.unmarshalBody(body, esResp)
+ if err != nil {
return esResp, err
}
err = json.Unmarshal(body, &esResp.Raw)
diff --git a/goes_test.go b/goes_test.go
index 5afcba4..c5c583d 100644
--- a/goes_test.go
+++ b/goes_test.go
@@ -13,7 +13,6 @@ import (
"time"
. "github.com/go-check/check"
- "encoding/json"
)
var (
@@ -22,9 +21,7 @@ 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{}
@@ -44,7 +41,7 @@ func (s *GoesTestSuite) SetUpTest(c *C) {
func (s *GoesTestSuite) TestNewConnection(c *C) {
conn := NewConnection(ES_HOST, ES_PORT)
- c.Assert(conn, DeepEquals, &Connection{ES_HOST, ES_PORT, http.DefaultClient})
+ c.Assert(conn, DeepEquals, &Connection{ES_HOST, ES_PORT, http.DefaultClient, false})
}
func (s *GoesTestSuite) TestWithClient(c *C) {
@@ -57,9 +54,9 @@ func (s *GoesTestSuite) TestWithClient(c *C) {
}
conn := NewConnection(ES_HOST, ES_PORT).WithClient(cl)
- c.Assert(conn, DeepEquals, &Connection{ES_HOST, ES_PORT, cl})
+ c.Assert(conn, DeepEquals, &Connection{ES_HOST, ES_PORT, cl, false})
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) {
@@ -74,21 +71,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) {
@@ -738,13 +735,6 @@ 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,
@@ -835,25 +825,19 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
expectedShards := Shard{Total: 2, Successful: 1, Failed: 0}
c.Assert(response.Shards, Equals, expectedShards)
- jsonPrimarySizeInBytes, _ := response.Indices[indexName].Index["primary_size_in_bytes"].(json.Number)
- primarySizeInBytes, _ := jsonPrimarySizeInBytes.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()
+ primarySizeInBytes := response.Indices[indexName].Index["primary_size_in_bytes"].(float64)
+ sizeInBytes := response.Indices[indexName].Index["size_in_bytes"].(float64)
+ refreshTotal := response.Indices[indexName].Refresh["total"].(float64)
c.Assert(primarySizeInBytes > 0, Equals, true)
c.Assert(sizeInBytes > 0, Equals, true)
c.Assert(refreshTotal > 0, Equals, true)
- var mockNullValue json.Number
- mockNullValue = "0"
-
expectedIndices := map[string]IndexStatus{
indexName: {
Index: map[string]interface{}{
- "primary_size_in_bytes": jsonPrimarySizeInBytes,
- "size_in_bytes": jsonSizeInBytes,
+ "primary_size_in_bytes": primarySizeInBytes,
+ "size_in_bytes": sizeInBytes,
},
Translog: map[string]uint64{
"operations": 0,
@@ -864,21 +848,21 @@ func (s *GoesTestSuite) TestIndexStatus(c *C) {
"deleted_docs": 0,
},
Merges: map[string]interface{}{
- "current": mockNullValue,
- "current_docs": mockNullValue,
- "current_size_in_bytes": mockNullValue,
- "total": mockNullValue,
- "total_time_in_millis": mockNullValue,
- "total_docs": mockNullValue,
- "total_size_in_bytes": mockNullValue,
+ "current": float64(0),
+ "current_docs": float64(0),
+ "current_size_in_bytes": float64(0),
+ "total": float64(0),
+ "total_time_in_millis": float64(0),
+ "total_docs": float64(0),
+ "total_size_in_bytes": float64(0),
},
Refresh: map[string]interface{}{
- "total": jsonRefreshTotal,
- "total_time_in_millis": mockNullValue,
+ "total": refreshTotal,
+ "total_time_in_millis": float64(0),
},
Flush: map[string]interface{}{
- "total": mockNullValue,
- "total_time_in_millis": mockNullValue,
+ "total": float64(0),
+ "total_time_in_millis": float64(0),
},
},
}
@@ -1082,30 +1066,18 @@ func (s *GoesTestSuite) TestAggregations(c *C) {
c.Assert(user.Buckets()[1].Key(), Equals, "foo")
barAge := user.Buckets()[0].Aggregation("age")
- 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)
+ c.Assert(barAge["count"], Equals, 1.0)
+ c.Assert(barAge["sum"], Equals, 30.0)
fooAge := user.Buckets()[1].Aggregation("age")
- 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)
+ c.Assert(fooAge["count"], Equals, 1.0)
+ c.Assert(fooAge["sum"], Equals, 25.0)
age, ok := resp.Aggregations["age"]
c.Assert(ok, Equals, true)
- 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)
+ c.Assert(age["count"], Equals, 2.0)
+ c.Assert(age["sum"], Equals, 25.0+30.0)
}
func (s *GoesTestSuite) TestPutMapping(c *C) {
@@ -1238,9 +1210,7 @@ func (s *GoesTestSuite) TestUpdate(c *C) {
response, err = conn.Get(indexName, docType, docId, url.Values{})
c.Assert(err, Equals, nil)
- jsonCounter, _ := response.Source["counter"].(json.Number)
- counter, _ := jsonCounter.Float64()
- c.Assert(counter, Equals, float64(6))
+ c.Assert(response.Source["counter"], Equals, float64(6))
c.Assert(response.Source["user"], Equals, "foo")
c.Assert(response.Source["message"], Equals, "bar")
@@ -1427,7 +1397,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) {
diff --git a/structs.go b/structs.go
index c726461..70bdbab 100644
--- a/structs.go
+++ b/structs.go
@@ -20,6 +20,9 @@ type Connection struct {
// Client is the http client used to make requests, allowing settings things
// such as timeouts etc
Client *http.Client
+
+ // Specify to use numbers when unmarshal
+ UseNumber bool
}
// Represents a Request to elasticsearch