Skip to content

Commit 975861f

Browse files
craig[bot]msbutler
andcommitted
Merge #148412
148412: storage: set LastUpdateNanos in ComputeSSTStatsDiff r=stevendanna a=msbutler ComputeSSTStatsDiff needs to set LastUpdateNanos, which it forgot to do when it was introduced in #147861. Epic: none Release note: none Co-authored-by: Michael Butler <[email protected]>
2 parents 8e52c96 + 6ac51a9 commit 975861f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pkg/storage/sst.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ func ComputeSSTStatsDiff(
356356
prevSSTKey.Timestamp = sstIterKey.Timestamp
357357
sstIter.Next()
358358
}
359+
ms.LastUpdateNanos = nowNanos
359360
return ms, nil
360361
}
361362

pkg/storage/sst_stats_diff_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,19 +186,22 @@ func TestMVCCComputeSSTStatsDiff(t *testing.T) {
186186
sstEncoded, startUnversioned, endUnversioned := storageutils.MakeSST(t, st, sst)
187187
start := storage.MVCCKey{Key: startUnversioned}
188188
end := storage.MVCCKey{Key: endUnversioned}
189+
updateTime := now + 1
189190

190191
statsDelta, err := storage.ComputeSSTStatsDiff(
191-
ctx, sstEncoded, engine, now, start, end)
192+
ctx, sstEncoded, engine, updateTime, start, end)
192193
require.NoError(t, err)
193194

194195
require.NoError(t, fs.WriteFile(engine.Env(), "sst", sstEncoded, fs.UnspecifiedWriteCategory))
195196
require.NoError(t, engine.IngestLocalFiles(ctx, []string{"sst"}))
196197

197-
expStats, err := storage.ComputeStats(ctx, engine, keys.LocalMax, roachpb.KeyMax, now)
198+
expStats, err := storage.ComputeStats(ctx, engine, keys.LocalMax, roachpb.KeyMax, updateTime)
198199
require.NoError(t, err)
199200

200201
baseStats.Add(statsDelta)
201202

203+
require.Equal(t, baseStats.LastUpdateNanos, updateTime)
204+
202205
t.Logf("sst %s, eng %s", sst, eng)
203206
if !baseStats.Equal(expStats) {
204207
t.Log("test, expected")

0 commit comments

Comments
 (0)