Skip to content

Commit

Permalink
Merge cockroachdb#124540 cockroachdb#124543 cockroachdb#124544
Browse files Browse the repository at this point in the history 
124540: sqlccl, sqlsmith: minor cleanup r=yuzefovich a=yuzefovich

See each commit for details.

Epic: None
Release note: None

124543: go.mod: bump Pebble to cfcd825468b5 r=RaduBerinde a=RaduBerinde

Changes:

 * [`cfcd8254`](cockroachdb/pebble@cfcd8254) sstable: handle synthetic prefix when checking bloom filter
 * [`e1958628`](cockroachdb/pebble@e1958628) metamorphic: fix derived db ID
 * [`6195a2cb`](cockroachdb/pebble@6195a2cb) *: allow compression type to be inferred from initial stats load
 * [`30d2cf60`](cockroachdb/pebble@30d2cf60) *: add metric for sstable compression types
 * [`2ac449bb`](cockroachdb/pebble@2ac449bb) manifest: minor cleanup
 * [`89116b3b`](cockroachdb/pebble@89116b3b) base: add Split.Prefix helper
 * [`255087f9`](cockroachdb/pebble@255087f9) db: avoid loading later files for a level in SeekPrefixGE
 * [`18bbac53`](cockroachdb/pebble@18bbac53) keyspanimpl: use base.Equal in MergingIter
 * [`c1cfad1d`](cockroachdb/pebble@c1cfad1d) objstorage,sstable: add read-before for reader creation and iter index/filter blocks
 * [`864cb266`](cockroachdb/pebble@864cb266) tool: add more summaries to manifest summarize
 * [`5e941d80`](cockroachdb/pebble@5e941d80) metamorphic: fix WAL failover config generation

Release note: none.
Epic: none.

124544: sql: skip TestExplainRedact under race r=yuzefovich a=yuzefovich

We just saw a failure under race with a timeout with no clear signs of anything being wrong, so let's just skip a couple of tests under race.

Fixes: cockroachdb#123987.

Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Radu Berinde <[email protected]>
  • Loading branch information
@yuzefovich @RaduBerinde
3 people committed May 22, 2024
4 parents 593bc56 + 7b24211 + 9313716 + e41bde3 commit 677a373
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1673,10 +1673,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "04be02ee00e515cdd8086f3916fc1f8729f5bacc6e0c9f11f9dc2b2f0ad14e65",
strip_prefix = "github.com/cockroachdb/[email protected]20240514163722-5597cf1ed079",
sha256 = "047f8f723471bcabdec8027f5f119aa688661059ac352364a6988962755f327d",
strip_prefix = "github.com/cockroachdb/[email protected]20240522034855-cfcd825468b5",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240514163722-5597cf1ed079.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240522034855-cfcd825468b5.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 @@ -329,7 +329,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-20240514163722-5597cf1ed079.zip": "04be02ee00e515cdd8086f3916fc1f8729f5bacc6e0c9f11f9dc2b2f0ad14e65",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240522034855-cfcd825468b5.zip": "047f8f723471bcabdec8027f5f119aa688661059ac352364a6988962755f327d",
"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",
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,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-20240514163722-5597cf1ed079
github.com/cockroachdb/pebble v0.0.0-20240522034855-cfcd825468b5
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 Expand Up @@ -263,6 +263,7 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo
github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo=
github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
github.com/IBM/sarama v1.42.1 h1:wugyWa15TDEHh2kvq2gAy1IHLjEjuYOYgXz/ruC/OSQ=
github.com/IBM/sarama v1.42.1/go.mod h1:Xxho9HkHd4K/MDUo/T/sOqwtX/17D33++E9Wib6hUdQ=
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
Expand Down Expand Up @@ -506,8 +508,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-20240514163722-5597cf1ed079 h1:33SD88wmTGe9oTV5GyDf7m7Cvqy2zr7+AhNoouOKLr8=
github.com/cockroachdb/pebble v0.0.0-20240514163722-5597cf1ed079/go.mod h1:gm/vT3lwZUKyB3iTDgWIZfC0hu0gLr+VcXr/tZeTdEU=
github.com/cockroachdb/pebble v0.0.0-20240522034855-cfcd825468b5 h1:ZPd8PXsNuqQ60vQRqmBZPxd2uhVJCQpTbgdyusk3V3A=
github.com/cockroachdb/pebble v0.0.0-20240522034855-cfcd825468b5/go.mod h1:gm/vT3lwZUKyB3iTDgWIZfC0hu0gLr+VcXr/tZeTdEU=
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
8 changes: 1 addition & 7 deletions pkg/ccl/testccl/sqlccl/explain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func TestExplainRedactDDL(t *testing.T) {
defer log.Scope(t).Close(t)

skip.UnderDeadlock(t, "the test is too slow")
skip.UnderRace(t, "the test is too slow")

const numStatements = 10

Expand Down Expand Up @@ -269,13 +270,6 @@ func TestExplainGist(t *testing.T) {
return true
}
}
for _, toSkipSubstring := range []string{
"ALTER PRIMARY KEY", // #123017
} {
if strings.Contains(stmt, toSkipSubstring) {
return true
}
}
return false
}(); shouldSkip {
continue
Expand Down
3 changes: 3 additions & 0 deletions pkg/internal/sqlsmith/bulkio.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ func makeAsOf(s *Smither) tree.AsOfClause {
}

func makeBackup(s *Smither) (tree.Statement, bool) {
if !s.bulkIOEnabled() {
return nil, false
}
name := fmt.Sprintf("%s/%s", s.bulkSrv.URL, s.name("backup"))
var targets tree.BackupTargetList
seen := map[tree.TableName]bool{}
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/explain_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,7 @@ func TestExplainRedact(t *testing.T) {
defer log.Scope(t).Close(t)

skip.UnderDeadlock(t, "the test is too slow")
skip.UnderRace(t, "the test is too slow")

const numStatements = 10

Expand Down

0 comments on commit 677a373

Please sign in to comment.