mirror
/
ledisdb
mirror of https://github.com/ledisdb/ledisdb.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'copy-bugfix'

This commit is contained in:
siddontang 2014-11-27 20:49:15 +08:00
parent b5c19f08e4 11ba94f4ab
commit 5534390b6b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpl/file_store.go
View File

@ -196,14 +196,15 @@ func (s *FileStore) storeLog(l *Log) error {
func (s *FileStore) PurgeExpired(n int64) error { func (s *FileStore) PurgeExpired(n int64) error {
s.rm.Lock() s.rm.Lock()
purges := []*tableReader{} var purges []*tableReader
t := uint32(time.Now().Unix() - int64(n)) t := uint32(time.Now().Unix() - int64(n))
for i, r := range s.rs { for i, r := range s.rs {
if r.lastTime > t { if r.lastTime > t {
purges = s.rs[0:i] purges = append([]*tableReader{}, s.rs[0:i]...)
s.rs = s.rs[i:] n := copy(s.rs, s.rs[i:])
s.rs = s.rs[0:n]
break break
} }
} }

3
server/snapshot.go
View File

@ -137,8 +137,7 @@ func (s *snapshotStore) purge(create bool) {
} }
if num > 0 { if num > 0 {
names = s.names[0:num] names = append([]string{}, s.names[0:num]...)
n := copy(s.names, s.names[num:]) n := copy(s.names, s.names[num:])
s.names = s.names[0:n] s.names = s.names[0:n]
} }