Susumu Yata
null+****@clear*****
Tue Sep 12 11:20:40 JST 2017
Susumu Yata 2017-09-12 11:20:40 +0900 (Tue, 12 Sep 2017) New Revision: 5b89c42dffc1e04c4f59433deb2a3195ccfe1a3e https://github.com/groonga/grnci/commit/5b89c42dffc1e04c4f59433deb2a3195ccfe1a3e Message: Update and simplify DB.Dump. Ref: #42 Modified files: v2/db.go Modified: v2/db.go (+19 -14) =================================================================== --- v2/db.go 2017-09-12 10:58:05 +0900 (2a3b538) +++ v2/db.go 2017-09-12 11:20:40 +0900 (cbb8f67) @@ -385,11 +385,13 @@ func (db *DB) DeleteByFilter(tbl, filter string) error { // DBDumpOptions stores options for DB.Dump. type DBDumpOptions struct { - Tables string // --table - DumpPlugins bool // --dump_plugins - DumpSchema bool // --dump_schema - DumpRecords bool // --dump_records - DumpIndexes bool // --dump_indexes + Tables []string // --tables + DumpPlugins bool // --dump_plugins + DumpSchema bool // --dump_schema + DumpRecords bool // --dump_records + DumpIndexes bool // --dump_indexes + DumpConfigs bool // --dump_configs + SortHashTable bool // --sort_hash_table } // NewDBDumpOptions returns the default DBDumpOptions. @@ -399,29 +401,32 @@ func NewDBDumpOptions() *DBDumpOptions { DumpSchema: true, DumpRecords: true, DumpIndexes: true, + DumpConfigs: true, } } // Dump executes dump. // On success, it is the caller's responsibility to close the result. -func (db *DB) Dump(options *DBDumpOptions) (io.ReadCloser, Response, error) { +func (db *DB) Dump(options *DBDumpOptions) (io.ReadCloser, error) { if options == nil { options = NewDBDumpOptions() } params := map[string]interface{}{ - "dump_plugins": options.DumpPlugins, - "dump_schema": options.DumpSchema, - "dump_records": options.DumpRecords, - "dump_indexes": options.DumpIndexes, - } - if options.Tables != "" { + "dump_plugins": options.DumpPlugins, + "dump_schema": options.DumpSchema, + "dump_records": options.DumpRecords, + "dump_indexes": options.DumpIndexes, + "dump_configs": options.DumpConfigs, + "sort_hash_table": options.SortHashTable, + } + if len(options.Tables) != 0 { params["tables"] = options.Tables } resp, err := db.Invoke("dump", params, nil) if err != nil { - return nil, nil, err + return nil, err } - return resp, resp, err + return resp, err } // DBIOFlushOptions stores options for DB.IOFlush. -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20170912/cf68fd42/attachment-0001.htm
