kvserver: use dd helpers in client_lock_table_test

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/client_lock_table_test.go

@@ -22,6 +22,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/dd"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -212,8 +213,7 @@ var (
 )
 
 func (e *evalCtx) newTxn(ctx context.Context, d *datadriven.TestData) {
-	var name string
-	d.ScanArgs(e.t, txnKey, &name)
+	name := dd.ScanArg[string](e.t, d, txnKey)
 	if _, ok := e.txnsByName[name]; ok {
 		d.Fatalf(e.t, "txn %q already exists", name)
 	} else {
@@ -225,8 +225,7 @@ func (e *evalCtx) newTxn(ctx context.Context, d *datadriven.TestData) {
 }
 
 func (e *evalCtx) mustGetTxn(d *datadriven.TestData) *kv.Txn {
-	var txnName string
-	d.ScanArgs(e.t, txnKey, &txnName)
+	txnName := dd.ScanArg[string](e.t, d, txnKey)
 	txn, ok := e.txnsByName[txnName]
 	if !ok {
 		d.Fatalf(e.t, "txn %q doesn't exists", txnName)
@@ -235,8 +234,7 @@ func (e *evalCtx) mustGetTxn(d *datadriven.TestData) *kv.Txn {
 }
 
 func (e *evalCtx) mustGetAndRemoveTxn(d *datadriven.TestData) *kv.Txn {
-	var txnName string
-	d.ScanArgs(e.t, txnKey, &txnName)
+	txnName := dd.ScanArg[string](e.t, d, txnKey)
 	txn, ok := e.txnsByName[txnName]
 	if !ok {
 		d.Fatalf(e.t, "txn %q doesn't exists", txnName)
@@ -258,8 +256,7 @@ func (e *evalCtx) rollbackTxn(ctx context.Context, d *datadriven.TestData) error
 
 func (e *evalCtx) getNamedKey(name string, d *datadriven.TestData) roachpb.Key {
 	e.t.Helper()
-	var keyS string
-	d.ScanArgs(e.t, name, &keyS)
+	keyS := dd.ScanArg[string](e.t, d, name)
 	return append(e.rangeStartKey.Clone(), []byte(keyS)...)
 }
 
@@ -269,23 +266,18 @@ func (e *evalCtx) getKey(d *datadriven.TestData) roachpb.Key {
 
 func (e *evalCtx) getValue(d *datadriven.TestData) []byte {
 	e.t.Helper()
-	var valueS string
-	d.ScanArgs(e.t, valKey, &valueS)
-	return []byte(valueS)
+	return []byte(dd.ScanArg[string](e.t, d, valKey))
 }
 
 func (e *evalCtx) getLockStr(d *datadriven.TestData) lock.Strength {
-	var lockStr string
-	d.ScanArgs(e.t, "lock", &lockStr)
-	return lock.Strength(lock.Strength_value[lockStr])
+	return lock.Strength(lock.Strength_value[dd.ScanArg[string](e.t, d, "lock")])
 }
 
 func (e *evalCtx) getLockDurability(d *datadriven.TestData) kvpb.KeyLockingDurabilityType {
-	var lockDur string
+	lockDur := dd.ScanArg[string](e.t, d, "dur")
 	// TODO(ssd): I tend to think in terms of the lock package while the
 	// client takes arguments in terms of the kvpb package. This creates
 	// a small mess.
-	d.ScanArgs(e.t, "dur", &lockDur)
 	var dur kvpb.KeyLockingDurabilityType
 	switch lock.Durability(lock.Durability_value[lockDur]) {
 	case lock.Replicated:
@@ -297,22 +289,15 @@ func (e *evalCtx) getLockDurability(d *datadriven.TestData) kvpb.KeyLockingDurab
 }
 
 func (e *evalCtx) getLockWaitPolicy(d *datadriven.TestData) lock.WaitPolicy {
-	if d.HasArg("wait") {
-		var waitPolicyStr string
-		d.ScanArgs(e.t, "wait", &waitPolicyStr)
-		return lock.WaitPolicy(lock.WaitPolicy_value[waitPolicyStr])
+	if str, ok := dd.ScanArgOpt[string](e.t, d, "wait"); ok {
+		return lock.WaitPolicy(lock.WaitPolicy_value[str])
 	} else {
 		return lock.WaitPolicy_Block
 	}
 }
 
 func (e *evalCtx) getInt(d *datadriven.TestData, name string) int {
-	if d.HasArg(name) {
-		var i int
-		d.ScanArgs(e.t, name, &i)
-		return i
-	}
-	return 0
+	return dd.ScanArgOr(e.t, d, name, 0)
 }
 
 func (e *evalCtx) cmdInBatch(cmdStr string, b *kv.Batch) error {