From f21a73fd74139214896fca7dd38a0411f050b7db Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 27 Feb 2024 21:42:34 +0000 Subject: [PATCH] go.mod: bump Pebble to 70c139776271 Changes: * [`70c13977`](https://github.com/cockroachdb/pebble/commit/70c13977) ci: use go1.22 * [`75925ef2`](https://github.com/cockroachdb/pebble/commit/75925ef2) db: don't wait on compaction cond lock if db is closed * [`b6abd221`](https://github.com/cockroachdb/pebble/commit/b6abd221) sstable: remove unused properties around prefix extraction * [`86c76bf3`](https://github.com/cockroachdb/pebble/commit/86c76bf3) pebble: improve syntax for external ingestion test * [`aed0b132`](https://github.com/cockroachdb/pebble/commit/aed0b132) manifest: store comparer in Version * [`403ee525`](https://github.com/cockroachdb/pebble/commit/403ee525) base: verify all mandatory Comparer fields are set * [`306ea71f`](https://github.com/cockroachdb/pebble/commit/306ea71f) base: improve Comparer documentation and usability * [`bde41ee3`](https://github.com/cockroachdb/pebble/commit/bde41ee3) wal: handle initial obsolete logs * [`0b946194`](https://github.com/cockroachdb/pebble/commit/0b946194) *: delegate all log filename handling to the wal package * [`4560105d`](https://github.com/cockroachdb/pebble/commit/4560105d) tool: parse WAL files through wal.FileAccumulator in find * [`e3e1c8d2`](https://github.com/cockroachdb/pebble/commit/e3e1c8d2) wal: extract filename parsing to a FileAccumulator * [`f9c7a81a`](https://github.com/cockroachdb/pebble/commit/f9c7a81a) wal: convert UnhealthyOperationLatencyThreshold to a func() * [`f963d14f`](https://github.com/cockroachdb/pebble/commit/f963d14f) wal: disable a flaky failoverWriter test case * [`4e60aed5`](https://github.com/cockroachdb/pebble/commit/4e60aed5) meta: rework external ingest generation * [`9a56ccf9`](https://github.com/cockroachdb/pebble/commit/9a56ccf9) sstable: fix compaction iterator bug with prefix replacement * [`c10f722d`](https://github.com/cockroachdb/pebble/commit/c10f722d) manifest: rename PrefixReplacement methods * [`b2494c58`](https://github.com/cockroachdb/pebble/commit/b2494c58) metamorphic: special handling of assertion errors * [`2b9ea0c7`](https://github.com/cockroachdb/pebble/commit/2b9ea0c7) sstable: remove global seq num property * [`627cc080`](https://github.com/cockroachdb/pebble/commit/627cc080) manifest: unref Cache in test * [`704018cc`](https://github.com/cockroachdb/pebble/commit/704018cc) db: add DebugString method * [`25374875`](https://github.com/cockroachdb/pebble/commit/25374875) wal: implement failoverManager.{Obsolete,Stats} and log recycling * [`e05c22dc`](https://github.com/cockroachdb/pebble/commit/e05c22dc) sstable: move PrefixReplacement to sstable * [`8ff82132`](https://github.com/cockroachdb/pebble/commit/8ff82132) rangekey: move iteration stack to rangekeystack Release note: none. Epic: none. --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/kv/kvnemesis/testdata/TestApplier/addsstable | 2 +- pkg/kv/kvnemesis/testdata/TestOperationsFormat/4 | 2 +- pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion | 2 +- .../TestValidate/addsstable_ingestion_shadowing_scan | 2 +- pkg/storage/mvcc_history_test.go | 6 +++--- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 464c09ee10a3..ea73bf6eaa27 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1673,10 +1673,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "f128eef5c59e74f75c56a78197f52698c33087d433653d96d395b446f09ba814", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240221125134-ccb837bc0c93", + sha256 = "e2b709dc7186bb511f654140799735f8fd58877c4224002a1e1316438ff07171", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240227210219-70c139776271", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240221125134-ccb837bc0c93.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240227210219-70c139776271.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index df76a9a4a09c..b75df992200d 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -328,7 +328,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-20240221125134-ccb837bc0c93.zip": "f128eef5c59e74f75c56a78197f52698c33087d433653d96d395b446f09ba814", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240227210219-70c139776271.zip": "e2b709dc7186bb511f654140799735f8fd58877c4224002a1e1316438ff07171", "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 6a76834d10d8..f07487ca7b6e 100644 --- a/go.mod +++ b/go.mod @@ -124,7 +124,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-20240221125134-ccb837bc0c93 + github.com/cockroachdb/pebble v0.0.0-20240227210219-70c139776271 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 bbb45c5c1ab2..23568328f95f 100644 --- a/go.sum +++ b/go.sum @@ -504,8 +504,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-20240221125134-ccb837bc0c93 h1:2ybRyxxPHT5/5OWpWzasSrcbtjOPYorOp0/JnOGTiYk= -github.com/cockroachdb/pebble v0.0.0-20240221125134-ccb837bc0c93/go.mod h1:BHuaMa/lK7fUe75BlsteiiTu8ptIG+qSAuDtGMArP18= +github.com/cockroachdb/pebble v0.0.0-20240227210219-70c139776271 h1:PBspR2pILlHv5iKzcanq2Xqr4Dl5wt94zZqblldsaVU= +github.com/cockroachdb/pebble v0.0.0-20240227210219-70c139776271/go.mod h1:BHuaMa/lK7fUe75BlsteiiTu8ptIG+qSAuDtGMArP18= 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/kv/kvnemesis/testdata/TestApplier/addsstable b/pkg/kv/kvnemesis/testdata/TestApplier/addsstable index 4b4243c0aa1b..44e25eecd47a 100644 --- a/pkg/kv/kvnemesis/testdata/TestApplier/addsstable +++ b/pkg/kv/kvnemesis/testdata/TestApplier/addsstable @@ -1,6 +1,6 @@ echo ---- -db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s1 */) // 1144 bytes (as writes) +db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s1 */) // 1036 bytes (as writes) // ^-- tk(1) -> sv(s1): /Table/100/"0000000000000001"/ -> /BYTES/v1 // ^-- tk(2) -> sv(s1): /Table/100/"0000000000000002"/ -> / // ^-- [tk(3), tk(4)) -> sv(s1): /Table/100/"000000000000000{3"-4"} -> / diff --git a/pkg/kv/kvnemesis/testdata/TestOperationsFormat/4 b/pkg/kv/kvnemesis/testdata/TestOperationsFormat/4 index ef926f053e3f..419c3fcce8fd 100644 --- a/pkg/kv/kvnemesis/testdata/TestOperationsFormat/4 +++ b/pkg/kv/kvnemesis/testdata/TestOperationsFormat/4 @@ -1,6 +1,6 @@ echo ---- -···db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s1 */) // 1144 bytes (as writes) +···db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s1 */) // 1036 bytes (as writes) ···// ^-- tk(1) -> sv(s1): /Table/100/"0000000000000001"/0.000000001,0 -> /BYTES/v1 ···// ^-- tk(2) -> sv(s1): /Table/100/"0000000000000002"/0.000000001,0 -> / ···// ^-- [tk(3), tk(4)) -> sv(s1): /Table/100/"000000000000000{3"-4"} -> / diff --git a/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion b/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion index a5bee971532d..e106f8398063 100644 --- a/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion +++ b/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion @@ -1,6 +1,6 @@ echo ---- -db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s1 */) // 1144 bytes +db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s1 */) // 1036 bytes // ^-- tk(1) -> sv(s1): /Table/100/"0000000000000001"/0.000000001,0 -> /BYTES/v1 // ^-- tk(2) -> sv(s1): /Table/100/"0000000000000002"/0.000000001,0 -> / // ^-- [tk(3), tk(4)) -> sv(s1): /Table/100/"000000000000000{3"-4"} -> / diff --git a/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion_shadowing_scan b/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion_shadowing_scan index a18351af1db6..40da68898c63 100644 --- a/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion_shadowing_scan +++ b/pkg/kv/kvnemesis/testdata/TestValidate/addsstable_ingestion_shadowing_scan @@ -4,7 +4,7 @@ db0.Put(ctx, tk(1), sv(1)) // @0.000000001,0 db0.Put(ctx, tk(2), sv(1)) // @0.000000001,0 db0.Put(ctx, tk(3), sv(1)) // @0.000000001,0 db0.Put(ctx, tk(4), sv(1)) // @0.000000001,0 -db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s2 */) // 1145 bytes +db0.AddSSTable(ctx, tk(1), tk(4), ... /* @s2 */) // 1037 bytes // ^-- tk(1) -> sv(s2): /Table/100/"0000000000000001"/0.000000001,0 -> /BYTES/v2 // ^-- tk(2) -> sv(s2): /Table/100/"0000000000000002"/0.000000001,0 -> / // ^-- [tk(3), tk(4)) -> sv(s2): /Table/100/"000000000000000{3"-4"} -> / diff --git a/pkg/storage/mvcc_history_test.go b/pkg/storage/mvcc_history_test.go index 9ec5fe97adb7..d15a6741ef63 100644 --- a/pkg/storage/mvcc_history_test.go +++ b/pkg/storage/mvcc_history_test.go @@ -271,7 +271,7 @@ func TestMVCCHistories(t *testing.T) { buf.Printf(">> %s:\n", name) // Dump point keys. - iter, err := r.NewIter(nil, nil) + iter, err := r.NewIter(sstable.NoTransforms, nil, nil) if err != nil { return err } @@ -296,7 +296,7 @@ func TestMVCCHistories(t *testing.T) { } // Dump rangedels. - if rdIter, err := r.NewRawRangeDelIter(); err != nil { + if rdIter, err := r.NewRawRangeDelIter(sstable.NoTransforms); err != nil { return err } else if rdIter != nil { defer func() { _ = rdIter.Close() }() @@ -321,7 +321,7 @@ func TestMVCCHistories(t *testing.T) { } // Dump range keys. - if rkIter, err := r.NewRawRangeKeyIter(); err != nil { + if rkIter, err := r.NewRawRangeKeyIter(sstable.NoTransforms); err != nil { return err } else if rkIter != nil { defer func() { _ = rkIter.Close() }()