Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

return raw value instead of funcation calling in Result() #2831

Merged
merged 1 commit into from Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions command.go
Expand Up @@ -854,7 +854,7 @@ func (cmd *StringCmd) Val() string {
}

func (cmd *StringCmd) Result() (string, error) {
return cmd.Val(), cmd.err
return cmd.val, cmd.err
}

func (cmd *StringCmd) Bytes() ([]byte, error) {
Expand Down Expand Up @@ -958,7 +958,7 @@ func (cmd *FloatCmd) Val() float64 {
}

func (cmd *FloatCmd) Result() (float64, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *FloatCmd) String() string {
Expand Down Expand Up @@ -1053,7 +1053,7 @@ func (cmd *StringSliceCmd) Val() []string {
}

func (cmd *StringSliceCmd) Result() ([]string, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *StringSliceCmd) String() string {
Expand Down Expand Up @@ -2715,7 +2715,7 @@ func (cmd *ZWithKeyCmd) Val() *ZWithKey {
}

func (cmd *ZWithKeyCmd) Result() (*ZWithKey, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *ZWithKeyCmd) String() string {
Expand Down Expand Up @@ -2853,7 +2853,7 @@ func (cmd *ClusterSlotsCmd) Val() []ClusterSlot {
}

func (cmd *ClusterSlotsCmd) Result() ([]ClusterSlot, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *ClusterSlotsCmd) String() string {
Expand Down Expand Up @@ -3313,7 +3313,7 @@ func (cmd *GeoPosCmd) Val() []*GeoPos {
}

func (cmd *GeoPosCmd) Result() ([]*GeoPos, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *GeoPosCmd) String() string {
Expand Down Expand Up @@ -3394,7 +3394,7 @@ func (cmd *CommandsInfoCmd) Val() map[string]*CommandInfo {
}

func (cmd *CommandsInfoCmd) Result() (map[string]*CommandInfo, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *CommandsInfoCmd) String() string {
Expand Down Expand Up @@ -3584,7 +3584,7 @@ func (cmd *SlowLogCmd) Val() []SlowLog {
}

func (cmd *SlowLogCmd) Result() ([]SlowLog, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *SlowLogCmd) String() string {
Expand Down Expand Up @@ -3683,7 +3683,7 @@ func (cmd *MapStringInterfaceCmd) Val() map[string]interface{} {
}

func (cmd *MapStringInterfaceCmd) Result() (map[string]interface{}, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *MapStringInterfaceCmd) String() string {
Expand Down Expand Up @@ -3747,7 +3747,7 @@ func (cmd *MapStringStringSliceCmd) Val() []map[string]string {
}

func (cmd *MapStringStringSliceCmd) Result() ([]map[string]string, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *MapStringStringSliceCmd) String() string {
Expand Down Expand Up @@ -3811,7 +3811,7 @@ func (cmd *MapStringInterfaceSliceCmd) Val() []map[string]interface{} {
}

func (cmd *MapStringInterfaceSliceCmd) Result() ([]map[string]interface{}, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *MapStringInterfaceSliceCmd) String() string {
Expand Down Expand Up @@ -4661,7 +4661,7 @@ func (cmd *ClusterLinksCmd) Val() []ClusterLink {
}

func (cmd *ClusterLinksCmd) Result() ([]ClusterLink, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *ClusterLinksCmd) String() string {
Expand Down Expand Up @@ -4763,7 +4763,7 @@ func (cmd *ClusterShardsCmd) Val() []ClusterShard {
}

func (cmd *ClusterShardsCmd) Result() ([]ClusterShard, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *ClusterShardsCmd) String() string {
Expand Down Expand Up @@ -5236,7 +5236,7 @@ func (cmd *ACLLogCmd) Val() []*ACLLogEntry {
}

func (cmd *ACLLogCmd) Result() ([]*ACLLogEntry, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *ACLLogCmd) String() string {
Expand Down Expand Up @@ -5337,7 +5337,7 @@ func (cmd *InfoCmd) Val() map[string]map[string]string {
}

func (cmd *InfoCmd) Result() (map[string]map[string]string, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

func (cmd *InfoCmd) String() string {
Expand Down
4 changes: 2 additions & 2 deletions json.go
Expand Up @@ -178,7 +178,7 @@ func (cmd *JSONSliceCmd) Val() []interface{} {
}

func (cmd *JSONSliceCmd) Result() ([]interface{}, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

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

func (cmd *IntPointerSliceCmd) Result() ([]*int64, error) {
return cmd.Val(), cmd.Err()
return cmd.val, cmd.err
}

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