Merge #87541

87541: vendor: bump Pebble to 20a40b515be9 r=itsbilal a=jbowens 20a40b51 db: enforce batch point visibility in the merging iterator ade651d0 metamorphic: add test option to disable lazy-combined iteration 3358c2be internal/keyspan: remove unnecessary allocations eb5c079c metamorphic: synchronize iterator ops with indexed batch 33c108eb metamorphic: add limited concurrency acc59654 *: Add random test for iterator seek - BlockPropertyFilters interaction 3f835a3d metamorphic: test RangeKeyChanged=false in the metamorphic tests 4ab85a4d metamorphic: increase probability of valid SeekPrefixGE calls Release note: None Release justification: Non-production code changes, low-risk bug fixes to new functionality. Co-authored-by: Jackson Owens <[email protected]>
cockroachdb · Sep 8, 2022 · 29c8e6e · 29c8e6e
2 parents 1a637b0 + 7f139c0
commit 29c8e6e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1425,10 +1425,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "b024c32024f91e1b10ed56448ae313e0458562116dac1aa6ef4efc080964431d",
-        strip_prefix = "github.com/cockroachdb/[email protected]20220829152249-c2dc3de22e91",
+        sha256 = "6687f149d857c2610ca81eca3452ca34940580bb5ecd9e14084be218fc4de6fb",
+        strip_prefix = "github.com/cockroachdb/[email protected]20220907220441-20a40b515be9",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220829152249-c2dc3de22e91.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220907220441-20a40b515be9.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -186,7 +186,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.13.0.zip": "b3d43d8f95edf65f73a5348f29e1159823cac64b148f8d3bb48340bf55d70872",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20211118104740-dabe8e521a4f.zip": "1972c3f171f118add3fd9e64bcea6cbb9959a3b7fa0ada308e8a7310813fea74",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220829152249-c2dc3de22e91.zip": "b024c32024f91e1b10ed56448ae313e0458562116dac1aa6ef4efc080964431d",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220907220441-20a40b515be9.zip": "6687f149d857c2610ca81eca3452ca34940580bb5ecd9e14084be218fc4de6fb",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.3.zip": "7778b1e4485e4f17f35e5e592d87eb99c29e173ac9507801d000ad76dd0c261e",
     "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/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",

diff --git a/go.mod b/go.mod
@@ -47,7 +47,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.13.0
 	github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f
-	github.com/cockroachdb/pebble v0.0.0-20220829152249-c2dc3de22e91
+	github.com/cockroachdb/pebble v0.0.0-20220907220441-20a40b515be9
 	github.com/cockroachdb/redact v1.1.3
 	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
@@ -470,8 +470,8 @@ github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqi
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20220829152249-c2dc3de22e91 h1:sskFpsa91pwZ7SHAO0oqu1uEpI5flpEb4G0Sqt9qiLI=
-github.com/cockroachdb/pebble v0.0.0-20220829152249-c2dc3de22e91/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0=
+github.com/cockroachdb/pebble v0.0.0-20220907220441-20a40b515be9 h1:XuTq35uXVA7rIW0V+ene2iQN2+EZIr0d5gl2paAXmPA=
+github.com/cockroachdb/pebble v0.0.0-20220907220441-20a40b515be9/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0=
 github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

diff --git a/vendor b/vendor
+27 −6		github.com/cockroachdb/pebble/batch.go
+1 −1		github.com/cockroachdb/pebble/compaction.go
+8 −2		github.com/cockroachdb/pebble/db.go
+7 −2		github.com/cockroachdb/pebble/get_iter.go
+19 −5		github.com/cockroachdb/pebble/internal/base/internal.go
+8 −2		github.com/cockroachdb/pebble/internal/keyspan/merging_iter.go
+8 −2		github.com/cockroachdb/pebble/iterator.go
+1 −1		github.com/cockroachdb/pebble/level_checker.go
+15 −13		github.com/cockroachdb/pebble/merging_iter.go
+22 −0		github.com/cockroachdb/pebble/options.go
+1 −1		modules.txt