Skip to content

Commit d8e3e95

Browse files
authored
return raw value instead of funcation calling in Result() (#2831)
Signed-off-by: lowang-bh <[email protected]>
1 parent 0022923 commit d8e3e95

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

command.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ func (cmd *StringCmd) Val() string {
854854
}
855855

856856
func (cmd *StringCmd) Result() (string, error) {
857-
return cmd.Val(), cmd.err
857+
return cmd.val, cmd.err
858858
}
859859

860860
func (cmd *StringCmd) Bytes() ([]byte, error) {
@@ -958,7 +958,7 @@ func (cmd *FloatCmd) Val() float64 {
958958
}
959959

960960
func (cmd *FloatCmd) Result() (float64, error) {
961-
return cmd.Val(), cmd.Err()
961+
return cmd.val, cmd.err
962962
}
963963

964964
func (cmd *FloatCmd) String() string {
@@ -1053,7 +1053,7 @@ func (cmd *StringSliceCmd) Val() []string {
10531053
}
10541054

10551055
func (cmd *StringSliceCmd) Result() ([]string, error) {
1056-
return cmd.Val(), cmd.Err()
1056+
return cmd.val, cmd.err
10571057
}
10581058

10591059
func (cmd *StringSliceCmd) String() string {
@@ -2715,7 +2715,7 @@ func (cmd *ZWithKeyCmd) Val() *ZWithKey {
27152715
}
27162716

27172717
func (cmd *ZWithKeyCmd) Result() (*ZWithKey, error) {
2718-
return cmd.Val(), cmd.Err()
2718+
return cmd.val, cmd.err
27192719
}
27202720

27212721
func (cmd *ZWithKeyCmd) String() string {
@@ -2853,7 +2853,7 @@ func (cmd *ClusterSlotsCmd) Val() []ClusterSlot {
28532853
}
28542854

28552855
func (cmd *ClusterSlotsCmd) Result() ([]ClusterSlot, error) {
2856-
return cmd.Val(), cmd.Err()
2856+
return cmd.val, cmd.err
28572857
}
28582858

28592859
func (cmd *ClusterSlotsCmd) String() string {
@@ -3313,7 +3313,7 @@ func (cmd *GeoPosCmd) Val() []*GeoPos {
33133313
}
33143314

33153315
func (cmd *GeoPosCmd) Result() ([]*GeoPos, error) {
3316-
return cmd.Val(), cmd.Err()
3316+
return cmd.val, cmd.err
33173317
}
33183318

33193319
func (cmd *GeoPosCmd) String() string {
@@ -3394,7 +3394,7 @@ func (cmd *CommandsInfoCmd) Val() map[string]*CommandInfo {
33943394
}
33953395

33963396
func (cmd *CommandsInfoCmd) Result() (map[string]*CommandInfo, error) {
3397-
return cmd.Val(), cmd.Err()
3397+
return cmd.val, cmd.err
33983398
}
33993399

34003400
func (cmd *CommandsInfoCmd) String() string {
@@ -3584,7 +3584,7 @@ func (cmd *SlowLogCmd) Val() []SlowLog {
35843584
}
35853585

35863586
func (cmd *SlowLogCmd) Result() ([]SlowLog, error) {
3587-
return cmd.Val(), cmd.Err()
3587+
return cmd.val, cmd.err
35883588
}
35893589

35903590
func (cmd *SlowLogCmd) String() string {
@@ -3683,7 +3683,7 @@ func (cmd *MapStringInterfaceCmd) Val() map[string]interface{} {
36833683
}
36843684

36853685
func (cmd *MapStringInterfaceCmd) Result() (map[string]interface{}, error) {
3686-
return cmd.Val(), cmd.Err()
3686+
return cmd.val, cmd.err
36873687
}
36883688

36893689
func (cmd *MapStringInterfaceCmd) String() string {
@@ -3747,7 +3747,7 @@ func (cmd *MapStringStringSliceCmd) Val() []map[string]string {
37473747
}
37483748

37493749
func (cmd *MapStringStringSliceCmd) Result() ([]map[string]string, error) {
3750-
return cmd.Val(), cmd.Err()
3750+
return cmd.val, cmd.err
37513751
}
37523752

37533753
func (cmd *MapStringStringSliceCmd) String() string {
@@ -3811,7 +3811,7 @@ func (cmd *MapStringInterfaceSliceCmd) Val() []map[string]interface{} {
38113811
}
38123812

38133813
func (cmd *MapStringInterfaceSliceCmd) Result() ([]map[string]interface{}, error) {
3814-
return cmd.Val(), cmd.Err()
3814+
return cmd.val, cmd.err
38153815
}
38163816

38173817
func (cmd *MapStringInterfaceSliceCmd) String() string {
@@ -4661,7 +4661,7 @@ func (cmd *ClusterLinksCmd) Val() []ClusterLink {
46614661
}
46624662

46634663
func (cmd *ClusterLinksCmd) Result() ([]ClusterLink, error) {
4664-
return cmd.Val(), cmd.Err()
4664+
return cmd.val, cmd.err
46654665
}
46664666

46674667
func (cmd *ClusterLinksCmd) String() string {
@@ -4763,7 +4763,7 @@ func (cmd *ClusterShardsCmd) Val() []ClusterShard {
47634763
}
47644764

47654765
func (cmd *ClusterShardsCmd) Result() ([]ClusterShard, error) {
4766-
return cmd.Val(), cmd.Err()
4766+
return cmd.val, cmd.err
47674767
}
47684768

47694769
func (cmd *ClusterShardsCmd) String() string {
@@ -5236,7 +5236,7 @@ func (cmd *ACLLogCmd) Val() []*ACLLogEntry {
52365236
}
52375237

52385238
func (cmd *ACLLogCmd) Result() ([]*ACLLogEntry, error) {
5239-
return cmd.Val(), cmd.Err()
5239+
return cmd.val, cmd.err
52405240
}
52415241

52425242
func (cmd *ACLLogCmd) String() string {
@@ -5337,7 +5337,7 @@ func (cmd *InfoCmd) Val() map[string]map[string]string {
53375337
}
53385338

53395339
func (cmd *InfoCmd) Result() (map[string]map[string]string, error) {
5340-
return cmd.Val(), cmd.Err()
5340+
return cmd.val, cmd.err
53415341
}
53425342

53435343
func (cmd *InfoCmd) String() string {

json.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func (cmd *JSONSliceCmd) Val() []interface{} {
178178
}
179179

180180
func (cmd *JSONSliceCmd) Result() ([]interface{}, error) {
181-
return cmd.Val(), cmd.Err()
181+
return cmd.val, cmd.err
182182
}
183183

184184
func (cmd *JSONSliceCmd) readReply(rd *proto.Reader) error {
@@ -252,7 +252,7 @@ func (cmd *IntPointerSliceCmd) Val() []*int64 {
252252
}
253253

254254
func (cmd *IntPointerSliceCmd) Result() ([]*int64, error) {
255-
return cmd.Val(), cmd.Err()
255+
return cmd.val, cmd.err
256256
}
257257

258258
func (cmd *IntPointerSliceCmd) readReply(rd *proto.Reader) error {

0 commit comments

Comments
 (0)