gvsafronov/tile38
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #509 from tidwall/aofshrink-panic-508

Browse Source 
Fixed panic on AOFSHRINK
This commit is contained in:
Josh Baker 2019-11-17 07:37:41 -07:00 committed by GitHub
commit cc89e10c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/server/aofshrink.go
View File

@ -98,8 +98,8 @@ func (server *Server) aofshrink() {
if value, ok := server.expires.Get(keys[0]); ok { if value, ok := server.expires.Get(keys[0]); ok {
exm = value.(*rhh.Map) exm = value.(*rhh.Map)
} }
var now = time.Now() // used for expiration var now = time.Now().UnixNano() // used for expiration
var count = 0 // the object count var count = 0 // the object count
col.ScanGreaterOrEqual(nextid, false, nil, nil, col.ScanGreaterOrEqual(nextid, false, nil, nil,
func(id string, obj geojson.Object, fields []float64) bool { func(id string, obj geojson.Object, fields []float64) bool {
if count == maxids { if count == maxids {
@ -123,7 +123,7 @@ func (server *Server) aofshrink() {
} }
if exm != nil { if exm != nil {
if at, ok := exm.Get(id); ok { if at, ok := exm.Get(id); ok {
expires := at.(time.Time).Sub(now) expires := at.(int64) - now
if expires > 0 { if expires > 0 {
values = append(values, "ex") values = append(values, "ex")
values = append(values, strconv.FormatFloat(math.Floor(float64(expires)/float64(time.Second)*10)/10, 'f', -1, 64)) values = append(values, strconv.FormatFloat(math.Floor(float64(expires)/float64(time.Second)*10)/10, 'f', -1, 64))