Skip to content

Commit f27190b

Browse files
RaduBerindeRaduBerinde
committed
go.mod: bump Pebble to e1277c42a560
Changes: * [`e1277c42`](cockroachdb/pebble@e1277c42) cache: separate hit/miss metrics by level * [`bf48872f`](cockroachdb/pebble@bf48872f) block: hide cache hits/misses from the level checker * [`0c63ea83`](cockroachdb/pebble@0c63ea83) metrics: more granular block cache metrics * [`96bb7581`](cockroachdb/pebble@96bb7581) metricsutil: add Window data structure * [`8b8ee488`](cockroachdb/pebble@8b8ee488) cache: improve BenchmarkCacheGet * [`4f3e287b`](cockroachdb/pebble@4f3e287b) pebble: deflake TestCompactionDeleteOnlyHints * [`6c6fd755`](cockroachdb/pebble@6c6fd755) cache: don't mark blocks as accessed for background work * [`6e9ddf29`](cockroachdb/pebble@6e9ddf29) cockroachkvs: avoid cockroachKeysSeeker.init allocation * [`f3afdb60`](cockroachdb/pebble@f3afdb60) cockroachkvs: add BenchmarkInitDataBlockMetadata * [`489b133b`](cockroachdb/pebble@489b133b) colblk: remove BlockDecoder allocation * [`5c08fa34`](cockroachdb/pebble@5c08fa34) colblk: add BenchmarkInitDataBlockMetadata * [`998a55aa`](cockroachdb/pebble@998a55aa) Revert "cache: use malloc instead of calloc" * [`3c70d62d`](cockroachdb/pebble@3c70d62d) db: reduce numOps in TestWALHardCrashRandomized * [`9086c4be`](cockroachdb/pebble@9086c4be) db: reduce numOps in TestWALFailoverRandomized * [`4aab1726`](cockroachdb/pebble@4aab1726) db: remove duplicate TestFileCacheClockPro * [`73bba8fb`](cockroachdb/pebble@73bba8fb) db: reduce TestOpenCloseOpenClose configurations * [`8e019e4e`](cockroachdb/pebble@8e019e4e) db: make TestCompaction/value_separation faster * [`1e1841c7`](cockroachdb/pebble@1e1841c7) db: make TestCompaction/l0_to_lbase_compaction faster Release note: none. Epic: none.
1 parent edc4191 commit f27190b

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,10 +1830,10 @@ def go_deps():
18301830
patches = [
18311831
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18321832
],
1833-
sha256 = "ce6b413d464aa7d86272d5b70b34cfe911c05f4dd4ce540cabaf7899c766aba3",
1834-
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20250918210818-53f12aa6852b",
1833+
sha256 = "2fefabece81a88650b7562c3d1b2498b57f32624453b9b277ee34e5b7bfc8afc",
1834+
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20250923154941-e1277c42a560",
18351835
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",
18371837
],
18381838
)
18391839
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ DISTDIR_FILES = {
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
358358
"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",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
362362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ require (
142142
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
143143
github.com/cockroachdb/gostdlib v1.19.0
144144
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
146146
github.com/cockroachdb/redact v1.1.6
147147
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
148148
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
577577
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
578578
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
579579
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=
582582
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
583583
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
584584
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

‎pkg/kv/kvserver/metrics.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4236,8 +4236,9 @@ func (sm *TenantsStorageMetrics) subtractMVCCStats(
42364236
}
42374237

42384238
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)
42414242
sm.RdbBlockCacheUsage.Update(m.BlockCache.Size)
42424243
sm.RdbBloomFilterPrefixUseful.Update(m.Filter.Hits)
42434244
sm.RdbBloomFilterPrefixChecked.Update(m.Filter.Hits + m.Filter.Misses)

‎pkg/storage/engine.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,8 +1363,6 @@ func (m *Metrics) AsStoreStatsEvent() eventpb.StoreStats {
13631363
e := eventpb.StoreStats{
13641364
CacheSize: m.BlockCache.Size,
13651365
CacheCount: m.BlockCache.Count,
1366-
CacheHits: m.BlockCache.Hits,
1367-
CacheMisses: m.BlockCache.Misses,
13681366
CompactionCountDefault: m.Compact.DefaultCount,
13691367
CompactionCountDeleteOnly: m.Compact.DeleteOnlyCount,
13701368
CompactionCountElisionOnly: m.Compact.ElisionOnlyCount,
@@ -1395,6 +1393,7 @@ func (m *Metrics) AsStoreStatsEvent() eventpb.StoreStats {
13951393
TableZombieSize: m.Table.ZombieSize,
13961394
RangeKeySetsCount: m.Keys.RangeKeySetsCount,
13971395
}
1396+
e.CacheHits, e.CacheMisses = m.BlockCache.HitsAndMisses.Aggregate()
13981397
for i, l := range m.Levels {
13991398
if l.TablesCount == 0 {
14001399
continue

0 commit comments

Comments
 (0)