fix: isEmptyValue Struct only support time.Time

Author: Guo Hui

commands.go

@@ -156,7 +156,11 @@ func isEmptyValue(v reflect.Value) bool {
 	case reflect.Interface, reflect.Pointer:
 		return v.IsNil()
 	case reflect.Struct:
-		return v.IsZero()
+		if v.Type() == reflect.TypeOf(time.Time{}) {
+			return v.IsZero()
+		}
+		// Only supports the struct time.Time,
+		// subsequent iterations will follow the func Scan support decoder.
 	}
 	return false
 }

commands_test.go

@@ -2585,7 +2585,7 @@ var _ = Describe("Commands", func() {
 				Set3 time.Duration `redis:"set3,omitempty"`
 				Set4 string        `redis:"set4,omitempty"`
 				Set5 time.Time     `redis:"set5,omitempty"`
-				Set6 childStruct   `redis:"set6,omitempty"`
+				Set6 *numberStruct `redis:"set6,omitempty"`
 			}
 
 			hSet = client.HSet(ctx, "hash3", &setOmitEmpty{
@@ -2598,6 +2598,7 @@ var _ = Describe("Commands", func() {
 			Expect(hGetAll.Err()).NotTo(HaveOccurred())
 			Expect(hGetAll.Val()).To(Equal(map[string]string{
 				"set1": "val",
+				"set6": `{"Number":0}`,
 			}))
 			var hash3 setOmitEmpty
 			Expect(hGetAll.Scan(&hash3)).NotTo(HaveOccurred())
@@ -2606,13 +2607,12 @@ var _ = Describe("Commands", func() {
 			Expect(hash3.Set3).To(Equal(time.Duration(0)))
 			Expect(hash3.Set4).To(Equal(""))
 			Expect(hash3.Set5).To(Equal(time.Time{}))
-			Expect(hash3.Set6).To(Equal(childStruct{}))
+			Expect(hash3.Set6).To(Equal(numberStruct{}))
 
-			now := time.Now()
 			hSet = client.HSet(ctx, "hash4", setOmitEmpty{
 				Set1: "val",
-				Set6: childStruct{
-					Date: now,
+				Set6: &numberStruct{
+					Number: 5,
 				},
 			})
 			Expect(hSet.Err()).NotTo(HaveOccurred())
@@ -2622,7 +2622,7 @@ var _ = Describe("Commands", func() {
 			Expect(hGetAll.Err()).NotTo(HaveOccurred())
 			Expect(hGetAll.Val()).To(Equal(map[string]string{
 				"set1": "val",
-				"set6": fmt.Sprintf("{\"Date\":\"%s\"}", now.Format(time.RFC3339Nano)),
+				"set6": `{"Number":5}`,
 			}))
 		})
 
@@ -7665,12 +7665,16 @@ type numberStruct struct {
 	Number int
 }
 
-func (s *numberStruct) MarshalBinary() ([]byte, error) {
-	return json.Marshal(s)
+func (n *numberStruct) MarshalBinary() ([]byte, error) {
+	return json.Marshal(n)
+}
+
+func (n *numberStruct) UnmarshalBinary(b []byte) error {
+	return json.Unmarshal(b, n)
 }
 
-func (s *numberStruct) UnmarshalBinary(b []byte) error {
-	return json.Unmarshal(b, s)
+func (n *numberStruct) ScanRedis(str string) error {
+	return json.Unmarshal([]byte(str), n)
 }
 
 func deref(viface interface{}) interface{} {
@@ -7680,15 +7684,3 @@ func deref(viface interface{}) interface{} {
 	}
 	return v.Interface()
 }
-
-type childStruct struct {
-	Date time.Time `redis:"date,omitempty"`
-}
-
-func (c childStruct) MarshalBinary() ([]byte, error) {
-	return json.Marshal(&c)
-}
-
-func (c childStruct) UnmarshalBinary(data []byte) error {
-	return json.Unmarshal(data, &c)
-}