From 9ae73d94a64f978644fb1ed91f6cfb0b39cdc08d Mon Sep 17 00:00:00 2001 From: Radu Berinde Date: Mon, 8 Jul 2024 20:42:30 -0700 Subject: [PATCH] go.mod: bump Pebble to 7920d968a3d5 Changes: * [`7920d968`](https://github.com/cockroachdb/pebble/commit/7920d968) *: add facility to print the iterator stack * [`d3cde23d`](https://github.com/cockroachdb/pebble/commit/d3cde23d) keyspan: reimplement straddle spans in LevelIter * [`e8fd26a0`](https://github.com/cockroachdb/pebble/commit/e8fd26a0) sstable: simplify monotonic bounds optimization condition * [`fad89cfb`](https://github.com/cockroachdb/pebble/commit/fad89cfb) rowblk: support synthetic prefix in FragmentIter * [`4981bd0e`](https://github.com/cockroachdb/pebble/commit/4981bd0e) colblk: add Bitmap, BitmapBuilder * [`a28d244d`](https://github.com/cockroachdb/pebble/commit/a28d244d) keyspan: remove err field from LevelIter * [`3ef2e5b1`](https://github.com/cockroachdb/pebble/commit/3ef2e5b1) rowblk: add a basic unit test for FragmentIter * [`144e5175`](https://github.com/cockroachdb/pebble/commit/144e5175) rowblk: reorganize tests * [`15ec0c9b`](https://github.com/cockroachdb/pebble/commit/15ec0c9b) sstable: add layoutWriter * [`89f4160b`](https://github.com/cockroachdb/pebble/commit/89f4160b) sstable: drop support for v1 range deletion blocks * [`870777c9`](https://github.com/cockroachdb/pebble/commit/870777c9) sstable: add metaIndexWriter * [`96660eb8`](https://github.com/cockroachdb/pebble/commit/96660eb8) sstable/rowblk: replace RawWriter with methods on rowblk.Writer * [`96eeb815`](https://github.com/cockroachdb/pebble/commit/96eeb815) vfs: fix memFile pos * [`18b77232`](https://github.com/cockroachdb/pebble/commit/18b77232) sstable: add FragmentIterTransforms Release note: none. Epic: none. --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/storage/mvcc_history_test.go | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index ce7c9e2f170e..a51381e285d3 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1688,10 +1688,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "c2df3307fef2f5a6d666d4006dd70a0fd72e31da056fe572c08161850253d0a8", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240626150935-dcaec76d722d", + sha256 = "e0c6da2f92bbadea058a4ea4da5784f97d4b9756995e8399a9b6f9ba5236939f", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240708205823-7920d968a3d5", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240626150935-dcaec76d722d.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240708205823-7920d968a3d5.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 57667ed5a673..71d39206d5e2 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -331,7 +331,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-20240626150935-dcaec76d722d.zip": "c2df3307fef2f5a6d666d4006dd70a0fd72e31da056fe572c08161850253d0a8", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240708205823-7920d968a3d5.zip": "e0c6da2f92bbadea058a4ea4da5784f97d4b9756995e8399a9b6f9ba5236939f", "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", diff --git a/go.mod b/go.mod index d6ed472ba0f9..9268b0b4c8e7 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,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-20240626150935-dcaec76d722d + github.com/cockroachdb/pebble v0.0.0-20240708205823-7920d968a3d5 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 diff --git a/go.sum b/go.sum index dcc83eb2540b..cdfa62e78b29 100644 --- a/go.sum +++ b/go.sum @@ -511,8 +511,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-20240626150935-dcaec76d722d h1:Bl36DeDJ/QUDWwFOnSesHHZ5Lvk1n85A2q7YLUrAvFg= -github.com/cockroachdb/pebble v0.0.0-20240626150935-dcaec76d722d/go.mod h1:6JguuJ0y0eK70b9ElngP0M8VVoFsCeEQIOpl7Cjgb+U= +github.com/cockroachdb/pebble v0.0.0-20240708205823-7920d968a3d5 h1:wsOuzRsMffMtyzdprn1R7sME4Q7KCDvDQT3P0apJ7jM= +github.com/cockroachdb/pebble v0.0.0-20240708205823-7920d968a3d5/go.mod h1:6JguuJ0y0eK70b9ElngP0M8VVoFsCeEQIOpl7Cjgb+U= 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= diff --git a/pkg/storage/mvcc_history_test.go b/pkg/storage/mvcc_history_test.go index b0c3e4cb5823..803c7f243e44 100644 --- a/pkg/storage/mvcc_history_test.go +++ b/pkg/storage/mvcc_history_test.go @@ -300,7 +300,7 @@ func TestMVCCHistories(t *testing.T) { } // Dump rangedels. - if rdIter, err := r.NewRawRangeDelIter(sstable.NoTransforms); err != nil { + if rdIter, err := r.NewRawRangeDelIter(sstable.NoFragmentTransforms); err != nil { return err } else if rdIter != nil { defer rdIter.Close() @@ -325,7 +325,7 @@ func TestMVCCHistories(t *testing.T) { } // Dump range keys. - if rkIter, err := r.NewRawRangeKeyIter(sstable.NoTransforms); err != nil { + if rkIter, err := r.NewRawRangeKeyIter(sstable.NoFragmentTransforms); err != nil { return err } else if rkIter != nil { defer rkIter.Close()