From f799d98564198424a76db1ca221427583b9516c7 Mon Sep 17 00:00:00 2001 From: Yuce Tekol Date: Fri, 9 Feb 2018 17:33:07 +0300 Subject: [PATCH 1/4] Fixes #1092 --- Gopkg.lock | 8 +++++++- server.go | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index ed0469fc0..a8071c915 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -199,6 +199,12 @@ revision = "bfe3c2e8f406bf352bc8df81f98c752224867349" version = "v2.17.11" +[[projects]] + branch = "master" + name = "github.com/shirou/w32" + packages = ["."] + revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b" + [[projects]] name = "github.com/sony/gobreaker" packages = ["."] @@ -274,6 +280,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "53ae0cdcbfa8419b233a0544d7ebb80614af3dd04bebdc0c8f2d3620a87efa91" + inputs-digest = "668c03e22d947dd7e24c4c5e07d7850ed0a2ea9a27d2af1fa0d1cff0e3743b0b" solver-name = "gps-cdcl" solver-version = 1 diff --git a/server.go b/server.go index c8e536c50..83d417abd 100644 --- a/server.go +++ b/server.go @@ -15,6 +15,7 @@ package pilosa import ( + "context" "crypto/tls" "errors" "fmt" @@ -35,7 +36,6 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pilosa/pilosa/diagnostics" "github.com/pilosa/pilosa/internal" - "golang.org/x/net/context" "golang.org/x/sync/errgroup" ) From a2580915ba110238f9dcfe310a870d0791e8e857 Mon Sep 17 00:00:00 2001 From: Yuce Tekol Date: Fri, 9 Feb 2018 17:34:18 +0300 Subject: [PATCH 2/4] remove golang/org context from the lock --- Gopkg.lock | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index a8071c915..f33a9ec4f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -247,12 +247,6 @@ revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" version = "v1.0.0" -[[projects]] - branch = "master" - name = "golang.org/x/net" - packages = ["context"] - revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2" - [[projects]] branch = "master" name = "golang.org/x/sync" From e2c2bd11e45408cea366dface8d0489473b6a205 Mon Sep 17 00:00:00 2001 From: Yuce Tekol Date: Mon, 12 Feb 2018 17:16:38 +0300 Subject: [PATCH 3/4] put back golang.org/x/net dep, required by golang.org/x/sync/errgroup --- Gopkg.lock | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Gopkg.lock b/Gopkg.lock index f33a9ec4f..a8071c915 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -247,6 +247,12 @@ revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" version = "v1.0.0" +[[projects]] + branch = "master" + name = "golang.org/x/net" + packages = ["context"] + revision = "a337091b0525af65de94df2eb7e98bd9962dcbe2" + [[projects]] branch = "master" name = "golang.org/x/sync" From 657ff05e88167b4be628a93d91883e780f470cb4 Mon Sep 17 00:00:00 2001 From: Yuce Tekol Date: Mon, 12 Feb 2018 17:28:49 +0300 Subject: [PATCH 4/4] fix format strings which fail on go/master --- handler_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/handler_test.go b/handler_test.go index 04903c979..585230b15 100644 --- a/handler_test.go +++ b/handler_test.go @@ -357,7 +357,7 @@ func TestHandler_Query_Uint64_Protobuf(t *testing.T) { if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil { t.Fatal(err) } else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypeUint64 { - t.Fatalf("unexpected response type: %s", resp.Results[0].Type) + t.Fatalf("unexpected response type: %d", resp.Results[0].Type) } else if n := resp.Results[0].N; n != 100 { t.Fatalf("unexpected n: %d", n) } @@ -445,7 +445,7 @@ func TestHandler_Query_Bitmap_Protobuf(t *testing.T) { if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil { t.Fatal(err) } else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypeBitmap { - t.Fatalf("unexpected response type: %s", resp.Results[0].Type) + t.Fatalf("unexpected response type: %d", resp.Results[0].Type) } else if bits := resp.Results[0].Bitmap.Bits; !reflect.DeepEqual(bits, []uint64{1, SliceWidth + 1}) { t.Fatalf("unexpected bits: %+v", bits) } else if attrs := resp.Results[0].Bitmap.Attrs; len(attrs) != 3 { @@ -506,7 +506,7 @@ func TestHandler_Query_Bitmap_ColumnAttrs_Protobuf(t *testing.T) { if bits := resp.Results[0].Bitmap.Bits; !reflect.DeepEqual(bits, []uint64{1, SliceWidth + 1}) { t.Fatalf("unexpected bits: %+v", bits) } else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypeBitmap { - t.Fatalf("unexpected response type: %s", resp.Results[0].Type) + t.Fatalf("unexpected response type: %d", resp.Results[0].Type) } else if attrs := resp.Results[0].Bitmap.Attrs; len(attrs) != 3 { t.Fatalf("unexpected attr length: %d", len(attrs)) } else if k, v := attrs[0].Key, attrs[0].StringValue; k != "a" || v != "b" { @@ -579,7 +579,7 @@ func TestHandler_Query_Pairs_Protobuf(t *testing.T) { if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil { t.Fatal(err) } else if rt := resp.Results[0].Type; rt != pilosa.QueryResultTypePairs { - t.Fatalf("unexpected response type: %s", resp.Results[0].Type) + t.Fatalf("unexpected response type: %d", resp.Results[0].Type) } else if a := resp.Results[0].GetPairs(); len(a) != 2 { t.Fatalf("unexpected pair length: %d", len(a)) }