From d17831d32696d27b3f8c751d7896d3b86210ff3d Mon Sep 17 00:00:00 2001 From: Radu Berinde Date: Wed, 4 Oct 2023 10:17:51 -0700 Subject: [PATCH] go.mod: bump Pebble to b013ca78e9dc b013ca78 db: keep track of virtual sstable size sum 62251e69 db: make checkpoint test even more deterministic c7c47d6b db: turn testingAlwaysWaitForCleanup into an option a05b0192 db: keep track of virtual sstable count in metrics 3c778710 db: add test for virtual sstable checkpointing cb4dab66 db: add metrics for num backing sstables and size 8317cf38 db: incrementally keep tracking of backing table size 0f80e184 Update index.html aa077af6 go.mod: specify Go 1.20 ccb9a7dc manifest: add invariant check for duplicate file backings 699fc0e8 db: only create one CreatedBackingTables entry per sstable b2da10c6 db: remove trailing whitespace from compacting log line 1d696c79 db: cleanup btree obsoletion logic Fixes: #111674 Release note: none --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/cli/interactive_tests/test_encryption.tcl | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 74b984830648..c1cdc77a5c24 100644 --- 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 = "9418eb96febfa50da2f02f87501d0459a8205fea8f91b539300a03c7f62a6d61", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20230927205513-725ebe297867", + sha256 = "da88d66f323769d609581b310f42a9bcc245cb3c321f0fae2aea7d2ed7c9fe13", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20231003235536-b013ca78e9dc", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230927205513-725ebe297867.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231003235536-b013ca78e9dc.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 696fcf0d0dd1..2fd855672322 100644 --- 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-20230927205513-725ebe297867.zip": "9418eb96febfa50da2f02f87501d0459a8205fea8f91b539300a03c7f62a6d61", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231003235536-b013ca78e9dc.zip": "da88d66f323769d609581b310f42a9bcc245cb3c321f0fae2aea7d2ed7c9fe13", "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/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9", diff --git a/go.mod b/go.mod index 955521cd4563..83fbe9b5e4c6 100644 --- a/go.mod +++ b/go.mod @@ -113,7 +113,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-20230927205513-725ebe297867 + github.com/cockroachdb/pebble v0.0.0-20231003235536-b013ca78e9dc 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 5cf4d3599f9f..84f07e51a2db 100644 --- 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-20230927205513-725ebe297867 h1:O/fBxpVLLedWnVw+kRDe2rcybSGFLiLXnnHgyrT/Pr0= -github.com/cockroachdb/pebble v0.0.0-20230927205513-725ebe297867/go.mod h1:nindLFinxeDPjP4qI9LtVHAwDef57/0s5KMfWgdktQc= +github.com/cockroachdb/pebble v0.0.0-20231003235536-b013ca78e9dc h1:eyGg4MSAQSEBY4fYPu7KNsCCFNIXwhkbEaSciMRfDWs= +github.com/cockroachdb/pebble v0.0.0-20231003235536-b013ca78e9dc/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= 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/cli/interactive_tests/test_encryption.tcl b/pkg/cli/interactive_tests/test_encryption.tcl index 73cc7701331d..557365501a7b 100644 --- a/pkg/cli/interactive_tests/test_encryption.tcl +++ b/pkg/cli/interactive_tests/test_encryption.tcl @@ -52,7 +52,7 @@ end_test start_test "Run pebble debug tool." send "$argv debug pebble db lsm $storedir\r" -eexpect "level | tables size val-bl | score | in | tables size | tables size | tables size | read | r w\r" +eexpect "level | tables size val-bl vtables | score | in | tables size | tables size | tables size | read | r w\r" end_test start_test "Restart with plaintext." @@ -106,7 +106,7 @@ end_test start_test "Run pebble debug tool with AES-256." send "$argv debug pebble db lsm $storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=$keydir/aes-256.key\r" -eexpect "level | tables size val-bl | score | in | tables size | tables size | tables size | read | r w\r" +eexpect "level | tables size val-bl vtables | score | in | tables size | tables size | tables size | read | r w\r" # Try running without the encryption flag. send "$argv debug pebble db lsm $storedir\r" eexpect "If this is an encrypted store, make sure the correct encryption key is set."