File tree Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -1830,10 +1830,10 @@ def go_deps():
1830
1830
patches = [
1831
1831
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
1832
1832
],
1833
- sha256 = "ce6b413d464aa7d86272d5b70b34cfe911c05f4dd4ce540cabaf7899c766aba3 ",
1834
- strip_prefix = "github.com/cockroachdb/
[email protected] 20250918210818-53f12aa6852b ",
1833
+ sha256 = "2fefabece81a88650b7562c3d1b2498b57f32624453b9b277ee34e5b7bfc8afc ",
1834
+ strip_prefix = "github.com/cockroachdb/
[email protected] 20250923154941-e1277c42a560 ",
1835
1835
urls = [
1836
- "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250918210818-53f12aa6852b .zip",
1836
+ "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250923154941-e1277c42a560 .zip",
1837
1837
],
1838
1838
)
1839
1839
go_repository(
Original file line number Diff line number Diff line change @@ -356,7 +356,7 @@ DISTDIR_FILES = {
356
356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip" : "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e" ,
357
357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip" : "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e" ,
358
358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip" : "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea" ,
359
- "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250918210818-53f12aa6852b .zip" : "ce6b413d464aa7d86272d5b70b34cfe911c05f4dd4ce540cabaf7899c766aba3 " ,
359
+ "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250923154941-e1277c42a560 .zip" : "2fefabece81a88650b7562c3d1b2498b57f32624453b9b277ee34e5b7bfc8afc " ,
360
360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip" : "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf" ,
361
361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip" : "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b" ,
362
362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip" : "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1" ,
Original file line number Diff line number Diff line change @@ -142,7 +142,7 @@ require (
142
142
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
143
143
github.com/cockroachdb/gostdlib v1.19.0
144
144
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
145
- github.com/cockroachdb/pebble v0.0.0-20250918210818-53f12aa6852b
145
+ github.com/cockroachdb/pebble v0.0.0-20250923154941-e1277c42a560
146
146
github.com/cockroachdb/redact v1.1.6
147
147
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
148
148
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
Original file line number Diff line number Diff line change @@ -577,8 +577,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
577
577
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 /go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo =
578
578
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA =
579
579
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 /go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA =
580
- github.com/cockroachdb/pebble v0.0.0-20250918210818-53f12aa6852b h1:3SqE/JRApTxaGjSQC3En4sEzQ/FHDPYVVMO7aRtgPc8 =
581
- github.com/cockroachdb/pebble v0.0.0-20250918210818-53f12aa6852b /go.mod h1:H/DxkYtsYVJwPFLikOL9yzb/PV7oIkz44CUmn4KecKg =
580
+ github.com/cockroachdb/pebble v0.0.0-20250923154941-e1277c42a560 h1:jf/rjcPdZkA4qwbsmuJFZ7jQbssRedM67THQXtnChVQ =
581
+ github.com/cockroachdb/pebble v0.0.0-20250923154941-e1277c42a560 /go.mod h1:H/DxkYtsYVJwPFLikOL9yzb/PV7oIkz44CUmn4KecKg =
582
582
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314 =
583
583
github.com/cockroachdb/redact v1.1.6 /go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg =
584
584
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA =
Original file line number Diff line number Diff line change @@ -4236,8 +4236,9 @@ func (sm *TenantsStorageMetrics) subtractMVCCStats(
4236
4236
}
4237
4237
4238
4238
func (sm * StoreMetrics ) updateEngineMetrics (m storage.Metrics ) {
4239
- sm .RdbBlockCacheHits .Update (m .BlockCache .Hits )
4240
- sm .RdbBlockCacheMisses .Update (m .BlockCache .Misses )
4239
+ hits , misses := m .BlockCache .HitsAndMisses .Aggregate ()
4240
+ sm .RdbBlockCacheHits .Update (hits )
4241
+ sm .RdbBlockCacheMisses .Update (misses )
4241
4242
sm .RdbBlockCacheUsage .Update (m .BlockCache .Size )
4242
4243
sm .RdbBloomFilterPrefixUseful .Update (m .Filter .Hits )
4243
4244
sm .RdbBloomFilterPrefixChecked .Update (m .Filter .Hits + m .Filter .Misses )
Original file line number Diff line number Diff line change @@ -1363,8 +1363,6 @@ func (m *Metrics) AsStoreStatsEvent() eventpb.StoreStats {
1363
1363
e := eventpb.StoreStats {
1364
1364
CacheSize : m .BlockCache .Size ,
1365
1365
CacheCount : m .BlockCache .Count ,
1366
- CacheHits : m .BlockCache .Hits ,
1367
- CacheMisses : m .BlockCache .Misses ,
1368
1366
CompactionCountDefault : m .Compact .DefaultCount ,
1369
1367
CompactionCountDeleteOnly : m .Compact .DeleteOnlyCount ,
1370
1368
CompactionCountElisionOnly : m .Compact .ElisionOnlyCount ,
@@ -1395,6 +1393,7 @@ func (m *Metrics) AsStoreStatsEvent() eventpb.StoreStats {
1395
1393
TableZombieSize : m .Table .ZombieSize ,
1396
1394
RangeKeySetsCount : m .Keys .RangeKeySetsCount ,
1397
1395
}
1396
+ e .CacheHits , e .CacheMisses = m .BlockCache .HitsAndMisses .Aggregate ()
1398
1397
for i , l := range m .Levels {
1399
1398
if l .TablesCount == 0 {
1400
1399
continue
You can’t perform that action at this time.
0 commit comments