Skip to content

storage: export OptionalValue #160637

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

Open
jbowens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

storage: export OptionalValue #160637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/batcheval/cmd_end_transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1732,10 +1732,10 @@ func TestPartialRollbackOnEndTransaction(t *testing.T) {
if res.Intent != nil {
t.Errorf("found intent, expected none: %+v", res.Intent)
}
if res.Value == nil {
if !res.Value.Exists() {
t.Errorf("no value found, expected one")
} else {
s, err := res.Value.GetBytes()
s, err := res.Value.Value.GetBytes()
if err != nil {
t.Fatal(err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/batcheval/cmd_get.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func Get(
intents = append(intents, *getRes.Intent)
}

reply.Value = getRes.Value
reply.Value = getRes.Value.ToPointer()
if h.ReadConsistency == kvpb.READ_UNCOMMITTED {
var intentVals []roachpb.KeyValue
// NOTE: MVCCGet uses a Prefix iterator, so we want to use one in
Expand All @@ -117,7 +117,7 @@ func Get(
}
}

shouldLockKey := getRes.Value != nil || args.LockNonExisting
shouldLockKey := getRes.Value.Exists() || args.LockNonExisting
var res result.Result
if args.KeyLockingStrength != lock.None && shouldLockKey {
// ExpectExclusionSince is used by callers (namely, txnWriteBuffers) that
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/batcheval/cmd_refresh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ func Refresh(

if err != nil {
return result.Result{}, err
} else if res.Value != nil {
if ts := res.Value.Timestamp; refreshFrom.Less(ts) {
} else if res.Value.Exists() {
if ts := res.Value.Value.Timestamp; refreshFrom.Less(ts) {
return result.Result{},
kvpb.NewRefreshFailedError(ctx, kvpb.RefreshFailedError_REASON_COMMITTED_VALUE, args.Key, ts)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/batcheval/cmd_refresh_range_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ func TestRefreshRangeTimeBoundIterator(t *testing.T) {
t.Fatal(err)
} else if res.Intent != nil {
t.Fatalf("got unexpected intent: %v", intent)
} else if !res.Value.EqualTagAndData(v) {
t.Fatalf("expected %v, got %v", v, res.Value)
} else if !res.Value.Value.EqualTagAndData(v) {
t.Fatalf("expected %v, got %v", v, res.Value.Value)
}

// Now the real test: a transaction at ts2 has been pushed to ts3
Expand Down
16 changes: 8 additions & 8 deletions pkg/kv/kvserver/batcheval/cmd_resolve_intent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ func TestResolveIntentAfterPartialRollback(t *testing.T) {
if res.Intent != nil {
t.Errorf("%s: found intent, expected none: %+v", k, res.Intent)
}
if res.Value == nil {
if !res.Value.Exists() {
t.Errorf("%s: no value found, expected one", k)
} else {
s, err := res.Value.GetBytes()
s, err := res.Value.Value.GetBytes()
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -366,8 +366,8 @@ func TestResolveIntentWithTargetBytes(t *testing.T) {

valueRes, err := storage.MVCCGet(ctx, batch, testKeys[0], ts, storage.MVCCGetOptions{})
require.NoError(t, err)
require.Equal(t, values[0].RawBytes, valueRes.Value.RawBytes,
"the value %s in get result does not match the value %s in request", values[0].RawBytes, valueRes.Value.RawBytes)
require.Equal(t, values[0].RawBytes, valueRes.Value.Value.RawBytes,
"the value %s in get result does not match the value %s in request", values[0].RawBytes, valueRes.Value.Value.RawBytes)
}
} else {
// Resolve an intent range for testKeys[0], testKeys[1], ...,
Expand Down Expand Up @@ -435,8 +435,8 @@ func TestResolveIntentWithTargetBytes(t *testing.T) {

valueRes, err := storage.MVCCGet(ctx, batch, testKeys[2], ts, storage.MVCCGetOptions{})
require.NoError(t, err)
require.Equal(t, values[2].RawBytes, valueRes.Value.RawBytes,
"the value %s in get result does not match the value %s in request", values[2].RawBytes, valueRes.Value.RawBytes)
require.Equal(t, values[2].RawBytes, valueRes.Value.Value.RawBytes,
"the value %s in get result does not match the value %s in request", values[2].RawBytes, valueRes.Value.Value.RawBytes)
_, err = storage.MVCCGet(ctx, batch, testKeys[3], ts, storage.MVCCGetOptions{})
require.Error(t, err)
}
Expand Down Expand Up @@ -469,8 +469,8 @@ func TestResolveIntentWithTargetBytes(t *testing.T) {

valueRes, err := storage.MVCCGet(ctx, batch, testKeys[nKeys-1], ts, storage.MVCCGetOptions{})
require.NoError(t, err)
require.Equal(t, values[nKeys-1].RawBytes, valueRes.Value.RawBytes,
"the value %s in get result does not match the value %s in request", values[nKeys-1].RawBytes, valueRes.Value.RawBytes)
require.Equal(t, values[nKeys-1].RawBytes, valueRes.Value.Value.RawBytes,
"the value %s in get result does not match the value %s in request", values[nKeys-1].RawBytes, valueRes.Value.Value.RawBytes)
}
}
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/batcheval/cmd_subsume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func Subsume(
valRes, err := storage.MVCCGetAsTxn(ctx, readWriter, descKey, intentRes.Intent.Txn.WriteTimestamp, intentRes.Intent.Txn)
if err != nil {
return result.Result{}, errors.Wrap(err, "fetching local range descriptor as txn")
} else if valRes.Value != nil {
} else if valRes.Value.IsPresent() {
return result.Result{}, errors.Errorf("non-deletion intent on local range descriptor")
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/batcheval/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ func readProvisionalVal(
if err != nil {
return roachpb.KeyValue{}, err
}
if valRes.Value == nil {
if !valRes.Value.IsPresent() {
// Intent is a deletion.
return roachpb.KeyValue{}, nil
}
return roachpb.KeyValue{Key: intent.Key, Value: *valRes.Value}, nil
return roachpb.KeyValue{Key: intent.Key, Value: valRes.Value.Value}, nil
}
res, err := storage.MVCCScanAsTxn(
ctx, reader, intent.Key, intent.Key.Next(), intent.Txn.WriteTimestamp, intent.Txn,
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/client_replica_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func TestLeaseholdersRejectClockUpdateWithJump(t *testing.T) {
valRes, err := storage.MVCCGet(context.Background(), store.StateEngine(), key, ts3,
storage.MVCCGetOptions{})
require.NoError(t, err)
require.Equal(t, incArgs.Increment*numCmds, mustGetInt(valRes.Value))
require.Equal(t, incArgs.Increment*numCmds, mustGetInt(valRes.Value.ToPointer()))
}

// TestTxnPutOutOfOrder tests a case where a put operation of an older
Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/loqrecovery/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@ func applyReplicaUpdate(
key := keys.RangeDescriptorKey(update.StartKey.AsRKey())
res, err := storage.MVCCGet(
ctx, readWriter, key, clock.Now(), storage.MVCCGetOptions{Inconsistent: true})
if res.Value == nil {
if !res.Value.Exists() {
return PrepareReplicaReport{}, errors.Errorf(
"failed to find a range descriptor for range %v", key)
}
if err != nil {
return PrepareReplicaReport{}, err
}
var localDesc roachpb.RangeDescriptor
if err := res.Value.GetProto(&localDesc); err != nil {
if err := res.Value.Value.GetProto(&localDesc); err != nil {
return PrepareReplicaReport{}, err
}
// Sanity check that this is indeed the right range.
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/kvserver/replica.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2527,7 +2527,7 @@ func (r *Replica) maybeWatchForMergeLocked(ctx context.Context) (bool, error) {
ctx, r.store.StateEngine(), descKey, intentRes.Intent.Txn.WriteTimestamp, intentRes.Intent.Txn)
if err != nil {
return false, err
} else if valRes.Value != nil {
} else if valRes.Value.IsPresent() {
return false, nil
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/kv/kvserver/replica_rangefeed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,8 +659,8 @@ func populatePrevValsInLogicalOpLog(
if err != nil {
return errors.Wrapf(err, "consuming %T for key %v @ ts %v", op, key, ts)
}
if prevValRes.Value != nil {
*prevValPtr = prevValRes.Value.RawBytes
if prevValRes.Value.Exists() {
*prevValPtr = prevValRes.Value.Value.RawBytes
} else {
*prevValPtr = nil
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/server/node_tombstone_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ func (s *nodeTombstoneStorage) IsDecommissioned(
if err != nil {
return time.Time{}, err
}
if valRes.Value == nil {
if !valRes.Value.Exists() {
// Not found.
continue
}
var tsp hlc.Timestamp
if err := valRes.Value.GetProto(&tsp); err != nil {
if err := valRes.Value.Value.GetProto(&tsp); err != nil {
return time.Time{}, err
}
// Found, offer to cache and return.
Expand Down
4 changes: 2 additions & 2 deletions pkg/storage/bench_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,9 +1216,9 @@ func runMVCCGet(ctx context.Context, b *testing.B, opts mvccBenchData, useBatch
ReadCategory: fs.BatchEvalReadCategory,
}); err != nil {
b.Fatalf("failed get: %+v", err)
} else if valRes.Value == nil {
} else if !valRes.Value.Exists() {
b.Fatalf("failed get (key not found): %d@%d", keyIdx, walltime)
} else if valueBytes, err := valRes.Value.GetBytes(); err != nil {
} else if valueBytes, err := valRes.Value.Value.GetBytes(); err != nil {
b.Fatal(err)
} else if len(valueBytes) != opts.valueBytes {
b.Fatalf("unexpected value size: %d", len(valueBytes))
Expand Down
4 changes: 2 additions & 2 deletions pkg/storage/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ func TestEngineBatchStaleCachedIterator(t *testing.T) {
if valRes, err := MVCCGet(context.Background(), batch, key,
hlc.Timestamp{}, MVCCGetOptions{}); err != nil {
t.Fatal(err)
} else if valRes.Value != nil {
t.Fatalf("expected no value, got %+v", valRes.Value)
} else if valRes.Value.Exists() {
t.Fatalf("expected no value, got %+v", valRes.Value.Value)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/metamorphic/operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (m mvccGetOp) run(ctx context.Context) string {
if err != nil {
return fmt.Sprintf("error: %s", err)
}
return fmt.Sprintf("val = %v, intent = %v", res.Value, res.Intent)
return fmt.Sprintf("val = %v, intent = %v", res.Value.ToPointer(), res.Intent)
}

type mvccPutOp struct {
Expand Down
Loading