Susumu Yata
null+****@clear*****
Tue Sep 12 16:03:25 JST 2017
Susumu Yata 2017-09-12 16:03:25 +0900 (Tue, 12 Sep 2017) New Revision: 6ae3d67c36c1f1071ac99f991f7d2e8c1c7c21bc https://github.com/groonga/grnci/commit/6ae3d67c36c1f1071ac99f991f7d2e8c1c7c21bc Message: Simplify DB.LogicalParameters. Ref: #42 Modified files: v2/db.go Modified: v2/db.go (+10 -11) =================================================================== --- v2/db.go 2017-09-12 12:40:23 +0900 (5c50aac) +++ v2/db.go 2017-09-12 16:03:25 +0900 (9c09415) @@ -704,7 +704,7 @@ type DBLogicalParameters struct { } // LogicalParameters executes logical_parameters. -func (db *DB) LogicalParameters(rangeIndex string) (*DBLogicalParameters, Response, error) { +func (db *DB) LogicalParameters(rangeIndex string) (*DBLogicalParameters, error) { var params map[string]interface{} if rangeIndex != "" { params = map[string]interface{}{ @@ -713,23 +713,22 @@ func (db *DB) LogicalParameters(rangeIndex string) (*DBLogicalParameters, Respon } resp, err := db.Invoke("logical_parameters", params, 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 DBLogicalParameters - if err := json.Unmarshal(jsonData, &result); err != nil { - if resp.Err() != nil { - return nil, resp, nil + var result *DBLogicalParameters + 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() } // LogicalRangeFilter executes logical_range_filter. -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20170912/aa452570/attachment-0001.htm
