sstable: replace EncodeSpan with Span in tests

RaduBerinde · RaduBerinde · commit 34d4e7f216e1 · 2025-04-08T06:38:49.000-07:00
diff --git a/ingest_test.go b/ingest_test.go
@@ -110,8 +110,8 @@ func TestIngestLoad(t *testing.T) {
 			var br blobtest.References
 			w := sstable.NewRawWriter(objstorageprovider.NewFileWritable(f), writerOpts)
 			for _, data := range strings.Split(td.Input, "\n") {
-				if strings.HasPrefix(data, "EncodeSpan: ") {
-					data = strings.TrimPrefix(data, "EncodeSpan: ")
+				if strings.HasPrefix(data, "Span: ") {
+					data = strings.TrimPrefix(data, "Span: ")
 					err := w.EncodeSpan(keyspan.ParseSpan(data))
 					if err != nil {
 						return err.Error()
@@ -3293,8 +3293,8 @@ func TestIngest_UpdateSequenceNumber(t *testing.T) {
 			TableFormat: sstable.TableFormatMax,
 		})
 		for _, data := range strings.Split(input, "\n") {
-			if strings.HasPrefix(data, "EncodeSpan: ") {
-				data = strings.TrimPrefix(data, "EncodeSpan: ")
+			if strings.HasPrefix(data, "Span: ") {
+				data = strings.TrimPrefix(data, "Span: ")
 				err := w.EncodeSpan(keyspan.ParseSpan(data))
 				if err != nil {
 					return nil, err
diff --git a/level_checker_test.go b/level_checker_test.go
@@ -196,8 +196,8 @@ func TestCheckLevelsCornerCases(t *testing.T) {
 				}
 				keyValues := strings.Fields(line)
 				for _, kv := range keyValues {
-					if strings.HasPrefix(kv, "EncodeSpan:") {
-						kv = kv[len("EncodeSpan:"):]
+					if strings.HasPrefix(kv, "Span:") {
+						kv = kv[len("Span:"):]
 						s := keyspan.ParseSpan(kv)
 						if writeUnfragmented {
 							if err = w.EncodeSpan(s); err != nil {
diff --git a/sstable/data_test.go b/sstable/data_test.go
@@ -128,8 +128,8 @@ func writeKVs(w RawWriter, input string) (err error) {
 	}()
 	for _, data := range strings.Split(input, "\n") {
 		switch {
-		case strings.HasPrefix(data, "EncodeSpan:"):
-			err = w.EncodeSpan(keyspan.ParseSpan(strings.TrimPrefix(data, "EncodeSpan:")))
+		case strings.HasPrefix(data, "Span:"):
+			err = w.EncodeSpan(keyspan.ParseSpan(strings.TrimPrefix(data, "Span:")))
 		default:
 			forceObsolete := strings.HasPrefix(data, "force-obsolete:")
 			if forceObsolete {
@@ -274,8 +274,8 @@ func runBuildRawCmd(
 		}
 	}()
 	for _, data := range strings.Split(td.Input, "\n") {
-		if strings.HasPrefix(data, "EncodeSpan:") {
-			data = strings.TrimPrefix(data, "EncodeSpan:")
+		if strings.HasPrefix(data, "Span:") {
+			data = strings.TrimPrefix(data, "Span:")
 			if err := w.EncodeSpan(keyspan.ParseSpan(data)); err != nil {
 				return nil, nil, err
 			}
diff --git a/sstable/testdata/block_properties b/sstable/testdata/block_properties
@@ -108,9 +108,9 @@ build collectors=(suffix)
 a@5.SET.1:foo
 b@10.SET.2:bar
 c@15.SET.3:baz
-EncodeSpan: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
-EncodeSpan: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
-EncodeSpan: f@20-z@25:{(#6,RANGEKEYDEL)}
+Span: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
+Span: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
+Span: f@20-z@25:{(#6,RANGEKEYDEL)}
 ----
 point:    [a@5#1,SET-c@15#3,SET]
 rangekey: [d@10#4,RANGEKEYSET-z@25#inf,RANGEKEYDEL]
@@ -135,9 +135,9 @@ build collectors=(suffix-point-keys-only)
 a@5.SET.1:foo
 b@10.SET.2:bar
 c@15.SET.3:baz
-EncodeSpan: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
-EncodeSpan: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
-EncodeSpan: f@20-z@25:{(#6,RANGEKEYDEL)}
+Span: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
+Span: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
+Span: f@20-z@25:{(#6,RANGEKEYDEL)}
 ----
 point:    [a@5#1,SET-c@15#3,SET]
 rangekey: [d@10#4,RANGEKEYSET-z@25#inf,RANGEKEYDEL]
@@ -162,9 +162,9 @@ build collectors=(suffix-range-keys-only)
 a@5.SET.1:foo
 b@10.SET.2:bar
 c@15.SET.3:baz
-EncodeSpan: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
-EncodeSpan: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
-EncodeSpan: f@20-z@25:{(#6,RANGEKEYDEL)}
+Span: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
+Span: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
+Span: f@20-z@25:{(#6,RANGEKEYDEL)}
 ----
 point:    [a@5#1,SET-c@15#3,SET]
 rangekey: [d@10#4,RANGEKEYSET-z@25#inf,RANGEKEYDEL]
@@ -190,9 +190,9 @@ build block-size=1 collectors=(suffix-point-keys-only,suffix-range-keys-only)
 a@5.SET.1:foo
 b@10.SET.2:bar
 c@15.SET.3:baz
-EncodeSpan: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
-EncodeSpan: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
-EncodeSpan: f@20-z@25:{(#6,RANGEKEYDEL)}
+Span: d@10-e@15:{(#4,RANGEKEYSET,@20,foo)}
+Span: e@15-f@20:{(#5,RANGEKEYUNSET,@25)}
+Span: f@20-z@25:{(#6,RANGEKEYDEL)}
 ----
 point:    [a@5#1,SET-c@15#3,SET]
 rangekey: [d@10#4,RANGEKEYSET-z@25#inf,RANGEKEYDEL]
diff --git a/sstable/testdata/columnar_writer/simple_binary b/sstable/testdata/columnar_writer/simple_binary
@@ -1052,7 +1052,7 @@ sstable
 # Test a sstable containing only a range deletion.
 
 build
-EncodeSpan: a-b:{(#10,RANGEDEL)}
+Span: a-b:{(#10,RANGEDEL)}
 ----
 rangedel: [a#10,RANGEDEL-b#inf,RANGEDEL]
 seqnums:  [10-10]
@@ -1151,8 +1151,8 @@ sstable
 # Test a sstable containing only range keys.
 
 build
-EncodeSpan: a-b:{(#10,RANGEKEYSET,@5,foo)}
-EncodeSpan: b-c:{(#9,RANGEKEYDEL)}
+Span: a-b:{(#10,RANGEKEYSET,@5,foo)}
+Span: b-c:{(#9,RANGEKEYDEL)}
 ----
 rangekey: [a#10,RANGEKEYSET-c#inf,RANGEKEYDEL]
 seqnums:  [9-10]
diff --git a/sstable/testdata/reader/iter b/sstable/testdata/reader/iter
@@ -360,7 +360,7 @@ bbx.SET.2:X
 bby.SET.2:Y
 bbz.SET.2:Z
 c.SET.3:C
-EncodeSpan: cc-ccc:{(#3,RANGEDEL)}
+Span: cc-ccc:{(#3,RANGEDEL)}
 cce.SET.3:E
 ccf.SET.3:F
 ccg.SET.3:G
@@ -384,7 +384,7 @@ ccx.SET.3:X
 ccy.SET.3:Y
 ccz.SET.3:Z
 d.SET.4:D
-EncodeSpan: dd-ddd:{(#4,RANGEDEL)}
+Span: dd-ddd:{(#4,RANGEDEL)}
 dde.SET.4:E
 ddf.SET.4:F
 ddg.SET.4:G
diff --git a/sstable/testdata/rewriter b/sstable/testdata/rewriter
@@ -208,9 +208,9 @@ c
 # Rewrite a table that contain only range keys.
 
 build block-size=1 index-block-size=1 filter comparer=split-4b-suffix
-EncodeSpan: a-b:{(#1,RANGEKEYSET,_xyz)}
-EncodeSpan: b-c:{(#1,RANGEKEYSET,_xyz)}
-EncodeSpan: c-d:{(#1,RANGEKEYSET,_xyz)}
+Span: a-b:{(#1,RANGEKEYSET,_xyz)}
+Span: b-c:{(#1,RANGEKEYSET,_xyz)}
+Span: c-d:{(#1,RANGEKEYSET,_xyz)}
 ----
 rangekey: [a#1,RANGEKEYSET-d#inf,RANGEKEYSET]
 seqnums:  [1-1]
diff --git a/sstable/testdata/rewriter_v3 b/sstable/testdata/rewriter_v3
@@ -208,9 +208,9 @@ c
 # Rewrite a table that contain only range keys.
 
 build block-size=1 index-block-size=1 filter comparer=split-4b-suffix
-EncodeSpan: a-b:{(#1,RANGEKEYSET,_xyz)}
-EncodeSpan: b-c:{(#1,RANGEKEYSET,_xyz)}
-EncodeSpan: c-d:{(#1,RANGEKEYSET,_xyz)}
+Span: a-b:{(#1,RANGEKEYSET,_xyz)}
+Span: b-c:{(#1,RANGEKEYSET,_xyz)}
+Span: c-d:{(#1,RANGEKEYSET,_xyz)}
 ----
 rangekey: [a#1,RANGEKEYSET-d#inf,RANGEKEYSET]
 seqnums:  [1-1]
diff --git a/sstable/testdata/rewriter_v5 b/sstable/testdata/rewriter_v5
@@ -208,9 +208,9 @@ c
 # Rewrite a table that contain only range keys.
 
 build block-size=1 index-block-size=1 filter
-EncodeSpan: a-b:{(#1,RANGEKEYSET,@0)}
-EncodeSpan: b-c:{(#1,RANGEKEYSET,@0)}
-EncodeSpan: c-d:{(#1,RANGEKEYSET,@0)}
+Span: a-b:{(#1,RANGEKEYSET,@0)}
+Span: b-c:{(#1,RANGEKEYSET,@0)}
+Span: c-d:{(#1,RANGEKEYSET,@0)}
 ----
 rangekey: [a#1,RANGEKEYSET-d#inf,RANGEKEYSET]
 seqnums:  [1-1]
diff --git a/sstable/testdata/rewriter_v6 b/sstable/testdata/rewriter_v6
@@ -208,9 +208,9 @@ c
 # Rewrite a table that contain only range keys.
 
 build block-size=1 index-block-size=1 filter
-EncodeSpan: a-b:{(#1,RANGEKEYSET,@0)}
-EncodeSpan: b-c:{(#1,RANGEKEYSET,@0)}
-EncodeSpan: c-d:{(#1,RANGEKEYSET,@0)}
+Span: a-b:{(#1,RANGEKEYSET,@0)}
+Span: b-c:{(#1,RANGEKEYSET,@0)}
+Span: c-d:{(#1,RANGEKEYSET,@0)}
 ----
 rangekey: [a#1,RANGEKEYSET-d#inf,RANGEKEYSET]
 seqnums:  [1-1]
diff --git a/sstable/testdata/virtual_reader_iter b/sstable/testdata/virtual_reader_iter
@@ -31,10 +31,10 @@ build block-size=1 index-block-size=1
 a.SET.1:a
 d.SET.2:d
 f.SET.3:f
-EncodeSpan: d-e:{(#4,RANGEDEL)}
-EncodeSpan: a-d:{(#11,RANGEKEYSET,@10,foo)}
-EncodeSpan: g-l:{(#5,RANGEDEL)}
-EncodeSpan: y-z:{(#12,RANGEKEYSET,@11,foo)}
+Span: d-e:{(#4,RANGEDEL)}
+Span: a-d:{(#11,RANGEKEYSET,@10,foo)}
+Span: g-l:{(#5,RANGEDEL)}
+Span: y-z:{(#12,RANGEKEYSET,@11,foo)}
 ----
 point:    [a#1,SET-f#3,SET]
 rangedel: [d#4,RANGEDEL-l#inf,RANGEDEL]
@@ -493,7 +493,7 @@ build
 a.SET.1:a
 d.SET.2:d
 e.SET.3:e
-EncodeSpan: d-e:{(#4,RANGEDEL)}
+Span: d-e:{(#4,RANGEDEL)}
 f.SET.5:f
 ----
 point:    [a#1,SET-f#5,SET]
@@ -530,7 +530,7 @@ build block-size=1 index-block-size=1
 a.SET.1:a
 d.SET.2:d
 e.SET.3:e
-EncodeSpan: d-e:{(#4,RANGEDEL)}
+Span: d-e:{(#4,RANGEDEL)}
 f.SET.5:f
 ----
 point:    [a#1,SET-f#5,SET]
@@ -568,10 +568,10 @@ a.SET.1:a
 b.SET.5:b
 d.SET.2:d
 f.SET.3:f
-EncodeSpan: d-e:{(#4,RANGEDEL)}
-EncodeSpan: a-d:{(#11,RANGEKEYSET,@10,foo)}
-EncodeSpan: g-l:{(#5,RANGEDEL)}
-EncodeSpan: y-z:{(#12,RANGEKEYSET,@11,foo)}
+Span: d-e:{(#4,RANGEDEL)}
+Span: a-d:{(#11,RANGEKEYSET,@10,foo)}
+Span: g-l:{(#5,RANGEDEL)}
+Span: y-z:{(#12,RANGEKEYSET,@11,foo)}
 ----
 point:    [a#1,SET-f#3,SET]
 rangedel: [d#4,RANGEDEL-l#inf,RANGEDEL]
diff --git a/sstable/testdata/virtual_reader_props b/sstable/testdata/virtual_reader_props
@@ -204,10 +204,10 @@ build block-size=1 index-block-size=1 table-format=(Pebble,v4)
 a.SET.1:a
 d.SET.2:d
 f.SET.3:f
-EncodeSpan: d-e:{(#4,RANGEDEL)}
-EncodeSpan: a-d:{(#11,RANGEKEYSET,@10,foo)}
-EncodeSpan: g-l:{(#5,RANGEDEL)}
-EncodeSpan: y-z:{(#12,RANGEKEYSET,@11,foo)}
+Span: d-e:{(#4,RANGEDEL)}
+Span: a-d:{(#11,RANGEKEYSET,@10,foo)}
+Span: g-l:{(#5,RANGEDEL)}
+Span: y-z:{(#12,RANGEKEYSET,@11,foo)}
 ----
 point:    [a#1,SET-f#3,SET]
 rangedel: [d#4,RANGEDEL-l#inf,RANGEDEL]
@@ -236,10 +236,10 @@ build block-size=1 index-block-size=1 table-format=(Pebble,v5)
 a.SET.1:a
 d.SET.2:d
 f.SET.3:f
-EncodeSpan: d-e:{(#4,RANGEDEL)}
-EncodeSpan: a-d:{(#11,RANGEKEYSET,@10,foo)}
-EncodeSpan: g-l:{(#5,RANGEDEL)}
-EncodeSpan: y-z:{(#12,RANGEKEYSET,@11,foo)}
+Span: d-e:{(#4,RANGEDEL)}
+Span: a-d:{(#11,RANGEKEYSET,@10,foo)}
+Span: g-l:{(#5,RANGEDEL)}
+Span: y-z:{(#12,RANGEKEYSET,@11,foo)}
 ----
 point:    [a#1,SET-f#3,SET]
 rangedel: [d#4,RANGEDEL-l#inf,RANGEDEL]
diff --git a/sstable/testdata/writer b/sstable/testdata/writer
@@ -23,9 +23,9 @@ f.SET.5:f
 g.DEL.6:
 h.MERGE.7:h
 i.RANGEDEL.8:j
-EncodeSpan: j-k:{(#9,RANGEKEYDEL)}
-EncodeSpan: k-l:{(#10,RANGEKEYUNSET,@5)}
-EncodeSpan: l-m:{(#11,RANGEKEYSET,@10,foo)}
+Span: j-k:{(#9,RANGEKEYDEL)}
+Span: k-l:{(#10,RANGEKEYUNSET,@5)}
+Span: l-m:{(#11,RANGEKEYSET,@10,foo)}
 ----
 point:    [a#1,SET-h#7,MERGE]
 rangedel: [d#4,RANGEDEL-j#inf,RANGEDEL]
@@ -46,9 +46,9 @@ e.SINGLEDEL.5:
 f.SET.6:f
 g.DEL.7:
 h.SINGLEDEL.8:
-EncodeSpan: j-k:{(#9,RANGEKEYDEL)}
-EncodeSpan: k-l:{(#10,RANGEKEYUNSET,@5)}
-EncodeSpan: l-m:{(#11,RANGEKEYSET,@10,foo)}
+Span: j-k:{(#9,RANGEKEYDEL)}
+Span: k-l:{(#10,RANGEKEYUNSET,@5)}
+Span: l-m:{(#11,RANGEKEYSET,@10,foo)}
 ----
 point:    [a#1,SET-h#8,SINGLEDEL]
 rangekey: [j#9,RANGEKEYDEL-m#inf,RANGEKEYSET]
@@ -91,11 +91,11 @@ i-j:{(#8,RANGEDEL)}
 # 1:          j---------------z
 
 build
-EncodeSpan: a-f:{(#3,RANGEDEL)}
-EncodeSpan: f-j:{(#3,RANGEDEL) (#2,RANGEDEL)}
-EncodeSpan: j-m:{(#3,RANGEDEL) (#2,RANGEDEL) (#1,RANGEDEL)}
-EncodeSpan: m-s:{(#2,RANGEDEL) (#1,RANGEDEL)}
-EncodeSpan: s-z:{(#1,RANGEDEL)}
+Span: a-f:{(#3,RANGEDEL)}
+Span: f-j:{(#3,RANGEDEL) (#2,RANGEDEL)}
+Span: j-m:{(#3,RANGEDEL) (#2,RANGEDEL) (#1,RANGEDEL)}
+Span: m-s:{(#2,RANGEDEL) (#1,RANGEDEL)}
+Span: s-z:{(#1,RANGEDEL)}
 ----
 rangedel: [a#3,RANGEDEL-z#inf,RANGEDEL]
 seqnums:  [1-3]
@@ -193,20 +193,20 @@ rangedel: [a#1,RANGEDEL-d#inf,RANGEDEL]
 seqnums:  [1-2]
 
 build
-EncodeSpan: a-b:{(#2,RANGEKEYSET,@10,foo) (#1,RANGEKEYSET,@10,foo)}
+Span: a-b:{(#2,RANGEKEYSET,@10,foo) (#1,RANGEKEYSET,@10,foo)}
 ----
 rangekey: [a#2,RANGEKEYSET-b#inf,RANGEKEYSET]
 seqnums:  [1-2]
 
 build-raw
-EncodeSpan: b-c:{(#2,RANGEKEYSET,@10,foo)}
-EncodeSpan: a-b:{(#1,RANGEKEYSET,@10,foo)}
+Span: b-c:{(#2,RANGEKEYSET,@10,foo)}
+Span: a-b:{(#1,RANGEKEYSET,@10,foo)}
 ----
 pebble: range keys starts must be added in increasing order: b#2,RANGEKEYSET, a#1,RANGEKEYSET
 
 build-raw
-EncodeSpan: a-c:{(#1,RANGEKEYSET,@10,foo)}
-EncodeSpan: c-d:{(#2,RANGEKEYSET,@10,foo)}
+Span: a-c:{(#1,RANGEKEYSET,@10,foo)}
+Span: c-d:{(#2,RANGEKEYSET,@10,foo)}
 ----
 rangekey: [a#1,RANGEKEYSET-d#inf,RANGEKEYSET]
 seqnums:  [1-2]
@@ -215,7 +215,7 @@ seqnums:  [1-2]
 # though the key kinds must be ordered (descending).
 
 build-raw
-EncodeSpan: a-b:{(#1,RANGEKEYSET,@10,foo) (#1,RANGEKEYUNSET,@t10) (#1,RANGEKEYDEL)}
+Span: a-b:{(#1,RANGEKEYSET,@10,foo) (#1,RANGEKEYUNSET,@t10) (#1,RANGEKEYDEL)}
 ----
 rangekey: [a#1,RANGEKEYSET-b#inf,RANGEKEYDEL]
 seqnums:  [1-1]
@@ -275,9 +275,9 @@ sstable
 # Range keys, if present, are shown in the layout.
 
 build
-EncodeSpan: a-b:{(#3,RANGEKEYSET,@3,foo)}
-EncodeSpan: b-c:{(#2,RANGEKEYSET,@2,bar)}
-EncodeSpan: c-d:{(#1,RANGEKEYSET,@1,baz)}
+Span: a-b:{(#3,RANGEKEYSET,@3,foo)}
+Span: b-c:{(#2,RANGEKEYSET,@2,bar)}
+Span: c-d:{(#1,RANGEKEYSET,@1,baz)}
 ----
 rangekey: [a#3,RANGEKEYSET-d#inf,RANGEKEYSET]
 seqnums:  [1-3]
diff --git a/sstable/testdata/writer_v3 b/sstable/testdata/writer_v3
diff --git a/sstable/testdata/writer_v5 b/sstable/testdata/writer_v5
diff --git a/sstable/testdata/writer_v6 b/sstable/testdata/writer_v6
diff --git a/testdata/ingest_load b/testdata/ingest_load
diff --git a/testdata/ingest_update_seqnums b/testdata/ingest_update_seqnums
diff --git a/testdata/level_checker b/testdata/level_checker
