修复各种选项

Author: storezhang

Diff for: client_hash.go

@@ -6,10 +6,10 @@ import (
 	`github.com/go-redis/redis/v8`
 )
 
-func (c *Client) HSet(ctx context.Context, key string, opts ...hashOption) (affected int64, err error) {
-	_options := defaultHashOptions()
+func (c *Client) HSet(ctx context.Context, key string, opts ...fieldOption) (affected int64, err error) {
+	_options := defaultFieldOptions()
 	for _, opt := range opts {
-		opt.applyHash(_options)
+		opt.applyField(_options)
 	}
 
 	values := make([]interface{}, 0, 2*len(_options.fields))
@@ -30,18 +30,18 @@ func (c *Client) HSet(ctx context.Context, key string, opts ...hashOption) (affe
 	return
 }
 
-func (c *Client) HGet(ctx context.Context, key string, field string, value interface{}, opts ...hashOption) (exist bool, err error) {
-	_options := defaultHashOptions()
+func (c *Client) HGet(ctx context.Context, key string, field string, value interface{}, opts ...option) (exist bool, err error) {
+	_options := defaultOptions()
 	for _, opt := range opts {
-		opt.applyHash(_options)
+		opt.apply(_options)
 	}
 
 	var cmd *redis.StringCmd
 	defer func() {
 		exist = redis.Nil != cmd.Err()
 	}()
 
-	if cmd = c.getClient(_options.options).HGet(ctx, key, field); nil != cmd.Err() {
+	if cmd = c.getClient(_options).HGet(ctx, key, field); nil != cmd.Err() {
 		err = cmd.Err()
 	} else {
 		err = c.unmarshal(cmd.Val(), value, _options.label, _options.serializer)
@@ -50,12 +50,12 @@ func (c *Client) HGet(ctx context.Context, key string, field string, value inter
 	return
 }
 
-func (c *Client) HIncrBy(ctx context.Context, key string, field string, value int64, opts ...hashOption) (affected int64, err error) {
-	_options := defaultHashOptions()
+func (c *Client) HIncrBy(ctx context.Context, key string, field string, value int64, opts ...option) (affected int64, err error) {
+	_options := defaultOptions()
 	for _, opt := range opts {
-		opt.applyHash(_options)
+		opt.apply(_options)
 	}
-	affected, err = c.getClient(_options.options).HIncrBy(ctx, key, field, value).Result()
+	affected, err = c.getClient(_options).HIncrBy(ctx, key, field, value).Result()
 
 	return
 }

Diff for: field_option.go

@@ -1,17 +1,21 @@
 package redis
 
 type (
-	fieldOptions struct {
-		serializer serializer
-	}
-
 	fieldOption interface {
 		applyField(options *fieldOptions)
 	}
+
+	fieldOptions struct {
+		*options
+
+		fields []*field
+	}
 )
 
 func defaultFieldOptions() *fieldOptions {
 	return &fieldOptions{
-		serializer: serializerUnknown,
+		options: defaultOptions(),
+
+		fields: make([]*field, 0, 0),
 	}
 }

Diff for: hash_option.go

@@ -1,28 +1,28 @@
 package redis
 
-var _ hashOption = (*hashOptionField)(nil)
+var _ fieldOption = (*optionField)(nil)
 
-type hashOptionField struct {
+type optionField struct {
 	key    string
 	value  interface{}
 	format serializer
 }
 
 // Field 配置字段
-func Field(key string, value interface{}, opts ...fieldOption) *hashOptionField {
-	_options := defaultFieldOptions()
+func Field(key string, value interface{}, opts ...option) *optionField {
+	_options := defaultOptions()
 	for _, opt := range opts {
-		opt.applyField(_options)
+		opt.apply(_options)
 	}
 
-	return &hashOptionField{
+	return &optionField{
 		key:    key,
 		value:  value,
 		format: _options.serializer,
 	}
 }
 
-func (f *hashOptionField) applyHash(options *hashOptions) {
+func (f *optionField) applyField(options *fieldOptions) {
 	options.fields = append(options.fields, &field{
 		key:        f.key,
 		value:      f.value,

Diff for: hash_option_field.go renamed to option_field.go

@@ -1,6 +1,14 @@
 package redis
 
-var _ option = (*optionLabel)(nil)
+var (
+	_ option         = (*optionLabel)(nil)
+	_ valuesOption   = (*optionLabel)(nil)
+	_ fieldOption    = (*optionLabel)(nil)
+	_ rangeOption    = (*optionLabel)(nil)
+	_ countOption    = (*optionLabel)(nil)
+	_ membersOption  = (*optionLabel)(nil)
+	_ intervalOption = (*optionLabel)(nil)
+)
 
 type optionLabel struct {
 	label string
@@ -23,3 +31,27 @@ func Default() *optionLabel {
 func (l *optionLabel) apply(options *options) {
 	options.label = l.label
 }
+
+func (l *optionLabel) applyValues(options *valuesOptions) {
+	options.label = l.label
+}
+
+func (l *optionLabel) applyField(options *fieldOptions) {
+	options.label = l.label
+}
+
+func (l *optionLabel) applyRange(options *rangeOptions) {
+	options.label = l.label
+}
+
+func (l *optionLabel) applyCount(options *countOptions) {
+	options.label = l.label
+}
+
+func (l *optionLabel) applyMembers(options *membersOptions) {
+	options.label = l.label
+}
+
+func (l *optionLabel) applyInterval(options *intervalOptions) {
+	options.label = l.label
+}

Diff for: option_label.go

@@ -1,6 +1,14 @@
 package redis
 
-var _ option = (*optionSerializer)(nil)
+var (
+	_ option         = (*optionSerializer)(nil)
+	_ valuesOption   = (*optionSerializer)(nil)
+	_ fieldOption    = (*optionSerializer)(nil)
+	_ countOption    = (*optionSerializer)(nil)
+	_ rangeOption    = (*optionSerializer)(nil)
+	_ membersOption  = (*optionSerializer)(nil)
+	_ intervalOption = (*optionSerializer)(nil)
+)
 
 type optionSerializer struct {
 	serializer serializer
@@ -101,10 +109,26 @@ func (s *optionSerializer) apply(options *options) {
 	options.serializer = s.serializer
 }
 
-func (s *optionSerializer) applyHash(options *hashOptions) {
+func (s *optionSerializer) applyField(options *fieldOptions) {
 	options.serializer = s.serializer
 }
 
-func (s *optionSerializer) applyField(options *fieldOptions) {
+func (s *optionSerializer) applyValues(options *valuesOptions) {
+	options.serializer = s.serializer
+}
+
+func (s *optionSerializer) applyRange(options *rangeOptions) {
+	options.serializer = s.serializer
+}
+
+func (s *optionSerializer) applyCount(options *countOptions) {
+	options.serializer = s.serializer
+}
+
+func (s *optionSerializer) applyMembers(options *membersOptions) {
+	options.serializer = s.serializer
+}
+
+func (s *optionSerializer) applyInterval(options *intervalOptions) {
 	options.serializer = s.serializer
 }