Merge #139257 #139261 #139263

139257: README: update build from source link r=dhartunian a=dhartunian Release note: None 139261: go.mod: bump Pebble to 7c863c9c3bd8 r=RaduBerinde a=jbowens Changes: * [`7c863c9c`](cockroachdb/pebble@7c863c9c) sstable: copy filter block during suffix rewriting * [`94fd2294`](cockroachdb/pebble@94fd2294) sstable: rewrite multiple times in TestRewriteSuffixProps * [`16da0a9d`](cockroachdb/pebble@16da0a9d) objstorage: sometimes mangle MemObj.Write input in invariants builds * [`4d8664cd`](cockroachdb/pebble@4d8664cd) sstable: revert change to binary search calculation Release note: none. Epic: none. 139263: codeowners: add obs-prs to pkg/sql/contention r=kyle-a-wong a=kyle-a-wong Epic: none Release note: none Co-authored-by: David Hartunian <[email protected]> Co-authored-by: Jackson Owens <[email protected]> Co-authored-by: Kyle Wong <[email protected]>
cockroachdb · Jan 16, 2025 · 5b61a0e · 5b61a0e
4 parents f118d51 + b630dd2 + db86e74 + ab089dd
commit 5b61a0e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -79,6 +79,7 @@
 /pkg/ccl/importerccl/        @cockroachdb/sql-queries-prs
 
 /pkg/sql/appstatspb           @cockroachdb/obs-prs
+/pkg/sql/contention/          @cockroachdb/obs-prs
 /pkg/sql/execstats/           @cockroachdb/obs-prs
 /pkg/sql/scheduledlogging/    @cockroachdb/obs-prs
 /pkg/sql/sqlstats/            @cockroachdb/obs-prs

diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1885,10 +1885,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "f91568043e0c5fa6ef1a79043a48c363c523f831330c6efb9c9db208af845422",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250114230814-ba0eeec8205a",
+        sha256 = "ff05caa042f73d59197da6755a894aee92c09364cda3b0f0bd26dd47b7335c00",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250116205404-7c863c9c3bd8",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250114230814-ba0eeec8205a.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250116205404-7c863c9c3bd8.zip",
         ],
     )
     go_repository(

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ See our online documentation: [Quickstart with CockroachCloud](https://www.cockr
 
 ## Starting with CockroachDB
 
-1. Install CockroachDB:  [using a pre-built executable](https://www.cockroachlabs.com/docs/stable/install-cockroachdb.html) or [build it from source](https://www.cockroachlabs.com/docs/v21.1/install-cockroachdb-linux#build-from-source).
+1. Install CockroachDB:  [using a pre-built executable](https://www.cockroachlabs.com/docs/stable/install-cockroachdb.html) or [build it from source](https://cockroachlabs.atlassian.net/wiki/spaces/CRDB/pages/181338446/Getting+and+building+CockroachDB+from+source).
 2. [Start a local cluster](https://www.cockroachlabs.com/docs/stable/start-a-local-cluster.html) and connect to it via the [built-in SQL client](https://www.cockroachlabs.com/docs/stable/use-the-built-in-sql-client.html).
 3. [Learn more about CockroachDB SQL](https://www.cockroachlabs.com/docs/stable/learn-cockroachdb-sql.html).
 4. Use a PostgreSQL-compatible driver or ORM to [build an app with CockroachDB](https://www.cockroachlabs.com/docs/stable/hello-world-example-apps.html).

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -358,7 +358,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-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
     "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-20250114230814-ba0eeec8205a.zip": "f91568043e0c5fa6ef1a79043a48c363c523f831330c6efb9c9db208af845422",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250116205404-7c863c9c3bd8.zip": "ff05caa042f73d59197da6755a894aee92c09364cda3b0f0bd26dd47b7335c00",
     "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
@@ -136,7 +136,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-20241215232642-bb51bb14a506
-	github.com/cockroachdb/pebble v0.0.0-20250114230814-ba0eeec8205a
+	github.com/cockroachdb/pebble v0.0.0-20250116205404-7c863c9c3bd8
 	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
@@ -556,8 +556,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
 github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
 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-20250114230814-ba0eeec8205a h1:PUAePGJWmo7UDey3/a3MZfu6SP5rsyPG+GlSK8LA5jM=
-github.com/cockroachdb/pebble v0.0.0-20250114230814-ba0eeec8205a/go.mod h1:ewJSTQ30qIuX6FeYX+2M37Ghn6r0r2I+g0jDIcTdUXM=
+github.com/cockroachdb/pebble v0.0.0-20250116205404-7c863c9c3bd8 h1:yzv6S0dlIwEe6Cd1fw8XizBlvtARIQ8xL8NLPPll9ns=
+github.com/cockroachdb/pebble v0.0.0-20250116205404-7c863c9c3bd8/go.mod h1:ewJSTQ30qIuX6FeYX+2M37Ghn6r0r2I+g0jDIcTdUXM=
 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=