Skip to content

Commit 3a12304

Browse files
craig[bot]itsbilal
craig[bot]
andcommitted
Merge #110054
110054: go.mod: bump Pebble to 7ffe773358b8 r=RaduBerinde a=itsbilal ``` 7ffe7733 manifest: grab manifest lock when calling InitCompactingFileInfo a3375e8a testkeys: use int64 indexes for KeySpace d64de4aa db: add comments on flushable method implementations fd5e2099 db: add documentation for memTable.writerUnref ec854eea db: rename commitQueue.dequeue to dequeueApplied 556a12ed Use SeekPrefixGE to avoid unnecessary disk read in Get function 87f4f125 db: crash on logNum invariant violation f94905ad db: remove unused compactionPicker.getEstimatedMaxWAmp 2c133248 db: move manual compaction picking off the compaction picker 9672ffea manifest: track total size within LevelMetadata 0f69e1e3 db: move diskAvailBytes onto compactionEnv 97a33a41 db: lift some helper funcs off of the compactionPicker a4fe0500 scripts: add code coverage script a207649c metamorphic: allow coverage instrumentation ``` Fixes #109866. Release note: None. Epic: none Co-authored-by: Bilal Akhtar <[email protected]>
2 parents 725501d + 232cf61 commit 3a12304

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

DEPS.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,10 +1609,10 @@ def go_deps():
16091609
patches = [
16101610
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
16111611
],
1612-
sha256 = "6835bbc6fa536264138a27d7c4faeed6a56da5c77ddf2f7a26772dd149fccccc",
1613-
strip_prefix = "github.com/cockroachdb/[email protected]20230901194557-14df16a60758",
1612+
sha256 = "b23621f799c758ae7764b1293f1971cce545bc061bf61991589a0a9087936fe7",
1613+
strip_prefix = "github.com/cockroachdb/[email protected]20230905184020-7ffe773358b8",
16141614
urls = [
1615-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230901194557-14df16a60758.zip",
1615+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230905184020-7ffe773358b8.zip",
16161616
],
16171617
)
16181618
go_repository(

build/bazelutil/distdir_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ DISTDIR_FILES = {
322322
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
323323
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
324324
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
325-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230901194557-14df16a60758.zip": "6835bbc6fa536264138a27d7c4faeed6a56da5c77ddf2f7a26772dd149fccccc",
325+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230905184020-7ffe773358b8.zip": "b23621f799c758ae7764b1293f1971cce545bc061bf61991589a0a9087936fe7",
326326
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
327327
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
328328
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ require (
115115
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
116116
github.com/cockroachdb/gostdlib v1.19.0
117117
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
118-
github.com/cockroachdb/pebble v0.0.0-20230901194557-14df16a60758
118+
github.com/cockroachdb/pebble v0.0.0-20230905184020-7ffe773358b8
119119
github.com/cockroachdb/redact v1.1.5
120120
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
121121
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
@@ -492,8 +492,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
492492
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
493493
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
494494
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
495-
github.com/cockroachdb/pebble v0.0.0-20230901194557-14df16a60758 h1:Wp9BiXWbSE3VSImkQXYfRnrbm9BpgQjFBY3VsKfXphw=
496-
github.com/cockroachdb/pebble v0.0.0-20230901194557-14df16a60758/go.mod h1:nindLFinxeDPjP4qI9LtVHAwDef57/0s5KMfWgdktQc=
495+
github.com/cockroachdb/pebble v0.0.0-20230905184020-7ffe773358b8 h1:aeJbtGR8u9wQXS8SRkmgLs+NP9bMXir78VJ8VLqK/Lo=
496+
github.com/cockroachdb/pebble v0.0.0-20230905184020-7ffe773358b8/go.mod h1:nindLFinxeDPjP4qI9LtVHAwDef57/0s5KMfWgdktQc=
497497
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
498498
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
499499
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

0 commit comments

Comments
 (0)