Merge #45549

45549: changefeedccl: pick up TargetBytes for backfill ScanRequest r=ajwerner a=ajwerner Now that #44925 has merged, we can use a byte limit rather than a row limit. Release note: None Co-authored-by: Andrew Werner <[email protected]>
cockroachdb · Mar 3, 2020 · 0414b69 · 0414b69
2 parents 47259c2 + 3433fbd
commit 0414b69
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/pkg/ccl/changefeedccl/kvfeed/scanner.go b/pkg/ccl/changefeedccl/kvfeed/scanner.go
@@ -103,15 +103,13 @@ func (p *scanRequestScanner) exportSpan(
 	txn.SetFixedTimestamp(ctx, ts)
 	stopwatchStart := timeutil.Now()
 	var scanDuration, bufferDuration time.Duration
-	// TODO(ajwerner): Adopt the byte limit here as soon as it merges. This must
-	// happen in 20.1!
-	const maxKeysPerScan = 1 << 18
+	const targetBytesPerScan = 16 << 20 // 16 MiB
 	for remaining := span; ; {
 		start := timeutil.Now()
 		b := txn.NewBatch()
 		r := roachpb.NewScan(remaining.Key, remaining.EndKey).(*roachpb.ScanRequest)
 		r.ScanFormat = roachpb.BATCH_RESPONSE
-		b.Header.MaxSpanRequestKeys = maxKeysPerScan
+		b.Header.TargetBytes = targetBytesPerScan
 		// NB: We use a raw request rather than the Scan() method because we want
 		// the MVCC timestamps which are encoded in the response but are filtered
 		// during result parsing.