diff --git a/database/rdb.go b/database/rdb.go index 0bbf294..969e3ba 100644 --- a/database/rdb.go +++ b/database/rdb.go @@ -22,14 +22,14 @@ func loadRdbFile(mdb *MultiDB) { _ = rdbFile.Close() }() decoder := rdb.NewDecoder(rdbFile) - err = dumpRDB(decoder, mdb) + err = importRDB(decoder, mdb) if err != nil { logger.Error("dump rdb file failed " + err.Error()) return } } -func dumpRDB(dec *core.Decoder, mdb *MultiDB) error { +func importRDB(dec *core.Decoder, mdb *MultiDB) error { return dec.Parse(func(o rdb.RedisObject) bool { db := mdb.mustSelectDB(o.GetDBIndex()) switch o.GetType() { diff --git a/database/replication.go b/database/replication.go index ccc59d9..e047fac 100644 --- a/database/replication.go +++ b/database/replication.go @@ -285,7 +285,7 @@ func (mdb *MultiDB) doPsync() error { logger.Info(fmt.Sprintf("receive %d bytes of rdb from master", len(psyncData.Arg))) rdbDec := rdb.NewDecoder(bytes.NewReader(psyncData.Arg)) rdbHolder := MakeBasicMultiDB() - err = dumpRDB(rdbDec, rdbHolder) + err = importRDB(rdbDec, rdbHolder) if err != nil { return errors.New("dump rdb failed: " + err.Error()) }