Susumu Yata
null+****@clear*****
Mon Sep 11 17:51:04 JST 2017
Susumu Yata 2017-09-11 17:51:04 +0900 (Mon, 11 Sep 2017) New Revision: abe18841b731f2d0f3ea325573b5ec3593bcf574 https://github.com/groonga/grnci/commit/abe18841b731f2d0f3ea325573b5ec3593bcf574 Message: Simplify DB.TokenizerList. Ref: #42 Modified files: v2/db.go v2/libgrn/db_test.go Modified: v2/db.go (+9 -10) =================================================================== --- v2/db.go 2017-09-11 17:50:06 +0900 (6fc1c6a) +++ v2/db.go 2017-09-11 17:51:04 +0900 (ddd8806) @@ -2523,26 +2523,25 @@ type DBTokenizer struct { } // TokenizerList executes tokenizer_list. -func (db *DB) TokenizerList() ([]DBTokenizer, Response, error) { +func (db *DB) TokenizerList() ([]DBTokenizer, error) { resp, err := db.Invoke("tokenizer_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 []DBTokenizer - 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() } // Truncate executes truncate. Modified: v2/libgrn/db_test.go (+1 -4) =================================================================== --- v2/libgrn/db_test.go 2017-09-11 17:50:06 +0900 (5acc79e) +++ v2/libgrn/db_test.go 2017-09-11 17:51:04 +0900 (9a0bd02) @@ -785,10 +785,7 @@ func TestDBTokenizerList(t *testing.T) { db, dir := makeDB(t) defer removeDB(db, dir) - result, resp, err := db.TokenizerList() - if err == nil { - err = resp.Err() - } + result, err := db.TokenizerList() if err != nil { t.Fatalf("db.TokenizerList failed: %v", err) } -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20170911/01fbeeec/attachment-0001.htm
