susumu.yata
null+****@clear*****
Thu May 7 11:55:15 JST 2015
susumu.yata 2015-05-07 11:55:15 +0900 (Thu, 07 May 2015) New Revision: 979424dd33dfcd377f7dafc3fa30bb11111a5dde https://github.com/groonga/grnxx/commit/979424dd33dfcd377f7dafc3fa30bb11111a5dde Message: Gnx: insert line breaks. Modified files: go3/gnx/grn.go go3/gnx/grn_test.go Modified: go3/gnx/grn.go (+4 -2) =================================================================== --- go3/gnx/grn.go 2015-05-06 14:22:58 +0900 (1ee316a) +++ go3/gnx/grn.go 2015-05-07 11:55:15 +0900 (b412769) @@ -414,7 +414,8 @@ func (db *GrnDB) InsertRow(tableName string, key interface{}) (bool, Int, error) } // CreateColumn() creates a column. -func (db *GrnDB) CreateColumn(tableName, columnName string, valueType string, options *ColumnOptions) (*GrnColumn, error) { +func (db *GrnDB) CreateColumn(tableName, columnName string, valueType string, + options *ColumnOptions) (*GrnColumn, error) { table, err := db.FindTable(tableName) if err != nil { return nil, err @@ -567,7 +568,8 @@ func (table *GrnTable) InsertRow(key interface{}) (bool, Int, error) { } // CreateColumn() creates a column. -func (table *GrnTable) CreateColumn(name string, valueType string, options *ColumnOptions) (*GrnColumn, error) { +func (table *GrnTable) CreateColumn(name string, valueType string, + options *ColumnOptions) (*GrnColumn, error) { if options == nil { options = NewColumnOptions() } Modified: go3/gnx/grn_test.go (+20 -10) =================================================================== --- go3/gnx/grn_test.go 2015-05-06 14:22:58 +0900 (dded85e) +++ go3/gnx/grn_test.go 2015-05-07 11:55:15 +0900 (9a88bd9) @@ -184,7 +184,8 @@ func TestGrnTableInsertRow(t *testing.T) { } func testGrnTableCreateScalarColumn(t *testing.T, valueType string) { - dirPath, _, db, table, _ := createTempGrnColumn(t, "Table", nil, "Value", valueType, nil) + dirPath, _, db, table, _ := + createTempGrnColumn(t, "Table", nil, "Value", valueType, nil) defer removeTempGrnDB(t, dirPath, db) if column, err := table.FindColumn("_id"); err != nil { @@ -202,7 +203,8 @@ func testGrnTableCreateScalarColumn(t *testing.T, valueType string) { func testGrnTableCreateVectorColumn(t *testing.T, valueType string) { options := NewColumnOptions() options.ColumnType = VectorColumn - dirPath, _, db, table, _ := createTempGrnColumn(t, "Table", nil, "Value", valueType, options) + dirPath, _, db, table, _ := + createTempGrnColumn(t, "Table", nil, "Value", valueType, options) defer removeTempGrnDB(t, dirPath, db) if column, err := table.FindColumn("_id"); err != nil { @@ -221,7 +223,8 @@ func testGrnTableCreateScalarRefColumn(t *testing.T, keyType string) { options := NewTableOptions() options.TableType = PatTable options.KeyType = keyType - dirPath, _, db, table, _ := createTempGrnColumn(t, "Table", options, "Value", "Table", nil) + dirPath, _, db, table, _ := + createTempGrnColumn(t, "Table", options, "Value", "Table", nil) defer removeTempGrnDB(t, dirPath, db) if column, err := table.FindColumn("Value"); err != nil { @@ -247,7 +250,8 @@ func testGrnTableCreateVectorRefColumn(t *testing.T, keyType string) { tableOptions.KeyType = keyType columnOptions := NewColumnOptions() columnOptions.ColumnType = VectorColumn - dirPath, _, db, table, _ := createTempGrnColumn(t, "Table", tableOptions, "Value", "Table", columnOptions) + dirPath, _, db, table, _ := + createTempGrnColumn(t, "Table", tableOptions, "Value", "Table", columnOptions) defer removeTempGrnDB(t, dirPath, db) if column, err := table.FindColumn("Value"); err != nil { @@ -323,7 +327,8 @@ func generateRandomScalarValue(valueType string) interface{} { } func testGrnColumnSetScalarValue(t *testing.T, valueType string) { - dirPath, _, db, table, column := createTempGrnColumn(t, "Table", nil, "Value", valueType, nil) + dirPath, _, db, table, column := + createTempGrnColumn(t, "Table", nil, "Value", valueType, nil) defer removeTempGrnDB(t, dirPath, db) for i := 0; i < 100; i++ { @@ -391,7 +396,8 @@ func generateRandomVectorValue(valueType string) interface{} { func testGrnColumnSetVectorValue(t *testing.T, valueType string) { options := NewColumnOptions() options.ColumnType = VectorColumn - dirPath, _, db, table, column := createTempGrnColumn(t, "Table", nil, "Value", valueType, options) + dirPath, _, db, table, column := + createTempGrnColumn(t, "Table", nil, "Value", valueType, options) defer removeTempGrnDB(t, dirPath, db) for i := 0; i < 100; i++ { @@ -423,7 +429,8 @@ func TestGrnColumnSetValue(t *testing.T) { } func testGrnColumnGetScalarValue(t *testing.T, valueType string) { - dirPath, _, db, table, column := createTempGrnColumn(t, "Table", nil, "Value", valueType, nil) + dirPath, _, db, table, column := + createTempGrnColumn(t, "Table", nil, "Value", valueType, nil) defer removeTempGrnDB(t, dirPath, db) for i := 0; i < 100; i++ { @@ -438,7 +445,8 @@ func testGrnColumnGetScalarValue(t *testing.T, valueType string) { if storedValue, err := column.GetValue(id); err != nil { t.Fatalf("GrnColumn.GetValue() failed: %v", err) } else if !reflect.DeepEqual(value, storedValue) { - t.Fatalf("GrnColumn.GetValue() failed: value = %v, storedValue = %v", value, storedValue) + t.Fatalf("GrnColumn.GetValue() failed: value = %v, storedValue = %v", + value, storedValue) } } } @@ -446,7 +454,8 @@ func testGrnColumnGetScalarValue(t *testing.T, valueType string) { func testGrnColumnGetVectorValue(t *testing.T, valueType string) { options := NewColumnOptions() options.ColumnType = VectorColumn - dirPath, _, db, table, column := createTempGrnColumn(t, "Table", nil, "Value", valueType, options) + dirPath, _, db, table, column := + createTempGrnColumn(t, "Table", nil, "Value", valueType, options) defer removeTempGrnDB(t, dirPath, db) for i := 0; i < 100; i++ { @@ -461,7 +470,8 @@ func testGrnColumnGetVectorValue(t *testing.T, valueType string) { if storedValue, err := column.GetValue(id); err != nil { t.Fatalf("GrnColumn.GetValue() failed: %v", err) } else if !reflect.DeepEqual(value, storedValue) { - t.Fatalf("GrnColumn.GetValue() failed: value = %v, storedValue = %v", value, storedValue) + t.Fatalf("GrnColumn.GetValue() failed: value = %v, storedValue = %v", + value, storedValue) } } -------------- next part -------------- HTML����������������������������...Download