MM-16822 - Implement KVSetWithOptions (#11818)
* Add SetWithOptions * Avoid passing two structs to the functions * Rename ExpiryInSeconds -> ExpireInSeconds * Use t.Run for the tests * Fix build * Address feedback * Update log message * Update docs and use KVSetWithOptions in KVCompareAndSetJSON * Improve code style * Use struct instead of pointer to struct * Fix minimum server versions * Update documentation * Address feedback * Revert new implemention of kv helpers * Adress feedback
Этот коммит содержится в:
коммит произвёл
Ben Schumacher
родитель
812c40a307
Коммит
1db045bce3
@@ -9,25 +9,7 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// KVGetJSON is a wrapper around KVGet to simplify reading a JSON object from the key value store.
|
||||
func (p *HelpersImpl) KVGetJSON(key string, value interface{}) (bool, error) {
|
||||
data, appErr := p.API.KVGet(key)
|
||||
if appErr != nil {
|
||||
return false, appErr
|
||||
}
|
||||
if data == nil {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
err := json.Unmarshal(data, value)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// KVSetJSON is a wrapper around KVSet to simplify writing a JSON object to the key value store.
|
||||
// KVSetJSON implements Helpers.KVSetJSON.
|
||||
func (p *HelpersImpl) KVSetJSON(key string, value interface{}) error {
|
||||
data, err := json.Marshal(value)
|
||||
if err != nil {
|
||||
@@ -42,7 +24,7 @@ func (p *HelpersImpl) KVSetJSON(key string, value interface{}) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// KVCompareAndSetJSON is a wrapper around KVCompareAndSet to simplify atomically writing a JSON object to the key value store.
|
||||
// KVCompareAndSetJSON implements Helpers.KVCompareAndSetJSON.
|
||||
func (p *HelpersImpl) KVCompareAndSetJSON(key string, oldValue interface{}, newValue interface{}) (bool, error) {
|
||||
var oldData, newData []byte
|
||||
var err error
|
||||
@@ -69,7 +51,7 @@ func (p *HelpersImpl) KVCompareAndSetJSON(key string, oldValue interface{}, newV
|
||||
return set, nil
|
||||
}
|
||||
|
||||
// KVCompareAndDeleteJSON is a wrapper around KVCompareAndDelete to simplify atomically deleting a JSON object from the key value store.
|
||||
// KVCompareAndDeleteJSON implements Helpers.KVCompareAndDeleteJSON.
|
||||
func (p *HelpersImpl) KVCompareAndDeleteJSON(key string, oldValue interface{}) (bool, error) {
|
||||
var oldData []byte
|
||||
var err error
|
||||
@@ -89,7 +71,25 @@ func (p *HelpersImpl) KVCompareAndDeleteJSON(key string, oldValue interface{}) (
|
||||
return deleted, nil
|
||||
}
|
||||
|
||||
// KVSetWithExpiryJSON is a wrapper around KVSetWithExpiry to simplify atomically writing a JSON object with expiry to the key value store.
|
||||
// KVGetJSON implements Helpers.KVGetJSON.
|
||||
func (p *HelpersImpl) KVGetJSON(key string, value interface{}) (bool, error) {
|
||||
data, appErr := p.API.KVGet(key)
|
||||
if appErr != nil {
|
||||
return false, appErr
|
||||
}
|
||||
if data == nil {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
err := json.Unmarshal(data, value)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// KVSetWithExpiryJSON implements Helpers.KVSetWithExpiryJSON.
|
||||
func (p *HelpersImpl) KVSetWithExpiryJSON(key string, value interface{}, expireInSeconds int64) error {
|
||||
data, err := json.Marshal(value)
|
||||
if err != nil {
|
||||
|
||||
Ссылка в новой задаче
Block a user