Skip to content

Commit 32b2be3

Browse files
craig[bot]jbowensknz
committed
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 cockroachdb#76378 Release note: None Epic: CRDB-18499 Co-authored-by: Jackson Owens <[email protected]> Co-authored-by: Raphael 'kena' Poss <[email protected]>
3 parents 04c91a5 + d76b188 + f1d749a commit 32b2be3

File tree

8 files changed

+14
-20
lines changed

8 files changed

+14
-20
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,10 +1595,10 @@ def go_deps():
15951595
patches = [
15961596
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
15971597
],
1598-
sha256 = "34017dde1a11e1792a7f46420cf683e7615e689c6da982405bc7e80271ffcb58",
1599-
strip_prefix = "github.com/cockroachdb/[email protected]20230724234444-7ef7553fd9e1",
1598+
sha256 = "7ea06d5b0207ed3f20b5962bde7af18e6744fe089a98c51d66ac812252746342",
1599+
strip_prefix = "github.com/cockroachdb/[email protected]20230728153158-ce43e6535942",
16001600
urls = [
1601-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230724234444-7ef7553fd9e1.zip",
1601+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230728153158-ce43e6535942.zip",
16021602
],
16031603
)
16041604
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ DISTDIR_FILES = {
320320
"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",
321321
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
322322
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
323-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230724234444-7ef7553fd9e1.zip": "34017dde1a11e1792a7f46420cf683e7615e689c6da982405bc7e80271ffcb58",
323+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20230728153158-ce43e6535942.zip": "7ea06d5b0207ed3f20b5962bde7af18e6744fe089a98c51d66ac812252746342",
324324
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
325325
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
326326
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ require (
116116
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
117117
github.com/cockroachdb/gostdlib v1.19.0
118118
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
119-
github.com/cockroachdb/pebble v0.0.0-20230724234444-7ef7553fd9e1
119+
github.com/cockroachdb/pebble v0.0.0-20230728153158-ce43e6535942
120120
github.com/cockroachdb/redact v1.1.5
121121
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
122122
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
493493
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
494494
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
495495
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
496-
github.com/cockroachdb/pebble v0.0.0-20230724234444-7ef7553fd9e1 h1:aBPW14kJEdbuzyryv+8u1wxY6k8bu7uNVEuifOZxjRg=
497-
github.com/cockroachdb/pebble v0.0.0-20230724234444-7ef7553fd9e1/go.mod h1:FN5O47SBEz5+kO9fG8UTR64g2WS1u5ZFCgTvxGjoSks=
496+
github.com/cockroachdb/pebble v0.0.0-20230728153158-ce43e6535942 h1:y+9IilMcEy6qyDIZ94Vw3hJTk17J4j21TaMIe8C29Zg=
497+
github.com/cockroachdb/pebble v0.0.0-20230728153158-ce43e6535942/go.mod h1:FN5O47SBEz5+kO9fG8UTR64g2WS1u5ZFCgTvxGjoSks=
498498
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
499499
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
500500
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

‎pkg/ccl/changefeedccl/schemafeed/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ go_test(
7272
"//pkg/sql/catalog",
7373
"//pkg/sql/catalog/descpb",
7474
"//pkg/sql/catalog/tabledesc",
75-
"//pkg/sql/pgwire",
7675
"//pkg/testutils",
7776
"//pkg/testutils/datapathutils",
7877
"//pkg/testutils/serverutils",

‎pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
2525
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
2626
"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
27-
"github.com/cockroachdb/cockroach/pkg/sql/pgwire"
2827
"github.com/cockroachdb/cockroach/pkg/testutils"
2928
"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
3029
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
@@ -197,7 +196,7 @@ func TestFetchDescriptorVersionsCPULimiterPagination(t *testing.T) {
197196
ctx := context.Background()
198197
var numRequests int
199198
first := true
200-
s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
199+
srv, db, _ := serverutils.StartServer(t, base.TestServerArgs{
201200
Knobs: base.TestingKnobs{Store: &kvserver.StoreTestingKnobs{
202201
TestingRequestFilter: func(ctx context.Context, request *kvpb.BatchRequest) *kvpb.Error {
203202
for _, ru := range request.Requests {
@@ -220,11 +219,9 @@ func TestFetchDescriptorVersionsCPULimiterPagination(t *testing.T) {
220219
},
221220
}},
222221
})
223-
defer s.Stopper().Stop(ctx)
222+
defer srv.Stopper().Stop(ctx)
223+
s := srv.ApplicationLayer()
224224
sqlServer := s.SQLServer().(*sql.Server)
225-
if len(s.TestTenants()) != 0 {
226-
sqlServer = s.TestTenants()[0].PGServer().(*pgwire.Server).SQLServer
227-
}
228225

229226
sqlDB := sqlutils.MakeSQLRunner(db)
230227
beforeCreate := hlc.Timestamp{WallTime: timeutil.Now().UnixNano()}

‎pkg/ccl/changefeedccl/schemafeed/table_event_filter_datadriven_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,11 @@ func TestDataDriven(t *testing.T) {
6464
testData := datapathutils.TestDataPath(t, "")
6565
datadriven.Walk(t, testData, func(t *testing.T, path string) {
6666
ctx := context.Background()
67-
ts, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{
68-
// TODO(ajwerner): Otherwise the test gets skipped due to some CCL warning.
69-
DefaultTestTenant: base.TODOTestTenantDisabled,
70-
})
67+
srv, sqlDB, _ := serverutils.StartServer(t, base.TestServerArgs{})
68+
defer srv.Stopper().Stop(ctx)
69+
ts := srv.ApplicationLayer()
70+
7171
tdb := sqlutils.MakeSQLRunner(sqlDB)
72-
defer ts.Stopper().Stop(ctx)
7372
ctx, cancel := ts.Stopper().WithCancelOnQuiesce(ctx)
7473
defer cancel()
7574
schemaFeeds := map[int]schemafeed.SchemaFeed{}

‎pkg/testutils/lint/lint_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2230,7 +2230,6 @@ func TestLint(t *testing.T) {
22302230
":!ccl/changefeedccl/helpers_test.go",
22312231
":!ccl/changefeedccl/parquet_test.go",
22322232
":!ccl/changefeedccl/scheduled_changefeed_test.go",
2233-
":!ccl/changefeedccl/schemafeed/table_event_filter_datadriven_test.go",
22342233
":!ccl/importerccl/ccl_test.go",
22352234
":!ccl/kvccl/kvfollowerreadsccl/boundedstaleness_test.go",
22362235
":!ccl/kvccl/kvfollowerreadsccl/followerreads_test.go",

0 commit comments

Comments
 (0)