From 0ac5eebc5d704569ad193891be12c4fd8be2865b Mon Sep 17 00:00:00 2001 From: Jackson Owens Date: Wed, 16 Oct 2024 17:59:08 -0400 Subject: [PATCH] go.mod: bump Pebble to 030afd266b2d Changes: * [`030afd26`](https://github.com/cockroachdb/pebble/commit/030afd26) colblk: use UnsafeOffsets.At2 in another instance * [`b3993ff6`](https://github.com/cockroachdb/pebble/commit/b3993ff6) db: persist Experimental.EnableColumnarBlocks in OPTIONS file * [`c719c4e5`](https://github.com/cockroachdb/pebble/commit/c719c4e5) db: support multiple KeySchemas Release note: none. Epic: none. --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/storage/pebble.go | 7 ++++--- pkg/storage/pebble_key_schema.go | 1 + 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index e692a6c94431..de7a54716766 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1818,10 +1818,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "c18276fb68bfeff93edfbc563ed2f07d4956e2627ba9461d26830720ed3e03d7", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20241016162652-8b6d64f23a33", + sha256 = "fa5525a60ec0cbcc7ef4959cb9fee1492c79e2e716838b21ad31f6bb4da05520", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20241016213041-030afd266b2d", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241016162652-8b6d64f23a33.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241016213041-030afd266b2d.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 5f776238170a..77ada09d1ed9 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -345,7 +345,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-20241016162652-8b6d64f23a33.zip": "c18276fb68bfeff93edfbc563ed2f07d4956e2627ba9461d26830720ed3e03d7", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241016213041-030afd266b2d.zip": "fa5525a60ec0cbcc7ef4959cb9fee1492c79e2e716838b21ad31f6bb4da05520", "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 2dfd32393054..6b4c6a320f3e 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,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-20241016162652-8b6d64f23a33 + github.com/cockroachdb/pebble v0.0.0-20241016213041-030afd266b2d 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 9d6731c4ac16..bc6a8a7641a9 100644 --- a/go.sum +++ b/go.sum @@ -536,8 +536,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-20241016162652-8b6d64f23a33 h1:Hm0YVnLKeO1UNY8aEZKSX7iTbEwRB+B1Y5d/gyb4j7g= -github.com/cockroachdb/pebble v0.0.0-20241016162652-8b6d64f23a33/go.mod h1:XmS8uVDd9YFw/1R7J0J/CmTUANwT7iGnBRxH9AyDA90= +github.com/cockroachdb/pebble v0.0.0-20241016213041-030afd266b2d h1:OvSjDuKwqL6MCnh7hhmMCjf02rSpwJEihXA6Y7BTQgg= +github.com/cockroachdb/pebble v0.0.0-20241016213041-030afd266b2d/go.mod h1:XmS8uVDd9YFw/1R7J0J/CmTUANwT7iGnBRxH9AyDA90= 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/pebble.go b/pkg/storage/pebble.go index da114f9d5cb6..d43d536bc8ef 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -825,9 +825,10 @@ const MinimumSupportedFormatVersion = pebble.FormatSyntheticPrefixSuffix // DefaultPebbleOptions returns the default pebble options. func DefaultPebbleOptions() *pebble.Options { opts := &pebble.Options{ - Comparer: EngineComparer, - FS: vfs.Default, - KeySchema: keySchema, + Comparer: EngineComparer, + FS: vfs.Default, + KeySchema: keySchema.Name, + KeySchemas: sstable.MakeKeySchemas(keySchema), // A value of 2 triggers a compaction when there is 1 sub-level. L0CompactionThreshold: 2, L0StopWritesThreshold: 1000, diff --git a/pkg/storage/pebble_key_schema.go b/pkg/storage/pebble_key_schema.go index 13adefb9e0b7..d676595d6e70 100644 --- a/pkg/storage/pebble_key_schema.go +++ b/pkg/storage/pebble_key_schema.go @@ -39,6 +39,7 @@ const ( ) var keySchema = colblk.KeySchema{ + Name: "crdb1", ColumnTypes: []colblk.DataType{ cockroachColRoachKey: colblk.DataTypePrefixBytes, cockroachColMVCCWallTime: colblk.DataTypeUint,