From 1690a2139c12b1687b0abd8666960953f1d269f9 Mon Sep 17 00:00:00 2001 From: 1-6 Date: Sun, 30 Jul 2023 21:40:51 +0800 Subject: [PATCH] x --- core/storage/boltdb/init.go | 10 ++++------ core/storage/redis/init.go | 8 ++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/core/storage/boltdb/init.go b/core/storage/boltdb/init.go index 2814179..006c266 100644 --- a/core/storage/boltdb/init.go +++ b/core/storage/boltdb/init.go @@ -180,11 +180,9 @@ func (bucket *Bucket) Set(key interface{}, value interface{}) (string, bool, err return msg, changed, fin.Error } if fin.Now != "" { - if new == storage.EMPTY { - new = "" - } else { - new = fin.Now - } + + new = fin.Now + } if fin.EndFunc != nil { endFuncs = append(endFuncs, fin.EndFunc) @@ -197,7 +195,7 @@ func (bucket *Bucket) Set(key interface{}, value interface{}) (string, bool, err if err != nil { return err } - if new == "" { + if new == "" || new == storage.EMPTY { if err := b.Delete([]byte(k)); err != nil { return err } diff --git a/core/storage/redis/init.go b/core/storage/redis/init.go index f1de402..856dbf0 100644 --- a/core/storage/redis/init.go +++ b/core/storage/redis/init.go @@ -239,11 +239,7 @@ func (bucket *Bucket) Set(key interface{}, value interface{}) (string, bool, err return msg, changed, fin.Error } if fin.Now != "" { - if new == storage.EMPTY { - new = "" - } else { - new = fin.Now - } + new = fin.Now } if fin.EndFunc != nil { endFuncs = append(endFuncs, fin.EndFunc) @@ -252,7 +248,7 @@ func (bucket *Bucket) Set(key interface{}, value interface{}) (string, bool, err } } var err error - if new == "" { + if new == "" || new == storage.EMPTY { err = db.HDel(ctx, bucket.name, k).Err() } else { err = db.HSet(ctx, bucket.name, k, new).Err()