Merge #112231

112231: go.mod: bump Pebble to ede31f1a8e4b r=RaduBerinde a=jbowens Includes `@AlexTalks's` changes from cockroachdb/pebble#2992 to add `FormatMajorVersion` to the list of allowlisted `SafeValue` types. ``` ede31f1a event: mark `FormatMajorVersion` as safe from redaction 36b3f57b db: return structured errors from checkConsistency e3cbe650 db: use DiskFileName for manifest files and memtables d57a0be4 db: tolerate errors during async ingest sstable validation f79ae812 db: avoid use of physical filesystem in TestIngestValidation 5ddf67cc db: deflake TestIngestLoadRand ``` Resolves cockroachdb/pebble#2992. Epic: none Release note: none Co-authored-by: Jackson Owens <[email protected]>
cockroachdb · Oct 12, 2023 · db92e0a · db92e0a
2 parents e863a04 + d43029e
commit db92e0a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1599,10 +1599,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "ad17adfa874889e8e1c43a3fe6c02ca1e4b6c67170ed37e2015e710aee5fdc7a",
-        strip_prefix = "github.com/cockroachdb/[email protected]20231009150004-a678d0968383",
+        sha256 = "548a4f3696216b6ed586dc01c9e29ddddab2b2b6c872376bd6f9e51b83cea5a4",
+        strip_prefix = "github.com/cockroachdb/[email protected]20231011191824-ede31f1a8e4b",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231009150004-a678d0968383.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231011191824-ede31f1a8e4b.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -321,7 +321,7 @@ DISTDIR_FILES = {
     "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",
     "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/pebble/com_github_cockroachdb_pebble-v0.0.0-20231009150004-a678d0968383.zip": "ad17adfa874889e8e1c43a3fe6c02ca1e4b6c67170ed37e2015e710aee5fdc7a",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231011191824-ede31f1a8e4b.zip": "548a4f3696216b6ed586dc01c9e29ddddab2b2b6c872376bd6f9e51b83cea5a4",
     "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
@@ -114,7 +114,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-20231009150004-a678d0968383
+	github.com/cockroachdb/pebble v0.0.0-20231011191824-ede31f1a8e4b
 	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
@@ -489,8 +489,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20231009150004-a678d0968383 h1:98LmGECk4ksnbvBVr0DgssnH0Mfwkd6+L6D/JHVd144=
-github.com/cockroachdb/pebble v0.0.0-20231009150004-a678d0968383/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
+github.com/cockroachdb/pebble v0.0.0-20231011191824-ede31f1a8e4b h1:/fElHApeWG4Btj37APrPuilBce1sinPUEjEXCFs8Tds=
+github.com/cockroachdb/pebble v0.0.0-20231011191824-ede31f1a8e4b/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
 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/testutils/lint/passes/redactcheck/redactcheck.go b/pkg/testutils/lint/passes/redactcheck/redactcheck.go
@@ -188,6 +188,9 @@ func runAnalyzer(pass *analysis.Pass) (interface{}, error) {
 						"LegacyTimestamp": {},
 						"Timestamp":       {},
 					},
+					"github.com/cockroachdb/pebble": {
+						"FormatMajorVersion": {},
+					},
 					"github.com/cockroachdb/pebble/internal/humanize": {
 						"FormattedString": {},
 					},