Skip to content

Commit

Permalink
Merge #107797 #107810
Browse files Browse the repository at this point in the history 
107797: go.mod: bump Pebble to ce43e6535942 r=itsbilal a=jbowens

```
ce43e653 internal/cache: increase shard count to 4x CPUs
56bba2ac internal/cache: reduce mutex contention from EvictFile
ad744ac3 db: keep up to one memtable for recycling
7a4ed3c5 tool: add remotecat dump command
```

Epic: none
Release note: none

107810: schemafeed: improve some tests r=miretskiy,yuzefovich a=knz

Informs #76378

Release note: None
Epic: CRDB-18499

Co-authored-by: Jackson Owens <[email protected]>
Co-authored-by: Raphael 'kena' Poss <[email protected]>
  • Loading branch information
@jbowens @knz
3 people committed Jul 28, 2023
3 parents 04c91a5 + d76b188 + f1d749a commit 32b2be3
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 20 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1595,10 +1595,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "34017dde1a11e1792a7f46420cf683e7615e689c6da982405bc7e80271ffcb58",
strip_prefix = "github.com/cockroachdb/[email protected]20230724234444-7ef7553fd9e1",
sha256 = "7ea06d5b0207ed3f20b5962bde7af18e6744fe089a98c51d66ac812252746342",
strip_prefix = "github.com/cockroachdb/[email protected]20230728153158-ce43e6535942",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230724234444-7ef7553fd9e1.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230728153158-ce43e6535942.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,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-20230724234444-7ef7553fd9e1.zip": "34017dde1a11e1792a7f46420cf683e7615e689c6da982405bc7e80271ffcb58",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230728153158-ce43e6535942.zip": "7ea06d5b0207ed3f20b5962bde7af18e6744fe089a98c51d66ac812252746342",
"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",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,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-20230724234444-7ef7553fd9e1
github.com/cockroachdb/pebble v0.0.0-20230728153158-ce43e6535942
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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,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-20230724234444-7ef7553fd9e1 h1:aBPW14kJEdbuzyryv+8u1wxY6k8bu7uNVEuifOZxjRg=
github.com/cockroachdb/pebble v0.0.0-20230724234444-7ef7553fd9e1/go.mod h1:FN5O47SBEz5+kO9fG8UTR64g2WS1u5ZFCgTvxGjoSks=
github.com/cockroachdb/pebble v0.0.0-20230728153158-ce43e6535942 h1:y+9IilMcEy6qyDIZ94Vw3hJTk17J4j21TaMIe8C29Zg=
github.com/cockroachdb/pebble v0.0.0-20230728153158-ce43e6535942/go.mod h1:FN5O47SBEz5+kO9fG8UTR64g2WS1u5ZFCgTvxGjoSks=
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=
Expand Down
1 change: 0 additions & 1 deletion pkg/ccl/changefeedccl/schemafeed/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ go_test(
"//pkg/sql/catalog",
"//pkg/sql/catalog/descpb",
"//pkg/sql/catalog/tabledesc",
"//pkg/sql/pgwire",
"//pkg/testutils",
"//pkg/testutils/datapathutils",
"//pkg/testutils/serverutils",
Expand Down
9 changes: 3 additions & 6 deletions pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
"github.com/cockroachdb/cockroach/pkg/sql/pgwire"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
Expand Down Expand Up @@ -197,7 +196,7 @@ func TestFetchDescriptorVersionsCPULimiterPagination(t *testing.T) {
ctx := context.Background()
var numRequests int
first := true
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{
Knobs: base.TestingKnobs{Store: &kvserver.StoreTestingKnobs{
TestingRequestFilter: func(ctx context.Context, request *kvpb.BatchRequest) *kvpb.Error {
for _, ru := range request.Requests {
Expand All @@ -220,11 +219,9 @@ func TestFetchDescriptorVersionsCPULimiterPagination(t *testing.T) {
},
}},
})
defer s.Stopper().Stop(ctx)
defer srv.Stopper().Stop(ctx)
s := srv.ApplicationLayer()
sqlServer := s.SQLServer().(*sql.Server)
if len(s.TestTenants()) != 0 {
sqlServer = s.TestTenants()[0].PGServer().(*pgwire.Server).SQLServer
}

sqlDB := sqlutils.MakeSQLRunner(db)
beforeCreate := hlc.Timestamp{WallTime: timeutil.Now().UnixNano()}
Expand Down
9 changes: 4 additions & 5 deletions pkg/ccl/changefeedccl/schemafeed/table_event_filter_datadriven_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,11 @@ func TestDataDriven(t *testing.T) {
testData := datapathutils.TestDataPath(t, "")
datadriven.Walk(t, testData, func(t *testing.T, path string) {
ctx := context.Background()
ts, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{
// TODO(ajwerner): Otherwise the test gets skipped due to some CCL warning.
DefaultTestTenant: base.TODOTestTenantDisabled,
})
srv, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{})
defer srv.Stopper().Stop(ctx)
ts := srv.ApplicationLayer()

tdb := sqlutils.MakeSQLRunner(sqlDB)
defer ts.Stopper().Stop(ctx)
ctx, cancel := ts.Stopper().WithCancelOnQuiesce(ctx)
defer cancel()
schemaFeeds := map[int]schemafeed.SchemaFeed{}
Expand Down
1 change: 0 additions & 1 deletion pkg/testutils/lint/lint_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2230,7 +2230,6 @@ func TestLint(t *testing.T) {
":!ccl/changefeedccl/helpers_test.go",
":!ccl/changefeedccl/parquet_test.go",
":!ccl/changefeedccl/scheduled_changefeed_test.go",
":!ccl/changefeedccl/schemafeed/table_event_filter_datadriven_test.go",
":!ccl/importerccl/ccl_test.go",
":!ccl/kvccl/kvfollowerreadsccl/boundedstaleness_test.go",
":!ccl/kvccl/kvfollowerreadsccl/followerreads_test.go",
Expand Down

0 comments on commit 32b2be3

Please sign in to comment.