Merge remote-tracking branch 'origin/develop' into feat/simplify-seri…

…alization

kvstore/kvstore.go

@@ -9,6 +9,9 @@ import (
 var (
 	// ErrKeyNotFound is returned when an op. doesn't find the given key.
 	ErrKeyNotFound = ierrors.New("key not found")
+	// ErrTypedValueNotChanged is a sentinel error that can be returned by the TypedValue.Compute callback to indicate
+	// that the current value should not be changed.
+	ErrTypedValueNotChanged = ierrors.New("typed value not changed")
 	// ErrStoreClosed is returned when an op accesses the kvstore but it was already closed.
 	ErrStoreClosed = ierrors.New("trying to access closed kvstore")
 

kvstore/typedvalue.go

@@ -102,7 +102,15 @@ func (t *TypedValue[V]) Compute(computeFunc func(currentValue V, exists bool) (n
 	}
 
 	if newValue, err = computeFunc(currentValue, exists); err != nil {
+		if ierrors.Is(err, ErrTypedValueNotChanged) {
+			return currentValue, nil
+		}
+
 		return newValue, ierrors.Wrap(err, "failed to compute new value")
+	} else if newValueBytes, newValueBytesErr := t.vToBytes(newValue); err != nil {
+		return currentValue, ierrors.Wrap(newValueBytesErr, "failed to encode new value")
+	} else if err = t.kv.Set(t.keyBytes, newValueBytes); err != nil {
+		return currentValue, ierrors.Wrap(err, "failed to store new value in KV store")
 	}
 
 	t.valueCached = &newValue
@@ -119,7 +127,7 @@ func (t *TypedValue[V]) Set(value V) error {
 	if valueBytes, err := t.vToBytes(value); err != nil {
 		return ierrors.Wrap(err, "failed to encode value")
 	} else if err = t.kv.Set(t.keyBytes, valueBytes); err != nil {
-		return ierrors.Wrap(err, "failed to store in KV store")
+		return ierrors.Wrap(err, "failed to store value in KV store")
 	}
 
 	t.valueCached = &value