susumu.yata
null+****@clear*****
Fri Jul 31 18:20:32 JST 2015
susumu.yata 2015-07-31 18:20:32 +0900 (Fri, 31 Jul 2015) New Revision: d5d1d85629ff5e75402192ade09b382667141028 https://github.com/groonga/grngo/commit/d5d1d85629ff5e75402192ade09b382667141028 Message: Apply go fmt. Modified files: grngo.go grngo_test.go Modified: grngo.go (+2 -2) =================================================================== --- grngo.go 2015-07-31 17:23:12 +0900 (2dd1642) +++ grngo.go 2015-07-31 18:20:32 +0900 (01e2d7f) @@ -1196,7 +1196,7 @@ func (column *Column) getValueType() (reflect.Type, error) { // ((column.c.dimension - depth) >= 2). func (column *Column) traverse(typ reflect.Type, depth int, ptr unsafe.Pointer) (reflect.Value, error) { dimension := int(column.c.dimension) - if (depth == (dimension - 1)) { + if depth == (dimension - 1) { value, err := column.parseVector(ptr) if err != nil { return reflect.Zero(reflect.SliceOf(typ)), err @@ -1216,7 +1216,7 @@ func (column *Column) traverse(typ reflect.Type, depth int, ptr unsafe.Pointer) cValue := *(*[]C.grngo_vector)(unsafe.Pointer(&header)) value := reflect.MakeSlice(sType, 0, len(cValue)) for i := 0; i < len(cValue); i++ { - newValue, err := column.traverse(typ, depth + 1, unsafe.Pointer(&cValue[i])) + newValue, err := column.traverse(typ, depth+1, unsafe.Pointer(&cValue[i])) if err != nil { return reflect.Zero(sType), err } Modified: grngo_test.go (+12 -12) =================================================================== --- grngo_test.go 2015-07-31 17:23:12 +0900 (b51727a) +++ grngo_test.go 2015-07-31 18:20:32 +0900 (6866100) @@ -502,7 +502,7 @@ func TestColumn(t *testing.T) { if !inserted { t.Fatalf("Table.InsertRow() failed") } - ids[i] = id; + ids[i] = id } for _, valueType := range valueTypes { if !testColumn(t, table, valueType, ids) { @@ -568,10 +568,10 @@ func TestRefColumn(t *testing.T) { keyTypes := []string{ "Bool", "Int8", "Int16", "Int32", "Int64", "UInt8", "UInt16", "UInt32", "UInt64", "Float", "Time", "ShortText", -// "TokyoGeoPoint", "WGS84GeoPoint", + //"TokyoGeoPoint", "WGS84GeoPoint", } - refTypes := []string{ "Table" } -// refTypes := []string{ "Table", "[]Table" } + refTypes := []string{"Table"} + //refTypes := []string{ "Table", "[]Table" } for _, keyType := range keyTypes { for _, refType := range refTypes { if !testRefColumn(t, db, keyType, refType) { @@ -590,7 +590,7 @@ func TestInvalidRows(t *testing.T) { if _, err := column.GetValue(id); err == nil { t.Fatalf("Column.GetValue() succeeded for an invalid row") } - if err := column.SetValue(id, int64(id) + 100); err == nil { + if err := column.SetValue(id, int64(id)+100); err == nil { t.Fatalf("Column.SetValue() succeeded for an invalid row") } } @@ -611,14 +611,14 @@ func TestInvalidRows(t *testing.T) { if _, err := column.GetValue(id); err == nil { t.Fatalf("Column.GetValue() succeeded for an invalid row") } - if err := column.SetValue(id, int64(id) + 200); err == nil { + if err := column.SetValue(id, int64(id)+200); err == nil { t.Fatalf("Column.SetValue() succeeded for an invalid row") } } else { if _, err := column.GetValue(id); err != nil { t.Fatalf("Column.GetValue() failed: %v", err) } - if err := column.SetValue(id, int64(id) + 200); err != nil { + if err := column.SetValue(id, int64(id)+200); err != nil { t.Fatalf("Column.GetValue() failed: %v", err) } } @@ -800,11 +800,11 @@ func TestDeepVector(t *testing.T) { } column, err := table.CreateColumn("Ref", "[]Table", nil) var values [][][]byte - values = append(values, [][]byte{ keys[1], keys[2] }) - values = append(values, [][]byte{ keys[2], keys[0] }) - values = append(values, [][]byte{ keys[0], keys[1] }) + values = append(values, [][]byte{keys[1], keys[2]}) + values = append(values, [][]byte{keys[2], keys[0]}) + values = append(values, [][]byte{keys[0], keys[1]}) for i, value := range values { - if err := column.SetValue(uint32(i + 1), value); err != nil { + if err := column.SetValue(uint32(i+1), value); err != nil { t.Fatalf("Column.SetValue() failed: %v", err) } } @@ -813,7 +813,7 @@ func TestDeepVector(t *testing.T) { t.Fatalf("Table.FindColumn() failed: %v", err) } for i := 0; i < len(keys); i++ { - id := uint32(i+1) + id := uint32(i + 1) storedValue, err := column.GetValue(id) if err != nil { t.Fatalf("Column.GetValue() failed: %v", err) -------------- next part -------------- HTML����������������������������...Download