Susumu Yata
null+****@clear*****
Tue Sep 12 16:31:23 JST 2017
Susumu Yata 2017-09-12 16:31:23 +0900 (Tue, 12 Sep 2017) New Revision: c72364eecb0ec716867547b55906bf2688a97b0f https://github.com/groonga/grnci/commit/c72364eecb0ec716867547b55906bf2688a97b0f Message: Simplify DB.TableList. Ref: #42 Modified files: v2/db.go Modified: v2/db.go (+10 -11) =================================================================== --- v2/db.go 2017-09-12 16:29:19 +0900 (07d96af) +++ v2/db.go 2017-09-12 16:31:23 +0900 (e34cc73) @@ -2288,27 +2288,26 @@ type DBTable struct { } // TableList executes table_list. -func (db *DB) TableList() ([]DBTable, Response, error) { +func (db *DB) TableList() ([]DBTable, error) { resp, err := db.Invoke("table_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 [][]interface{} - 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(), - }) } if len(result) == 0 { - return nil, resp, NewError(ResponseError, "The result is empty.", nil) + return nil, NewError(ResponseError, "The result is empty.", nil) } var fields []string for _, meta := range result[0] { @@ -2359,7 +2358,7 @@ func (db *DB) TableList() ([]DBTable, Response, error) { } tables = append(tables, table) } - return tables, resp, nil + return tables, resp.Err() } // TableRemove executes table_remove. -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20170912/da1b8a34/attachment-0001.htm
