@@ -8,6 +8,7 @@ package rangefeed
88import (
99 "context"
1010 "math/rand"
11+ "slices"
1112 "testing"
1213
1314 "github.com/cockroachdb/cockroach/pkg/keys"
@@ -27,31 +28,6 @@ import (
2728 "github.com/stretchr/testify/require"
2829)
2930
30- type kvs = storageutils.KVs
31-
32- var (
33- pointKV = storageutils .PointKV
34- rangeKV = storageutils .RangeKV
35- )
36-
37- var (
38- testKey = roachpb .Key ("/db1" )
39- testTxnID = uuid .MakeV4 ()
40- testIsolationLevel = isolation .Serializable
41- testSpan = roachpb.Span {Key : roachpb .Key ("a" ), EndKey : roachpb .Key ("z" )}
42- testTs = hlc.Timestamp {WallTime : 1 }
43- testStartKey = roachpb .Key ("a" )
44- testEndKey = roachpb .Key ("z" )
45- testValue = []byte ("1" )
46- testPrevValue = []byte ("1234" )
47- testSSTKVs = kvs {
48- pointKV ("a" , 1 , "1" ),
49- pointKV ("b" , 1 , "2" ),
50- pointKV ("c" , 1 , "3" ),
51- rangeKV ("d" , "e" , 1 , "" ),
52- }
53- )
54-
5531type testData struct {
5632 numOfLogicalOps int
5733 kvs []interface {}
@@ -68,9 +44,34 @@ type testData struct {
6844 omitInRangefeeds bool
6945}
7046
71- func generateStaticTestdata () testData {
47+ // testSSTKVs returns a set of key-value pairs that can be used for testing.
48+ // Note that the value output depends on storage.disableSimpleValueEncoding.
49+ func testSSTKVs () storageutils.KVs {
50+ return storageutils.KVs {
51+ storageutils .PointKV ("a" , 1 , "1" ),
52+ storageutils .PointKV ("b" , 1 , "2" ),
53+ storageutils .PointKV ("c" , 1 , "3" ),
54+ storageutils .RangeKV ("d" , "e" , 1 , "" ),
55+ }
56+ }
57+
58+ func generateStaticTestdata (t * testing.T ) testData {
59+ storage .DisableMetamorphicSimpleValueEncoding (t )
60+
61+ var (
62+ testKey = roachpb .Key ("/db1" )
63+ testTxnID = uuid .MakeV4 ()
64+ testIsolationLevel = isolation .Serializable
65+ testSpan = roachpb.Span {Key : roachpb .Key ("a" ), EndKey : roachpb .Key ("z" )}
66+ testTs = hlc.Timestamp {WallTime : 1 }
67+ testStartKey = roachpb .Key ("a" )
68+ testEndKey = roachpb .Key ("z" )
69+ testValue = []byte ("1" )
70+ testPrevValue = []byte ("1234" )
71+ )
72+
7273 return testData {
73- kvs : testSSTKVs ,
74+ kvs : testSSTKVs () ,
7475 span : testSpan ,
7576 key : testKey ,
7677 timestamp : testTs ,
@@ -94,9 +95,7 @@ func generateStaticTestdata() testData {
9495// be careful and account the memory usage of the additional underlying data
9596// structure. Otherwise, you can simply update the expected values in this test.
9697func TestEventSizeCalculation (t * testing.T ) {
97- st := cluster .MakeTestingClusterSettings ()
98- data := generateStaticTestdata ()
99- storage .CompressionAlgorithmStorage .Override (context .Background (), & st .SV , storage .StoreCompressionSnappy )
98+ data := generateStaticTestdata (t )
10099
101100 key := data .key
102101 timestamp := data .timestamp
@@ -114,7 +113,16 @@ func TestEventSizeCalculation(t *testing.T) {
114113 omitInRangefeeds := data .omitInRangefeeds
115114
116115 span := data .span
116+
117+ // Fix settings that can affect the size of the sstable.
118+ st := cluster .MakeTestingClusterSettings ()
119+ storage .CompressionAlgorithmStorage .Override (context .Background (), & st .SV , storage .StoreCompressionSnappy )
120+ storage .IngestionValueBlocksEnabled .Override (context .Background (), & st .SV , true )
117121 sst , _ , _ := storageutils .MakeSST (t , st , data .kvs )
122+ // The test cares about cap(sst); this can hide bugs where the sst
123+ // generation is non-deterministic and results in slightly different
124+ // lengths. Clip the slice to its length half the time to detect this.
125+ sst = slices .Clip (sst )
118126
119127 for _ , tc := range []struct {
120128 name string
@@ -220,10 +228,10 @@ func TestEventSizeCalculation(t *testing.T) {
220228 {
221229 name : "sstEvent event" ,
222230 ev : event {sst : & sstEvent {data : sst , span : span , ts : timestamp }},
223- expectedCurrMemUsage : int64 (2218 ),
231+ expectedCurrMemUsage : int64 (1186 ),
224232 actualCurrMemUsage : eventOverhead + sstEventOverhead +
225233 int64 (cap (sst )+ cap (span .Key )+ cap (span .EndKey )),
226- expectedFutureMemUsage : int64 (2242 ),
234+ expectedFutureMemUsage : int64 (1210 ),
227235 actualFutureMemUsage : futureEventBaseOverhead + rangefeedSSTTableOverhead +
228236 int64 (cap (sst )+ cap (span .Key )+ cap (span .EndKey )),
229237 },
@@ -290,7 +298,7 @@ func generateRandomTestData(rand *rand.Rand) testData {
290298 startKey , endkey := generateStartAndEndKey (rand )
291299 return testData {
292300 numOfLogicalOps : rand .Intn (100 ) + 1 , // Avoid 0 (empty event)
293- kvs : testSSTKVs ,
301+ kvs : testSSTKVs () ,
294302 span : generateRandomizedSpan (rand ).AsRawSpanWithNoLocals (),
295303 key : generateRandomizedBytes (rand ),
296304 timestamp : GenerateRandomizedTs (rand , 100 /* maxTime */ ),
0 commit comments