Skip to content

Commit 5c82c15

Browse files
jbowensjbowens
committed
go.mod: bump Pebble to 9eec1725930d
Changes: * [`9eec1725`](cockroachdb/pebble@9eec1725) pebble: bump the initial buffer pool size for ml compactions and blob readers * [`84981427`](cockroachdb/pebble@84981427) manifest: don't compact blob files with uncertain outstanding references * [`2309bb86`](cockroachdb/pebble@2309bb86) table: add AlignCenter * [`77ef79ed`](cockroachdb/pebble@77ef79ed) Makefile: disable asan leak check * [`c27a208c`](cockroachdb/pebble@c27a208c) sstable: do not invalidate data block if bloomfilter returns false * [`d4618d5f`](cockroachdb/pebble@d4618d5f) db: periodically recheck the memtable write stall condition * [`d1873768`](cockroachdb/pebble@d1873768) db: add probe tests to TestIterHistories * [`ca74226f`](cockroachdb/pebble@ca74226f) db: SeekPrefixGE lazy positioning * [`55a5ed2d`](cockroachdb/pebble@55a5ed2d) db: check bounds on level number in options * [`dea3594f`](cockroachdb/pebble@dea3594f) db: panic on error inside initRangeKeyIter * [`26e9e357`](cockroachdb/pebble@26e9e357) wal: fix flake in TestFailoverWriter * [`34f641bd`](cockroachdb/pebble@34f641bd) db: clean up runDBDefineCmd * [`00352d06`](cockroachdb/pebble@00352d06) db: clean up test code for set-concurrent-compactions * [`cc9d5be9`](cockroachdb/pebble@cc9d5be9) db: remove unused runIngestCmd argument * [`5fd86301`](cockroachdb/pebble@5fd86301) db: split up TestCompaction * [`6cec7e7e`](cockroachdb/pebble@6cec7e7e) db: don't reuse options in TestLargeKeys * [`fae28918`](cockroachdb/pebble@fae28918) db: don't reuse options in TestRangeDel * [`7abb0048`](cockroachdb/pebble@7abb0048) db: don't reuse options in TestCompactionPickerScores * [`505e4d35`](cockroachdb/pebble@505e4d35) db: don't reuse options in TestCompactionPickerPickFile * [`372748c4`](cockroachdb/pebble@372748c4) db: don't reuse options in TestMarkedForCompaction * [`5115ff49`](cockroachdb/pebble@5115ff49) db: fix TestTableStats options reuse * [`a63723b0`](cockroachdb/pebble@a63723b0) github: run nightlies on go1.23 and go1.25 * [`75190841`](cockroachdb/pebble@75190841) github: use 1.23 in CI * [`e926c26b`](cockroachdb/pebble@e926c26b) internal/manifest: add heap maintaining virtual backing rewrite candidates * [`2b278238`](cockroachdb/pebble@2b278238) internal/manifest: create virtual_backings testdata dir * [`5d8a7ef1`](cockroachdb/pebble@5d8a7ef1) manifest/internal: adjust VirtualBackings map to track pointers Release note: none. Epic: none.
1 parent e4db2dd commit 5c82c15

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,10 +1820,10 @@ def go_deps():
18201820
patches = [
18211821
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18221822
],
1823-
sha256 = "349899ce403cf2875a953fec3a21666bc8f94b1d8ca6804afde2468158fbdfaa",
1824-
strip_prefix = "github.com/cockroachdb/[email protected]20250908223345-342d2e8b9a0b",
1823+
sha256 = "10060b8a61eef9e99114b4e92a058f142507920eb1a32217c9026d684c44ae63",
1824+
strip_prefix = "github.com/cockroachdb/[email protected]20250915183128-9eec1725930d",
18251825
urls = [
1826-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250908223345-342d2e8b9a0b.zip",
1826+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250915183128-9eec1725930d.zip",
18271827
],
18281828
)
18291829
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ DISTDIR_FILES = {
355355
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
358-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250908223345-342d2e8b9a0b.zip": "349899ce403cf2875a953fec3a21666bc8f94b1d8ca6804afde2468158fbdfaa",
358+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250915183128-9eec1725930d.zip": "10060b8a61eef9e99114b4e92a058f142507920eb1a32217c9026d684c44ae63",
359359
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
361361
"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
@@ -141,7 +141,7 @@ require (
141141
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
142142
github.com/cockroachdb/gostdlib v1.19.0
143143
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
144-
github.com/cockroachdb/pebble v0.0.0-20250908223345-342d2e8b9a0b
144+
github.com/cockroachdb/pebble v0.0.0-20250915183128-9eec1725930d
145145
github.com/cockroachdb/redact v1.1.6
146146
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
147147
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
@@ -575,8 +575,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
575575
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
576576
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
577577
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
578-
github.com/cockroachdb/pebble v0.0.0-20250908223345-342d2e8b9a0b h1:CTGQjhiyKYKYCBc5hz/do1fHKFJZg5l8TOnLQ7LgZCs=
579-
github.com/cockroachdb/pebble v0.0.0-20250908223345-342d2e8b9a0b/go.mod h1:zc33YirQWSE/Dw6WFmZSOAi3L0FcH23cXGbH6qZGF9k=
578+
github.com/cockroachdb/pebble v0.0.0-20250915183128-9eec1725930d h1:ywJG9y9tEEoVRcqH4Ig71Kq9PJcPbr9GwOnBqfKdQWY=
579+
github.com/cockroachdb/pebble v0.0.0-20250915183128-9eec1725930d/go.mod h1:zc33YirQWSE/Dw6WFmZSOAi3L0FcH23cXGbH6qZGF9k=
580580
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
581581
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
582582
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

‎pkg/kv/kvserver/print/debug_print.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func DecodeWriteBatch(writeBatch []byte) (string, error) {
239239
// pebble.KeyKindDeleteSized is the most recent key kind, ensuring that
240240
// compilation will fail if it's not. Unfortunately, this doesn't protect
241241
// against reusing a currently unused RocksDB key kind.
242-
const _ = uint(pebble.InternalKeyKindExcise - pebble.InternalKeyKindMax)
242+
const _ = uint(pebble.InternalKeyKindSyntheticKey - pebble.InternalKeyKindMax)
243243

244244
if writeBatch == nil {
245245
return "<nil>\n", nil

‎pkg/storage/batch.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
// latest key we considered equals InternalKeyKindMax, ensuring that compilation
2020
// will fail if it's not. Unfortunately, this doesn't protect against reusing a
2121
// currently unused RocksDB key kind.
22-
const _ = uint(pebble.InternalKeyKindExcise - pebble.InternalKeyKindMax)
22+
const _ = uint(pebble.InternalKeyKindSyntheticKey - pebble.InternalKeyKindMax)
2323

2424
// decodeBatchHeader decodes the header of Pebble batch representation,
2525
// returning the parsed header and a batchrepr.Reader into the contents of the

0 commit comments

Comments
 (0)