Skip to content

Commit

Permalink
Merge #132552
Browse files Browse the repository at this point in the history
132552: go.mod: bump Pebble to 8079611f00bc r=aadityasondhi a=jbowens

Changes:

 * [`8079611f`](cockroachdb/pebble@8079611f) sstable: fix colblk copyDataBlocks off-by-one
 * [`4b36ca34`](cockroachdb/pebble@4b36ca34) db: set FormatNewest to FormatColumnarBlocks
 * [`b57c91c4`](cockroachdb/pebble@b57c91c4) db: add FormatColumnarBlocks
 * [`52888b40`](cockroachdb/pebble@52888b40) db: add TestIteratorSeekPrefixGERandomized
 * [`df9d97d3`](cockroachdb/pebble@df9d97d3) colblk: fix PrefixBytesBuilder.UnsafeGet
 * [`af5365b6`](cockroachdb/pebble@af5365b6) sstable: use specific block reading methods in Describe
 * [`2b3795cd`](cockroachdb/pebble@2b3795cd) sstable: make CopySpan() support columnar blocks
 * [`453b46ca`](cockroachdb/pebble@453b46ca) sstable: remove describe-binary
 * [`80619174`](cockroachdb/pebble@80619174) sstable: cleanup readBlock usage
 * [`0ac9ddc9`](cockroachdb/pebble@0ac9ddc9) crdbtest: move cockroach colblk.KeySchema
 * [`79c9cbfc`](cockroachdb/pebble@79c9cbfc) db: use EncodeSpan in TestCheckLevelsCornerCases
 * [`4b62ea08`](cockroachdb/pebble@4b62ea08) colblk: more reader->decoder renames
 * [`0501caf7`](cockroachdb/pebble@0501caf7) db: consolidate datadriven DB opts parsing; fix block-size bug
 * [`fb2c2ff4`](cockroachdb/pebble@fb2c2ff4) colblk: use uint32 in bundleCalc

Release note: none.
Epic: none.

Co-authored-by: Jackson Owens <[email protected]>
  • Loading branch information
craig[bot] and jbowens committed Oct 16, 2024
2 parents 35db162 + 7734dbb commit 1529845
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1848,10 +1848,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "5eb8f4505cad0dc2c6d03e1cc70481f37ffdeaa6dc8d9ab95f1d3d6a4f9043ae",
strip_prefix = "github.com/cockroachdb/[email protected]20241010181228-999b65aeb052",
sha256 = "94bed05f2ccb2ca982ffe0d5ec4f708f6581ccb7cb7d58334896ee1ce660b040",
strip_prefix = "github.com/cockroachdb/[email protected]20241013170524-8079611f00bc",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241010181228-999b65aeb052.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241013170524-8079611f00bc.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241010181228-999b65aeb052.zip": "5eb8f4505cad0dc2c6d03e1cc70481f37ffdeaa6dc8d9ab95f1d3d6a4f9043ae",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241013170524-8079611f00bc.zip": "94bed05f2ccb2ca982ffe0d5ec4f708f6581ccb7cb7d58334896ee1ce660b040",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ require (
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
github.com/cockroachdb/gostdlib v1.19.0
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
github.com/cockroachdb/pebble v0.0.0-20241010181228-999b65aeb052
github.com/cockroachdb/pebble v0.0.0-20241013170524-8079611f00bc
github.com/cockroachdb/redact v1.1.5
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
github.com/cockroachdb/pebble v0.0.0-20241010181228-999b65aeb052 h1:10h2ebkMyhkEjAC18p1kg5YHa8DHJy3vzhxDBgcINuY=
github.com/cockroachdb/pebble v0.0.0-20241010181228-999b65aeb052/go.mod h1:LaF8D6p4Ko4EWprBmrcDs7FrmZYgDExF7dJyPvbq3Y4=
github.com/cockroachdb/pebble v0.0.0-20241013170524-8079611f00bc h1:lVKShHlqsB801RK+Qxs6FbU2kNBsEwel6OFtba/fmbA=
github.com/cockroachdb/pebble v0.0.0-20241013170524-8079611f00bc/go.mod h1:LaF8D6p4Ko4EWprBmrcDs7FrmZYgDExF7dJyPvbq3Y4=
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
Expand Down

0 comments on commit 1529845

Please sign in to comment.