Skip to content

Commit 91d1ff9

Browse files
jbowensjbowens
committed
*: use crstrings.LinesSeq
Use crstrings.LinesSeq rather than crstrings.Lines to avoid allocating an intermediary slice, where relevant.
1 parent ce957f4 commit 91d1ff9

26 files changed

+48
-48
lines changed

‎batch_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ func TestBatchIter(t *testing.T) {
966966
b = newBatch(nil)
967967
}
968968

969-
for _, line := range crstrings.Lines(d.Input) {
969+
for line := range crstrings.LinesSeq(d.Input) {
970970
kv := base.ParseInternalKV(line)
971971
require.NoError(t, b.Set(kv.K.UserKey, kv.InPlaceValue(), nil))
972972
}
@@ -1110,7 +1110,7 @@ func TestFlushableBatchIter(t *testing.T) {
11101110
switch d.Cmd {
11111111
case "define":
11121112
batch := newBatch(nil)
1113-
for _, line := range crstrings.Lines(d.Input) {
1113+
for line := range crstrings.LinesSeq(d.Input) {
11141114
kv := base.ParseInternalKV(line)
11151115
// Ignore any value in the test.
11161116
value := []byte(kv.K.SeqNum().String())
@@ -1138,7 +1138,7 @@ func TestFlushableBatch(t *testing.T) {
11381138
switch d.Cmd {
11391139
case "define":
11401140
batch := newBatch(nil)
1141-
for _, line := range crstrings.Lines(d.Input) {
1141+
for line := range crstrings.LinesSeq(d.Input) {
11421142
kv := base.ParseInternalKV(line)
11431143
value := kv.InPlaceValue()
11441144
if len(value) == 0 {

‎blob_rewrite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func TestBlobRewrite(t *testing.T) {
119119
if tw == nil {
120120
initRawWriter()
121121
}
122-
for _, line := range crstrings.Lines(d.Input) {
122+
for line := range crstrings.LinesSeq(d.Input) {
123123
ikv := base.ParseInternalKV(line)
124124
if value := string(ikv.InPlaceValue()); strings.HasPrefix(value, "blob") {
125125
ikv.V, err = bv.ParseInternalValue(value)

‎cockroachkvs/cockroachkvs_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func TestComparerFuncs(t *testing.T) {
9191
case "separator":
9292
var keys [][]byte
9393
var dst []byte
94-
for _, line := range crstrings.Lines(td.Input) {
94+
for line := range crstrings.LinesSeq(td.Input) {
9595
keys = keys[:0]
9696
for _, formattedKey := range strings.Fields(line) {
9797
k := ParseFormattedKey(formattedKey)
@@ -107,7 +107,7 @@ func TestComparerFuncs(t *testing.T) {
107107
return buf.String()
108108
case "successor":
109109
var dst []byte
110-
for _, line := range crstrings.Lines(td.Input) {
110+
for line := range crstrings.LinesSeq(td.Input) {
111111
k := ParseFormattedKey(line)
112112
dst = Comparer.Successor(dst[:0], k)
113113
fmt.Fprintf(&buf, "Successor(%q [%x]) = %q [%x]\n",
@@ -222,7 +222,7 @@ func TestKeySchema_KeySeeker(t *testing.T) {
222222
enc.Reset()
223223
maxKeyLen = 0
224224
var rows int
225-
for _, line := range crstrings.Lines(td.Input) {
225+
for line := range crstrings.LinesSeq(td.Input) {
226226
k := parseUserKey(line)
227227
fmt.Fprintf(&buf, "Parse(%s) = hex:%x\n", line, k)
228228
maxKeyLen = max(maxKeyLen, len(k))
@@ -241,15 +241,15 @@ func TestKeySchema_KeySeeker(t *testing.T) {
241241
initKeySeeker()
242242
syntheticSuffix, syntheticSuffixStr, _ := getSyntheticSuffix(t, td)
243243

244-
for _, line := range crstrings.Lines(td.Input) {
244+
for line := range crstrings.LinesSeq(td.Input) {
245245
k := parseUserKey(line)
246246
got := ks.IsLowerBound(k, syntheticSuffix)
247247
fmt.Fprintf(&buf, "IsLowerBound(%s, %q) = %t\n", line, syntheticSuffixStr, got)
248248
}
249249
return buf.String()
250250
case "seek-ge":
251251
initKeySeeker()
252-
for _, line := range crstrings.Lines(td.Input) {
252+
for line := range crstrings.LinesSeq(td.Input) {
253253
k := parseUserKey(line)
254254
boundRow := -1
255255
searchDir := 0
@@ -273,7 +273,7 @@ func TestKeySchema_KeySeeker(t *testing.T) {
273273
var kiter colblk.PrefixBytesIter
274274
kiter.Buf = make([]byte, maxKeyLen+len(syntheticSuffix)+1)
275275
prevRow := -1
276-
for _, line := range crstrings.Lines(td.Input) {
276+
for line := range crstrings.LinesSeq(td.Input) {
277277
row, err := strconv.Atoi(line)
278278
if err != nil {
279279
t.Fatalf("bad row number %q: %s", line, err)

‎cockroachkvs/key_schema_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func runDataDrivenTest(t *testing.T, path string) {
4949
case "init":
5050
e.Reset()
5151
var buf []byte
52-
for _, l := range crstrings.Lines(td.Input) {
52+
for l := range crstrings.LinesSeq(td.Input) {
5353
key, value := parseInternalKV(l)
5454
kcmp := e.KeyWriter.ComparePrev(key.UserKey)
5555
e.Add(key, value, 0, kcmp, false /* isObsolete */)
@@ -102,7 +102,7 @@ func runDataDrivenTest(t *testing.T, path string) {
102102
require.NoError(t, iter.Init(&d, bd, blockiter.Transforms{}))
103103
defer iter.Close()
104104
var buf strings.Builder
105-
for _, l := range crstrings.Lines(td.Input) {
105+
for l := range crstrings.LinesSeq(td.Input) {
106106
key := parseUserKey(l)
107107
fmt.Fprintf(&buf, "%s: ", formatUserKey(key))
108108
kv := iter.SeekGE(key, base.SeekGEFlagsNone)

‎compaction_picker_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ func TestCompactionPickerPickReadTriggered(t *testing.T) {
876876
return buf.String()
877877

878878
case "add-read-compaction":
879-
for _, line := range crstrings.Lines(td.Input) {
879+
for line := range crstrings.LinesSeq(td.Input) {
880880
parts := strings.Split(line, " ")
881881
if len(parts) != 3 {
882882
return "error: malformed data for add-read-compaction. usage: <level>: <start>-<end> <filenum>"
@@ -1384,7 +1384,7 @@ func TestCompactionPickerPickFile(t *testing.T) {
13841384
case "problem-spans":
13851385
problemSpans = &problemspans.ByLevel{}
13861386
problemSpans.Init(manifest.NumLevels, d.opts.Comparer.Compare)
1387-
for _, line := range crstrings.Lines(td.Input) {
1387+
for line := range crstrings.LinesSeq(td.Input) {
13881388
var level int
13891389
var span1, span2 string
13901390
n, err := fmt.Sscanf(line, "L%d %s %s", &level, &span1, &span2)

‎compaction_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,7 @@ func runCompactionTest(
12001200

12011201
case "validate-blob-reference-index-block":
12021202
var inputTables []*manifest.TableMetadata
1203-
for _, line := range crstrings.Lines(td.Input) {
1203+
for line := range crstrings.LinesSeq(td.Input) {
12041204
// Parse the file number from the filename
12051205
fileName := strings.TrimSuffix(line, ".sst")
12061206
fileNum, err := strconv.ParseUint(fileName, 10, 64)
@@ -2183,7 +2183,7 @@ func TestCompactionReadTriggeredQueue(t *testing.T) {
21832183
queue = &readCompactionQueue{}
21842184
return "(success)"
21852185
case "add-compaction":
2186-
for _, line := range crstrings.Lines(td.Input) {
2186+
for line := range crstrings.LinesSeq(td.Input) {
21872187
parts := strings.Split(line, " ")
21882188

21892189
if len(parts) != 3 {
@@ -2303,7 +2303,7 @@ func TestCompactionReadTriggered(t *testing.T) {
23032303
case "add-read-compaction":
23042304
d.mu.Lock()
23052305
td.MaybeScanArgs(t, "flushing", &d.mu.compact.flushing)
2306-
for _, line := range crstrings.Lines(td.Input) {
2306+
for line := range crstrings.LinesSeq(td.Input) {
23072307
parts := strings.Split(line, " ")
23082308
if len(parts) != 3 {
23092309
return "error: malformed data for add-read-compaction. usage: <level>: <start>-<end> <filenum>"
@@ -2422,7 +2422,7 @@ func TestCompactionAllowZeroSeqNum(t *testing.T) {
24222422
d.mu.Unlock()
24232423

24242424
var buf bytes.Buffer
2425-
for _, line := range crstrings.Lines(td.Input) {
2425+
for line := range crstrings.LinesSeq(td.Input) {
24262426
parts := strings.Fields(line)
24272427
c.flush.flushables = nil
24282428
c.startLevel.level = -1

‎data_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ func splitFieldsRange(line string, minmum, maximum int) ([]string, error) {
462462
}
463463

464464
func runBatchDefineCmd(d *datadriven.TestData, b *Batch) error {
465-
for _, line := range crstrings.Lines(d.Input) {
465+
for line := range crstrings.LinesSeq(d.Input) {
466466
i := strings.IndexFunc(line, unicode.IsSpace)
467467
cmd := line
468468
if i > 0 {
@@ -1030,7 +1030,7 @@ func runDBDefineCmd(td *datadriven.TestData, opts *Options) (*DB, error) {
10301030
return c, nil
10311031
}
10321032

1033-
for _, line := range crstrings.Lines(td.Input) {
1033+
for line := range crstrings.LinesSeq(td.Input) {
10341034
fields := strings.Fields(line)
10351035
if len(fields) > 0 {
10361036
switch fields[0] {

‎internal/deletepacer/delete_pacer_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ type testState struct {
9090
func executeTest(t *testing.T, td *datadriven.TestData, ts *testState) {
9191
repeat := 1
9292
td.MaybeScanArgs(t, "repeat", &repeat)
93-
for _, l := range crstrings.Lines(strings.Repeat(td.Input+"\n", repeat)) {
93+
for l := range crstrings.LinesSeq(strings.Repeat(td.Input+"\n", repeat)) {
9494
if l == "" {
9595
continue
9696
}

‎internal/manifest/version_edit_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func TestVersionEditDecode(t *testing.T) {
290290
return outputBuf.String()
291291

292292
case "decode":
293-
for _, l := range crstrings.Lines(d.Input) {
293+
for l := range crstrings.LinesSeq(d.Input) {
294294
i := strings.IndexByte(l, '#')
295295
if i == -1 {
296296
i = len(l)

‎internal/problemspans/by_level.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func (bl *ByLevel) String() string {
121121
for i := range bl.levels {
122122
if !bl.levels[i].IsEmpty() {
123123
fmt.Fprintf(&buf, "L%d:\n", i)
124-
for _, line := range crstrings.Lines(bl.levels[i].String()) {
124+
for line := range crstrings.LinesSeq(bl.levels[i].String()) {
125125
fmt.Fprintf(&buf, " %s\n", line)
126126
}
127127
}

0 commit comments

Comments
 (0)