pebble: clean up tests to use the new key format

Author: RaduBerinde

batch_test.go

@@ -17,6 +17,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/cockroachdb/crlib/crstrings"
 	"github.com/cockroachdb/datadriven"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/pebble/batchrepr"
@@ -965,17 +966,15 @@ func TestBatchIter(t *testing.T) {
 							b = newBatch(nil)
 						}
 
-						for _, key := range strings.Split(d.Input, "\n") {
-							j := strings.Index(key, ":")
-							ikey := base.ParseInternalKey(key[:j])
-							value := []byte(key[j+1:])
-							b.Set(ikey.UserKey, value, nil)
+						for _, line := range crstrings.Lines(d.Input) {
+							kv := base.ParseInternalKV(line)
+							require.NoError(t, b.Set(kv.K.UserKey, kv.InPlaceValue(), nil))
 						}
 
 						switch method {
 						case "apply":
 							tmp := newIndexedBatch(nil, DefaultComparer)
-							tmp.Apply(b, nil)
+							require.NoError(t, tmp.Apply(b, nil))
 							b = tmp
 						}
 						return ""
@@ -1111,11 +1110,11 @@ func TestFlushableBatchIter(t *testing.T) {
 		switch d.Cmd {
 		case "define":
 			batch := newBatch(nil)
-			for _, key := range strings.Split(d.Input, "\n") {
-				j := strings.Index(key, ":")
-				ikey := base.ParseInternalKey(key[:j])
-				value := []byte(fmt.Sprint(ikey.SeqNum()))
-				batch.Set(ikey.UserKey, value, nil)
+			for _, line := range crstrings.Lines(d.Input) {
+				kv := base.ParseInternalKV(line)
+				// Ignore any value in the test.
+				value := []byte(kv.K.SeqNum().String())
+				require.NoError(t, batch.Set(kv.K.UserKey, value, nil))
 			}
 			var err error
 			b, err = newFlushableBatch(batch, DefaultComparer)
@@ -1139,30 +1138,29 @@ func TestFlushableBatch(t *testing.T) {
 		switch d.Cmd {
 		case "define":
 			batch := newBatch(nil)
-			for _, key := range strings.Split(d.Input, "\n") {
-				j := strings.Index(key, ":")
-				ikey := base.ParseInternalKey(key[:j])
-				value := []byte(key[j+1:])
+			for _, line := range crstrings.Lines(d.Input) {
+				kv := base.ParseInternalKV(line)
+				value := kv.InPlaceValue()
 				if len(value) == 0 {
-					value = []byte(fmt.Sprintf("%d", ikey.SeqNum()))
+					value = []byte(kv.K.SeqNum().String())
 				}
-				switch ikey.Kind() {
+				switch kv.K.Kind() {
 				case InternalKeyKindDelete:
-					require.NoError(t, batch.Delete(ikey.UserKey, nil))
+					require.NoError(t, batch.Delete(kv.K.UserKey, nil))
 				case InternalKeyKindSet:
-					require.NoError(t, batch.Set(ikey.UserKey, value, nil))
+					require.NoError(t, batch.Set(kv.K.UserKey, value, nil))
 				case InternalKeyKindMerge:
-					require.NoError(t, batch.Merge(ikey.UserKey, value, nil))
+					require.NoError(t, batch.Merge(kv.K.UserKey, value, nil))
 				case InternalKeyKindLogData:
-					require.NoError(t, batch.LogData(ikey.UserKey, nil))
+					require.NoError(t, batch.LogData(kv.K.UserKey, nil))
 				case InternalKeyKindRangeDelete:
-					require.NoError(t, batch.DeleteRange(ikey.UserKey, value, nil))
+					require.NoError(t, batch.DeleteRange(kv.K.UserKey, value, nil))
 				case InternalKeyKindRangeKeyDelete:
-					require.NoError(t, batch.RangeKeyDelete(ikey.UserKey, value, nil))
+					require.NoError(t, batch.RangeKeyDelete(kv.K.UserKey, value, nil))
 				case InternalKeyKindRangeKeySet:
-					require.NoError(t, batch.RangeKeySet(ikey.UserKey, value, value, value, nil))
+					require.NoError(t, batch.RangeKeySet(kv.K.UserKey, value, value, value, nil))
 				case InternalKeyKindRangeKeyUnset:
-					require.NoError(t, batch.RangeKeyUnset(ikey.UserKey, value, value, nil))
+					require.NoError(t, batch.RangeKeyUnset(kv.K.UserKey, value, value, nil))
 				}
 			}
 			var err error

blob_rewrite_test.go

@@ -117,16 +117,11 @@ func TestBlobRewrite(t *testing.T) {
 				if tw == nil {
 					initRawWriter()
 				}
-				var ikv base.InternalKV
 				for _, line := range crstrings.Lines(d.Input) {
-					parts := strings.SplitN(line, ":", 2)
-					ik := base.ParseInternalKey(parts[0])
-					ikv.K = ik
-					if strings.HasPrefix(parts[1], "blob") {
-						ikv.V, err = bv.ParseInternalValue(parts[1])
+					ikv := base.ParseInternalKV(line)
+					if value := string(ikv.InPlaceValue()); strings.HasPrefix(value, "blob") {
+						ikv.V, err = bv.ParseInternalValue(value)
 						require.NoError(t, err)
-					} else {
-						ikv.V = base.MakeInPlaceValue([]byte(parts[1]))
 					}
 					require.NoError(t, vs.Add(tw, &ikv, false /* forceObsolete */, false /* isLikeyMVCCGarbage */))
 				}

compaction_picker_test.go

@@ -125,8 +125,8 @@ func loadVersion(
 // parseTableMeta parses a table number from a string. The string is expected to
 // be in the form of one of the following:
 //
-//	start.SET.1-end.SET.2
-//	<table-num>:start.SET.1-end.SET.2
+//	start#1,SET-end#2,SET
+//	<table-num>:start#1,SET-end#2,SET
 func parseTableMeta(t *testing.T, s string, opts *Options) (*manifest.TableMetadata, error) {
 	parts := strings.Split(s, ":")
 	var tableNum base.TableNum
@@ -137,7 +137,7 @@ func parseTableMeta(t *testing.T, s string, opts *Options) (*manifest.TableMetad
 	fields := strings.Fields(parts[0])
 	parts = strings.Split(fields[0], "-")
 	if len(parts) != 2 {
-		return nil, errors.Errorf("malformed table spec: %s. usage: <optional-file-num>:start.SET.1-end.SET.2", s)
+		return nil, errors.Errorf("malformed table spec: %s. usage: <optional-file-num>:start#1,SET-end#2,SET", s)
 	}
 	m := &manifest.TableMetadata{
 		TableNum: tableNum,