From 961c04cae992eadb42d286d2f85f8a675bdc68c8 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 29 Jan 2018 14:17:40 -0800 Subject: Upgrading server dependancies (#8154) --- .../olivere/elastic.v5/bulk_index_request_test.go | 41 ++++++++++++++-------- 1 file changed, 27 insertions(+), 14 deletions(-) (limited to 'vendor/gopkg.in/olivere/elastic.v5/bulk_index_request_test.go') diff --git a/vendor/gopkg.in/olivere/elastic.v5/bulk_index_request_test.go b/vendor/gopkg.in/olivere/elastic.v5/bulk_index_request_test.go index fe95bd65c..79baf51fb 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/bulk_index_request_test.go +++ b/vendor/gopkg.in/olivere/elastic.v5/bulk_index_request_test.go @@ -16,55 +16,56 @@ func TestBulkIndexRequestSerialization(t *testing.T) { }{ // #0 { - Request: NewBulkIndexRequest().Index("index1").Type("tweet").Id("1"). + Request: NewBulkIndexRequest().Index("index1").Type("doc").Id("1"). Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}), Expected: []string{ - `{"index":{"_id":"1","_index":"index1","_type":"tweet"}}`, + `{"index":{"_index":"index1","_id":"1","_type":"doc"}}`, `{"user":"olivere","message":"","retweets":0,"created":"2014-01-18T23:59:58Z"}`, }, }, // #1 { - Request: NewBulkIndexRequest().OpType("create").Index("index1").Type("tweet").Id("1"). + Request: NewBulkIndexRequest().OpType("create").Index("index1").Type("doc").Id("1"). Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}), Expected: []string{ - `{"create":{"_id":"1","_index":"index1","_type":"tweet"}}`, + `{"create":{"_index":"index1","_id":"1","_type":"doc"}}`, `{"user":"olivere","message":"","retweets":0,"created":"2014-01-18T23:59:58Z"}`, }, }, // #2 { - Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("tweet").Id("1"). + Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("doc").Id("1"). Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}), Expected: []string{ - `{"index":{"_id":"1","_index":"index1","_type":"tweet"}}`, + `{"index":{"_index":"index1","_id":"1","_type":"doc"}}`, `{"user":"olivere","message":"","retweets":0,"created":"2014-01-18T23:59:58Z"}`, }, }, // #3 { - Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("tweet").Id("1").RetryOnConflict(42). + Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("doc").Id("1").RetryOnConflict(42). Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}), Expected: []string{ - `{"index":{"_id":"1","_index":"index1","_retry_on_conflict":42,"_type":"tweet"}}`, + `{"index":{"_index":"index1","_id":"1","_type":"doc","retry_on_conflict":42}}`, `{"user":"olivere","message":"","retweets":0,"created":"2014-01-18T23:59:58Z"}`, }, }, // #4 { - Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("tweet").Id("1").Pipeline("my_pipeline"). + Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("doc").Id("1").Pipeline("my_pipeline"). Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}), Expected: []string{ - `{"index":{"_id":"1","_index":"index1","_type":"tweet","pipeline":"my_pipeline"}}`, + `{"index":{"_index":"index1","_id":"1","_type":"doc","pipeline":"my_pipeline"}}`, `{"user":"olivere","message":"","retweets":0,"created":"2014-01-18T23:59:58Z"}`, }, }, // #5 { - Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("tweet").Id("1").TTL("1m"). + Request: NewBulkIndexRequest().OpType("index").Index("index1").Type("doc").Id("1"). + Routing("123"). Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}), Expected: []string{ - `{"index":{"_id":"1","_index":"index1","_ttl":"1m","_type":"tweet"}}`, + `{"index":{"_index":"index1","_id":"1","_type":"doc","routing":"123"}}`, `{"user":"olivere","message":"","retweets":0,"created":"2014-01-18T23:59:58Z"}`, }, }, @@ -92,12 +93,24 @@ func TestBulkIndexRequestSerialization(t *testing.T) { var bulkIndexRequestSerializationResult string func BenchmarkBulkIndexRequestSerialization(b *testing.B) { - r := NewBulkIndexRequest().Index(testIndexName).Type("tweet").Id("1"). - Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}) + b.Run("stdlib", func(b *testing.B) { + r := NewBulkIndexRequest().Index(testIndexName).Type("doc").Id("1"). + Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}) + benchmarkBulkIndexRequestSerialization(b, r.UseEasyJSON(false)) + }) + b.Run("easyjson", func(b *testing.B) { + r := NewBulkIndexRequest().Index(testIndexName).Type("doc").Id("1"). + Doc(tweet{User: "olivere", Created: time.Date(2014, 1, 18, 23, 59, 58, 0, time.UTC)}) + benchmarkBulkIndexRequestSerialization(b, r.UseEasyJSON(true)) + }) +} + +func benchmarkBulkIndexRequestSerialization(b *testing.B, r *BulkIndexRequest) { var s string for n := 0; n < b.N; n++ { s = r.String() r.source = nil // Don't let caching spoil the benchmark } bulkIndexRequestSerializationResult = s // ensure the compiler doesn't optimize + b.ReportAllocs() } -- cgit v1.2.3-1-g7c22