Skip to content

feat: add HGetDel, HGetEX, HGetEXWithArgs, HSetEX, and HSetEXWithArgs… #831

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 17, 2025
Merged

feat: add HGetDel, HGetEX, HGetEXWithArgs, HSetEX, and HSetEXWithArgs… #831

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1472d92
feat: add HGetDel, HGetEX, HGetEXWithArgs, HSetEX, and HSetEXWithArgs…
dalaoqi Apr 16, 2025
5ed3762
feat: handle nil options in HGetEXWithArgs and HSetEXWithArgs methods
dalaoqi Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions rueidiscompat/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@ type CoreCmdable interface {
HPExpireTime(ctx context.Context, key string, fields ...string) *IntSliceCmd
HTTL(ctx context.Context, key string, fields ...string) *IntSliceCmd
HPTTL(ctx context.Context, key string, fields ...string) *IntSliceCmd
HGetDel(ctx context.Context, key string, fields ...string) *StringSliceCmd
HGetEX(ctx context.Context, key string, fields ...string) *StringSliceCmd
HGetEXWithArgs(ctx context.Context, key string, options *HGetEXOptions, fields ...string) *StringSliceCmd
HSetEX(ctx context.Context, key string, fieldsAndValues ...string) *IntCmd
HSetEXWithArgs(ctx context.Context, key string, options *HSetEXOptions, fieldsAndValues ...string) *IntCmd

BLPop(ctx context.Context, timeout time.Duration, keys ...string) *StringSliceCmd
BLMPop(ctx context.Context, timeout time.Duration, direction string, count int64, keys ...string) *KeyValuesCmd
Expand Down Expand Up @@ -1555,6 +1560,84 @@ func (c *Compat) HPTTL(ctx context.Context, key string, fields ...string) *IntSl
return newIntSliceCmd(resp)
}

func (c *Compat) HGetDel(ctx context.Context, key string, fields ...string) *StringSliceCmd {
cmd := c.client.B().Hgetdel().Key(key).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
resp := c.client.Do(ctx, cmd)
return newStringSliceCmd(resp)
}

func (c *Compat) HGetEX(ctx context.Context, key string, fields ...string) *StringSliceCmd {
cmd := c.client.B().Hgetex().Key(key).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
resp := c.client.Do(ctx, cmd)
return newStringSliceCmd(resp)
}

func (c *Compat) HGetEXWithArgs(ctx context.Context, key string, options *HGetEXOptions, fields ...string) *StringSliceCmd {
var cmd rueidis.Completed
if options.ExpirationType == HGetEXExpirationEX {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the options == nil?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think options == nil is more similar to the situation with HGetEX?

cmd = c.client.B().Hgetex().Key(key).Ex(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
} else if options.ExpirationType == HGetEXExpirationPX {
cmd = c.client.B().Hgetex().Key(key).Px(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
} else if options.ExpirationType == HGetEXExpirationEXAT {
cmd = c.client.B().Hgetex().Key(key).Exat(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
} else if options.ExpirationType == HGetEXExpirationPXAT {
cmd = c.client.B().Hgetex().Key(key).Pxat(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
} else if options.ExpirationType == HGetEXExpirationPERSIST {
cmd = c.client.B().Hgetex().Key(key).Persist().Fields().Numfields(int64(len(fields))).Field(fields...).Build()
}
resp := c.client.Do(ctx, cmd)
return newStringSliceCmd(resp)
}

func (c *Compat) HSetEX(ctx context.Context, key string, fieldsAndValues ...string) *IntCmd {
partial := c.client.B().Hsetex().Key(key).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()

for i := 0; i < len(fieldsAndValues); i += 2 {
partial = partial.FieldValue(fieldsAndValues[i], fieldsAndValues[i+1])
}
cmd := partial.Build()

resp := c.client.Do(ctx, cmd)
return newIntCmd(resp)
}

func (c *Compat) HSetEXWithArgs(ctx context.Context, key string, options *HSetEXOptions, fieldsAndValues ...string) *IntCmd {
var partial cmds.HsetexFieldValue
if options.Condition == HSetEXFNX {
if options.ExpirationType == HSetEXExpirationEX {
partial = c.client.B().Hsetex().Key(key).Fnx().Ex(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationPX {
partial = c.client.B().Hsetex().Key(key).Fnx().Px(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationEXAT {
partial = c.client.B().Hsetex().Key(key).Fnx().Exat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationPXAT {
partial = c.client.B().Hsetex().Key(key).Fnx().Pxat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationKEEPTTL {
partial = c.client.B().Hsetex().Key(key).Fnx().Keepttl().Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
}
} else if options.Condition == HSetEXFXX {
if options.ExpirationType == HSetEXExpirationEX {
partial = c.client.B().Hsetex().Key(key).Fxx().Ex(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationPX {
partial = c.client.B().Hsetex().Key(key).Fxx().Px(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationEXAT {
partial = c.client.B().Hsetex().Key(key).Fxx().Exat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationPXAT {
partial = c.client.B().Hsetex().Key(key).Fxx().Pxat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
} else if options.ExpirationType == HSetEXExpirationKEEPTTL {
partial = c.client.B().Hsetex().Key(key).Fxx().Keepttl().Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
}
}

for i := 0; i < len(fieldsAndValues); i += 2 {
partial = partial.FieldValue(fieldsAndValues[i], fieldsAndValues[i+1])
}

cmd := partial.Build()
resp := c.client.Do(ctx, cmd)
return newIntCmd(resp)
}

func (c *Compat) BLPop(ctx context.Context, timeout time.Duration, keys ...string) *StringSliceCmd {
cmd := c.client.B().Blpop().Key(keys...).Timeout(float64(formatSec(timeout))).Build()
resp := c.client.Do(ctx, cmd)
Expand Down
39 changes: 39 additions & 0 deletions rueidiscompat/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2153,6 +2153,45 @@ type HExpireArgs struct {
LT bool
}

// ExpirationType represents an expiration option for the HGETEX command.
type HGetEXExpirationType string

const (
HGetEXExpirationEX HGetEXExpirationType = "EX"
HGetEXExpirationPX HGetEXExpirationType = "PX"
HGetEXExpirationEXAT HGetEXExpirationType = "EXAT"
HGetEXExpirationPXAT HGetEXExpirationType = "PXAT"
HGetEXExpirationPERSIST HGetEXExpirationType = "PERSIST"
)

type HSetEXCondition string

const (
HSetEXFNX HSetEXCondition = "FNX"
HSetEXFXX HSetEXCondition = "FXX"
)

type HGetEXOptions struct {
ExpirationType HGetEXExpirationType
ExpirationVal int64
}

type HSetEXExpirationType string

const (
HSetEXExpirationEX HSetEXExpirationType = "EX"
HSetEXExpirationPX HSetEXExpirationType = "PX"
HSetEXExpirationEXAT HSetEXExpirationType = "EXAT"
HSetEXExpirationPXAT HSetEXExpirationType = "PXAT"
HSetEXExpirationKEEPTTL HSetEXExpirationType = "KEEPTTL"
)

type HSetEXOptions struct {
Condition HSetEXCondition
ExpirationType HSetEXExpirationType
ExpirationVal int64
}

type Sort struct {
By string
Order string
Expand Down
30 changes: 30 additions & 0 deletions rueidiscompat/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,36 @@ func (c *Pipeline) HPTTL(ctx context.Context, key string, fields ...string) *Int
return ret
}

func (c *Pipeline) HGetDel(ctx context.Context, key string, fields ...string) *StringSliceCmd {
ret := c.comp.HGetDel(ctx, key, fields...)
c.rets = append(c.rets, ret)
return ret
}

func (c *Pipeline) HGetEX(ctx context.Context, key string, fields ...string) *StringSliceCmd {
ret := c.comp.HGetEX(ctx, key, fields...)
c.rets = append(c.rets, ret)
return ret
}

func (c *Pipeline) HGetEXWithArgs(ctx context.Context, key string, options *HGetEXOptions, fields ...string) *StringSliceCmd {
ret := c.comp.HGetEXWithArgs(ctx, key, options, fields...)
c.rets = append(c.rets, ret)
return ret
}

func (c *Pipeline) HSetEX(ctx context.Context, key string, fieldsAndValues ...string) *IntCmd {
ret := c.comp.HSetEX(ctx, key, fieldsAndValues...)
c.rets = append(c.rets, ret)
return ret
}

func (c *Pipeline) HSetEXWithArgs(ctx context.Context, key string, options *HSetEXOptions, fieldsAndValues ...string) *IntCmd {
ret := c.comp.HSetEXWithArgs(ctx, key, options, fieldsAndValues...)
c.rets = append(c.rets, ret)
return ret
}

func (c *Pipeline) BLPop(ctx context.Context, timeout time.Duration, keys ...string) *StringSliceCmd {
ret := c.comp.BLPop(ctx, timeout, keys...)
c.rets = append(c.rets, ret)
Expand Down
Loading