go report fixes

FeatureBaseDB · May 1, 2017 · 2760492 · 2760492
1 parent 6e7eea9
commit 2760492
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/client.go b/client.go
@@ -30,7 +30,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 
-
 package pilosa
 
 import (

diff --git a/client_it_test.go b/client_it_test.go
@@ -358,7 +358,7 @@ func TestErrorResponseNotRead(t *testing.T) {
 	client := NewClientWithURI(uri)
 	response, err := client.Query(testFrame.Bitmap(1), nil)
 	if err == nil {
-		t.Fatalf("Got response: %s", response)
+		t.Fatalf("Got response: %v", response)
 	}
 }
 
@@ -372,7 +372,7 @@ func TestResponseNotRead(t *testing.T) {
 	client := NewClientWithURI(uri)
 	response, err := client.Query(testFrame.Bitmap(1), nil)
 	if err == nil {
-		t.Fatalf("Got response: %s", response)
+		t.Fatalf("Got response: %v", response)
 	}
 }
 
@@ -386,7 +386,7 @@ func TestInvalidResponse(t *testing.T) {
 	client := NewClientWithURI(uri)
 	response, err := client.Query(index.RawQuery("don't care"), nil)
 	if err == nil {
-		t.Fatalf("Got response: %s", response)
+		t.Fatalf("Got response: %v", response)
 	}
 }
 
@@ -443,10 +443,10 @@ func TestResponseWithInvalidType(t *testing.T) {
 	qr := &internal.QueryResponse{
 		Err: "",
 		ColumnAttrSets: []*internal.ColumnAttrSet{
-			&internal.ColumnAttrSet{
+			{
 				ID: 0,
 				Attrs: []*internal.Attr{
-					&internal.Attr{
+					{
 						Type:        9999,
 						StringValue: "NOVAL",
 					},

diff --git a/cluster_test.go b/cluster_test.go
@@ -84,6 +84,9 @@ func TestRemoveHost(t *testing.T) {
 		t.Fatalf("The cluster should contain the host")
 	}
 	uri, err = NewURIFromAddress("db1.pilosa.com:9999")
+	if err != nil {
+		t.Fatal(err)
+	}
 	c.RemoveHost(uri)
 	if len(c.hosts) != 0 {
 		t.Fatalf("The cluster should not contain the host")

diff --git a/orm_test.go b/orm_test.go
@@ -303,7 +303,7 @@ func TestInverseBitmapFailsIfNotEnabled(t *testing.T) {
 		t.Fatal(err)
 	}
 	qry := frame.InverseBitmap(5)
-	if qry.Error == nil {
+	if qry.Error() == nil {
 		t.Fatalf("Creating InverseBitmap query for a frame without inverse frame enabled should fail")
 	}
 }

diff --git a/response.go b/response.go
@@ -185,7 +185,7 @@ func convertInternalAttrsToMap(attrs []*internal.Attr) (attrsMap map[string]inte
 	return attrsMap, nil
 }
 
-// ColumnItem representes a column in the index
+// ColumnItem represents a column in the index
 type ColumnItem struct {
 	ID         uint64
 	Attributes map[string]interface{}

diff --git a/response_test.go b/response_test.go
@@ -48,10 +48,10 @@ func TestNewBitmapResultFromInternal(t *testing.T) {
 	}
 	targetBits := []uint64{5, 10}
 	attrs := []*internal.Attr{
-		&internal.Attr{Key: "name", StringValue: "some string", Type: 1},
-		&internal.Attr{Key: "age", IntValue: 95, Type: 2},
-		&internal.Attr{Key: "registered", BoolValue: true, Type: 3},
-		&internal.Attr{Key: "height", FloatValue: 1.83, Type: 4},
+		{Key: "name", StringValue: "some string", Type: 1},
+		{Key: "age", IntValue: 95, Type: 2},
+		{Key: "registered", BoolValue: true, Type: 3},
+		{Key: "height", FloatValue: 1.83, Type: 4},
 	}
 	bitmap := &internal.Bitmap{
 		Attrs: attrs,
@@ -79,25 +79,25 @@ func TestNewQueryResponseFromInternal(t *testing.T) {
 	}
 	targetBits := []uint64{5, 10}
 	targetCountItems := []*CountResultItem{
-		&CountResultItem{ID: 10, Count: 100},
+		{ID: 10, Count: 100},
 	}
 	attrs := []*internal.Attr{
-		&internal.Attr{Key: "name", StringValue: "some string", Type: 1},
-		&internal.Attr{Key: "age", IntValue: 95, Type: 2},
-		&internal.Attr{Key: "registered", BoolValue: true, Type: 3},
-		&internal.Attr{Key: "height", FloatValue: 1.83, Type: 4},
+		{Key: "name", StringValue: "some string", Type: 1},
+		{Key: "age", IntValue: 95, Type: 2},
+		{Key: "registered", BoolValue: true, Type: 3},
+		{Key: "height", FloatValue: 1.83, Type: 4},
 	}
 	bitmap := &internal.Bitmap{
 		Attrs: attrs,
 		Bits:  []uint64{5, 10},
 	}
 	pairs := []*internal.Pair{
-		&internal.Pair{Key: 10, Count: 100},
+		{Key: 10, Count: 100},
 	}
 	response := &internal.QueryResponse{
 		Results: []*internal.QueryResult{
-			&internal.QueryResult{Bitmap: bitmap},
-			&internal.QueryResult{Pairs: pairs},
+			{Bitmap: bitmap},
+			{Pairs: pairs},
 		},
 		Err: "",
 	}
@@ -151,20 +151,20 @@ func TestNewQueryResponseWithErrorFromInternal(t *testing.T) {
 
 func TestNewQueryResponseFromInternalFailure(t *testing.T) {
 	attrs := []*internal.Attr{
-		&internal.Attr{Key: "name", StringValue: "some string", Type: 99},
+		{Key: "name", StringValue: "some string", Type: 99},
 	}
 	bitmap := &internal.Bitmap{
 		Attrs: attrs,
 	}
 	response := &internal.QueryResponse{
-		Results: []*internal.QueryResult{&internal.QueryResult{Bitmap: bitmap}},
+		Results: []*internal.QueryResult{{Bitmap: bitmap}},
 	}
 	qr, err := newQueryResponseFromInternal(response)
 	if qr != nil && err == nil {
 		t.Fatalf("Should have failed")
 	}
 	response = &internal.QueryResponse{
-		ColumnAttrSets: []*internal.ColumnAttrSet{&internal.ColumnAttrSet{ID: 1, Attrs: attrs}},
+		ColumnAttrSets: []*internal.ColumnAttrSet{{ID: 1, Attrs: attrs}},
 	}
 	qr, err = newQueryResponseFromInternal(response)
 	if qr != nil && err == nil {