meta: fix the issue that zero field of Format not applied in refreshS…

…ession (#4033)
juicedata · Aug 31, 2023 · 50e0c30 · 50e0c30
1 parent 94d9c0f
commit 50e0c30
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/meta/base.go b/pkg/meta/base.go
@@ -242,14 +242,16 @@ func (m *baseMeta) Load(checkVersion bool) (*Format, error) {
 	if err != nil {
 		return nil, err
 	}
-	if err = json.Unmarshal(body, &m.fmt); err != nil {
+	var format = new(Format)
+	if err = json.Unmarshal(body, format); err != nil {
 		return nil, fmt.Errorf("json: %s", err)
 	}
 	if checkVersion {
-		if err = m.fmt.CheckVersion(); err != nil {
+		if err = format.CheckVersion(); err != nil {
 			return nil, fmt.Errorf("check version: %s", err)
 		}
 	}
+	m.fmt = *format
 	return &m.fmt, nil
 }
 

diff --git a/pkg/meta/config.go b/pkg/meta/config.go
@@ -60,7 +60,7 @@ type Format struct {
 	Inodes           uint64 `json:",omitempty"`
 	EncryptKey       string `json:",omitempty"`
 	KeyEncrypted     bool   `json:",omitempty"`
-	TrashDays        int    `json:",omitempty"`
+	TrashDays        int
 	MetaVersion      int    `json:",omitempty"`
 	MinClientVersion string `json:",omitempty"`
 	MaxClientVersion string `json:",omitempty"`