Skip to content

Commit edabc84

Browse files
dalaoqirueian
dalaoqi
authored and
rueian
committed
feat: add HGetDel, HGetEX, HGetEXWithArgs, HSetEX, and HSetEXWithArgs… (#831)
* feat: add HGetDel, HGetEX, HGetEXWithArgs, HSetEX, and HSetEXWithArgs commands Signed-off-by: Tsung-Han Ho (dalaoqi) <[email protected]> * feat: handle nil options in HGetEXWithArgs and HSetEXWithArgs methods --------- Signed-off-by: Tsung-Han Ho (dalaoqi) <[email protected]> Signed-off-by: Rueian <[email protected]>
1 parent 00c7517 commit edabc84

File tree

3 files changed

+160
-0
lines changed

3 files changed

+160
-0
lines changed

‎valkeycompat/adapter.go‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,11 @@ type CoreCmdable interface {
175175
HPExpireTime(ctx context.Context, key string, fields ...string) *IntSliceCmd
176176
HTTL(ctx context.Context, key string, fields ...string) *IntSliceCmd
177177
HPTTL(ctx context.Context, key string, fields ...string) *IntSliceCmd
178+
HGetDel(ctx context.Context, key string, fields ...string) *StringSliceCmd
179+
HGetEX(ctx context.Context, key string, fields ...string) *StringSliceCmd
180+
HGetEXWithArgs(ctx context.Context, key string, options *HGetEXOptions, fields ...string) *StringSliceCmd
181+
HSetEX(ctx context.Context, key string, fieldsAndValues ...string) *IntCmd
182+
HSetEXWithArgs(ctx context.Context, key string, options *HSetEXOptions, fieldsAndValues ...string) *IntCmd
178183

179184
BLPop(ctx context.Context, timeout time.Duration, keys ...string) *StringSliceCmd
180185
BLMPop(ctx context.Context, timeout time.Duration, direction string, count int64, keys ...string) *KeyValuesCmd
@@ -1554,6 +1559,92 @@ func (c *Compat) HPTTL(ctx context.Context, key string, fields ...string) *IntSl
15541559
return newIntSliceCmd(resp)
15551560
}
15561561

1562+
func (c *Compat) HGetDel(ctx context.Context, key string, fields ...string) *StringSliceCmd {
1563+
cmd := c.client.B().Hgetdel().Key(key).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1564+
resp := c.client.Do(ctx, cmd)
1565+
return newStringSliceCmd(resp)
1566+
}
1567+
1568+
func (c *Compat) HGetEX(ctx context.Context, key string, fields ...string) *StringSliceCmd {
1569+
cmd := c.client.B().Hgetex().Key(key).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1570+
resp := c.client.Do(ctx, cmd)
1571+
return newStringSliceCmd(resp)
1572+
}
1573+
1574+
func (c *Compat) HGetEXWithArgs(ctx context.Context, key string, options *HGetEXOptions, fields ...string) *StringSliceCmd {
1575+
if options == nil {
1576+
return c.HGetEX(ctx, key, fields...)
1577+
}
1578+
1579+
var cmd valkey.Completed
1580+
if options.ExpirationType == HGetEXExpirationEX {
1581+
cmd = c.client.B().Hgetex().Key(key).Ex(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1582+
} else if options.ExpirationType == HGetEXExpirationPX {
1583+
cmd = c.client.B().Hgetex().Key(key).Px(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1584+
} else if options.ExpirationType == HGetEXExpirationEXAT {
1585+
cmd = c.client.B().Hgetex().Key(key).Exat(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1586+
} else if options.ExpirationType == HGetEXExpirationPXAT {
1587+
cmd = c.client.B().Hgetex().Key(key).Pxat(options.ExpirationVal).Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1588+
} else if options.ExpirationType == HGetEXExpirationPERSIST {
1589+
cmd = c.client.B().Hgetex().Key(key).Persist().Fields().Numfields(int64(len(fields))).Field(fields...).Build()
1590+
}
1591+
resp := c.client.Do(ctx, cmd)
1592+
return newStringSliceCmd(resp)
1593+
}
1594+
1595+
func (c *Compat) HSetEX(ctx context.Context, key string, fieldsAndValues ...string) *IntCmd {
1596+
partial := c.client.B().Hsetex().Key(key).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1597+
1598+
for i := 0; i < len(fieldsAndValues); i += 2 {
1599+
partial = partial.FieldValue(fieldsAndValues[i], fieldsAndValues[i+1])
1600+
}
1601+
cmd := partial.Build()
1602+
1603+
resp := c.client.Do(ctx, cmd)
1604+
return newIntCmd(resp)
1605+
}
1606+
1607+
func (c *Compat) HSetEXWithArgs(ctx context.Context, key string, options *HSetEXOptions, fieldsAndValues ...string) *IntCmd {
1608+
if options == nil {
1609+
return c.HSetEX(ctx, key, fieldsAndValues...)
1610+
}
1611+
1612+
var partial cmds.HsetexFieldValue
1613+
if options.Condition == HSetEXFNX {
1614+
if options.ExpirationType == HSetEXExpirationEX {
1615+
partial = c.client.B().Hsetex().Key(key).Fnx().Ex(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1616+
} else if options.ExpirationType == HSetEXExpirationPX {
1617+
partial = c.client.B().Hsetex().Key(key).Fnx().Px(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1618+
} else if options.ExpirationType == HSetEXExpirationEXAT {
1619+
partial = c.client.B().Hsetex().Key(key).Fnx().Exat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1620+
} else if options.ExpirationType == HSetEXExpirationPXAT {
1621+
partial = c.client.B().Hsetex().Key(key).Fnx().Pxat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1622+
} else if options.ExpirationType == HSetEXExpirationKEEPTTL {
1623+
partial = c.client.B().Hsetex().Key(key).Fnx().Keepttl().Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1624+
}
1625+
} else if options.Condition == HSetEXFXX {
1626+
if options.ExpirationType == HSetEXExpirationEX {
1627+
partial = c.client.B().Hsetex().Key(key).Fxx().Ex(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1628+
} else if options.ExpirationType == HSetEXExpirationPX {
1629+
partial = c.client.B().Hsetex().Key(key).Fxx().Px(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1630+
} else if options.ExpirationType == HSetEXExpirationEXAT {
1631+
partial = c.client.B().Hsetex().Key(key).Fxx().Exat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1632+
} else if options.ExpirationType == HSetEXExpirationPXAT {
1633+
partial = c.client.B().Hsetex().Key(key).Fxx().Pxat(options.ExpirationVal).Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1634+
} else if options.ExpirationType == HSetEXExpirationKEEPTTL {
1635+
partial = c.client.B().Hsetex().Key(key).Fxx().Keepttl().Fields().Numfields(int64(len(fieldsAndValues) / 2)).FieldValue()
1636+
}
1637+
}
1638+
1639+
for i := 0; i < len(fieldsAndValues); i += 2 {
1640+
partial = partial.FieldValue(fieldsAndValues[i], fieldsAndValues[i+1])
1641+
}
1642+
1643+
cmd := partial.Build()
1644+
resp := c.client.Do(ctx, cmd)
1645+
return newIntCmd(resp)
1646+
}
1647+
15571648
func (c *Compat) BLPop(ctx context.Context, timeout time.Duration, keys ...string) *StringSliceCmd {
15581649
cmd := c.client.B().Blpop().Key(keys...).Timeout(float64(formatSec(timeout))).Build()
15591650
resp := c.client.Do(ctx, cmd)

‎valkeycompat/command.go‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,6 +2153,45 @@ type HExpireArgs struct {
21532153
LT bool
21542154
}
21552155

2156+
// ExpirationType represents an expiration option for the HGETEX command.
2157+
type HGetEXExpirationType string
2158+
2159+
const (
2160+
HGetEXExpirationEX HGetEXExpirationType = "EX"
2161+
HGetEXExpirationPX HGetEXExpirationType = "PX"
2162+
HGetEXExpirationEXAT HGetEXExpirationType = "EXAT"
2163+
HGetEXExpirationPXAT HGetEXExpirationType = "PXAT"
2164+
HGetEXExpirationPERSIST HGetEXExpirationType = "PERSIST"
2165+
)
2166+
2167+
type HSetEXCondition string
2168+
2169+
const (
2170+
HSetEXFNX HSetEXCondition = "FNX"
2171+
HSetEXFXX HSetEXCondition = "FXX"
2172+
)
2173+
2174+
type HGetEXOptions struct {
2175+
ExpirationType HGetEXExpirationType
2176+
ExpirationVal int64
2177+
}
2178+
2179+
type HSetEXExpirationType string
2180+
2181+
const (
2182+
HSetEXExpirationEX HSetEXExpirationType = "EX"
2183+
HSetEXExpirationPX HSetEXExpirationType = "PX"
2184+
HSetEXExpirationEXAT HSetEXExpirationType = "EXAT"
2185+
HSetEXExpirationPXAT HSetEXExpirationType = "PXAT"
2186+
HSetEXExpirationKEEPTTL HSetEXExpirationType = "KEEPTTL"
2187+
)
2188+
2189+
type HSetEXOptions struct {
2190+
Condition HSetEXCondition
2191+
ExpirationType HSetEXExpirationType
2192+
ExpirationVal int64
2193+
}
2194+
21562195
type Sort struct {
21572196
By string
21582197
Order string

‎valkeycompat/pipeline.go‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,36 @@ func (c *Pipeline) HPTTL(ctx context.Context, key string, fields ...string) *Int
751751
return ret
752752
}
753753

754+
func (c *Pipeline) HGetDel(ctx context.Context, key string, fields ...string) *StringSliceCmd {
755+
ret := c.comp.HGetDel(ctx, key, fields...)
756+
c.rets = append(c.rets, ret)
757+
return ret
758+
}
759+
760+
func (c *Pipeline) HGetEX(ctx context.Context, key string, fields ...string) *StringSliceCmd {
761+
ret := c.comp.HGetEX(ctx, key, fields...)
762+
c.rets = append(c.rets, ret)
763+
return ret
764+
}
765+
766+
func (c *Pipeline) HGetEXWithArgs(ctx context.Context, key string, options *HGetEXOptions, fields ...string) *StringSliceCmd {
767+
ret := c.comp.HGetEXWithArgs(ctx, key, options, fields...)
768+
c.rets = append(c.rets, ret)
769+
return ret
770+
}
771+
772+
func (c *Pipeline) HSetEX(ctx context.Context, key string, fieldsAndValues ...string) *IntCmd {
773+
ret := c.comp.HSetEX(ctx, key, fieldsAndValues...)
774+
c.rets = append(c.rets, ret)
775+
return ret
776+
}
777+
778+
func (c *Pipeline) HSetEXWithArgs(ctx context.Context, key string, options *HSetEXOptions, fieldsAndValues ...string) *IntCmd {
779+
ret := c.comp.HSetEXWithArgs(ctx, key, options, fieldsAndValues...)
780+
c.rets = append(c.rets, ret)
781+
return ret
782+
}
783+
754784
func (c *Pipeline) BLPop(ctx context.Context, timeout time.Duration, keys ...string) *StringSliceCmd {
755785
ret := c.comp.BLPop(ctx, timeout, keys...)
756786
c.rets = append(c.rets, ret)

0 commit comments

Comments
 (0)