Susumu Yata
null+****@clear*****
Tue Sep 12 16:12:17 JST 2017
Susumu Yata 2017-09-12 16:12:17 +0900 (Tue, 12 Sep 2017) New Revision: 3cbb7d832db58eb5d82dcee9242cbcbfd6d1b626 https://github.com/groonga/grnci/commit/3cbb7d832db58eb5d82dcee9242cbcbfd6d1b626 Message: Simplify DB.NormalizerList. Ref: #42 Modified files: v2/db.go v2/libgrn/db_test.go Modified: v2/db.go (+9 -10) =================================================================== --- v2/db.go 2017-09-12 16:10:49 +0900 (1d1977f) +++ v2/db.go 2017-09-12 16:12:17 +0900 (001c4a3) @@ -999,26 +999,25 @@ type DBNormalizer struct { } // NormalizerList executes normalizer_list. -func (db *DB) NormalizerList() ([]DBNormalizer, Response, error) { +func (db *DB) NormalizerList() ([]DBNormalizer, error) { resp, err := db.Invoke("normalizer_list", nil, nil) if err != nil { - return nil, nil, err + return nil, err } defer resp.Close() jsonData, err := ioutil.ReadAll(resp) if err != nil { - return nil, resp, err + return nil, err } var result []DBNormalizer - if err := json.Unmarshal(jsonData, &result); err != nil { - if resp.Err() != nil { - return nil, resp, nil + if len(jsonData) != 0 { + if err := json.Unmarshal(jsonData, &result); err != nil { + return nil, NewError(ResponseError, "json.Unmarshal failed.", map[string]interface{}{ + "error": err.Error(), + }) } - return nil, resp, NewError(ResponseError, "json.Unmarshal failed.", map[string]interface{}{ - "error": err.Error(), - }) } - return result, resp, nil + return result, resp.Err() } // ObjectExist executes object_exist. Modified: v2/libgrn/db_test.go (+1 -4) =================================================================== --- v2/libgrn/db_test.go 2017-09-12 16:10:49 +0900 (a28c0df) +++ v2/libgrn/db_test.go 2017-09-12 16:12:17 +0900 (db67ad2) @@ -680,10 +680,7 @@ func TestDBNormalizerList(t *testing.T) { db, dir := makeDB(t) defer removeDB(db, dir) - result, resp, err := db.NormalizerList() - if err == nil { - err = resp.Err() - } + result, err := db.NormalizerList() if err != nil { t.Fatalf("db.NormalizerList failed: %v", err) } -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20170912/a8d4234e/attachment-0001.htm
