Merge #50630

50630: vendor: bump Pebble to 560ed0b8a18c r=jbowens a=jbowens ``` 560ed0b compaction: Don't do a move compaction within L0. b822482 compaction: Exclude largest key when extending L0 compactions if it's sentinel 585d322 internal/metamorphic: add checkpointOp, compactOp and flushOp 5bdf31a cmd/pebble: enable L0-sublevel compactions and flush splits d478834 db: switch compaction concurrency signal from level score to L0 read-amp c577a10 db: force flush memtables with range deletions after delay fd3f2e3 db: add memtable count, duration and byte rate to flush event 730159f db: tweak the compaction scoring heuristics b34dbe9 db: tighten merging iterator's seek conditions c08345d tool: Allow vertical scrolling if visualization overflows 747113e db: fix race in TestTableStats 90dbbfc *: {white,black}list -> {allow,deny}list ``` Supersedes #50604. Co-authored-by: Jackson Owens <[email protected]>
cockroachdb · Jun 25, 2020 · 18957b4 · 18957b4
2 parents 55bf878 + 9e795b7
commit 18957b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -41,7 +41,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.13.0
 	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f
-	github.com/cockroachdb/pebble v0.0.0-20200618174744-bc7bb07c0a28
+	github.com/cockroachdb/pebble v0.0.0-20200624214307-560ed0b8a18c
 	github.com/cockroachdb/redact v0.0.0-20200622112456-cd282804bbd3
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2
@@ -149,7 +149,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20190115181402-5dab4167f31c
 	golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	golang.org/x/sys v0.0.0-20200519105757-fe76b779f299
+	golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
 	golang.org/x/text v0.3.2
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 	golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5

diff --git a/go.sum b/go.sum
@@ -145,8 +145,8 @@ github.com/cockroachdb/grpc-gateway v1.14.6-0.20200519165156-52697fc4a249 h1:pZu
 github.com/cockroachdb/grpc-gateway v1.14.6-0.20200519165156-52697fc4a249/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/cockroachdb/pebble v0.0.0-20200618174744-bc7bb07c0a28 h1:OGzpqbaARCNI/VvrKMydw22zClKW3FX2fKDanLlbbXA=
-github.com/cockroachdb/pebble v0.0.0-20200618174744-bc7bb07c0a28/go.mod h1:crLnbSFbwAcQNs9FPfI1avHb5BqVgqZcr4r+IzpJ5FM=
+github.com/cockroachdb/pebble v0.0.0-20200624214307-560ed0b8a18c h1:MQVYGjMEPj6TRGTi05ct75tDhbBKKFoJ0yKvvEZzIZw=
+github.com/cockroachdb/pebble v0.0.0-20200624214307-560ed0b8a18c/go.mod h1:crLnbSFbwAcQNs9FPfI1avHb5BqVgqZcr4r+IzpJ5FM=
 github.com/cockroachdb/redact v0.0.0-20200622112456-cd282804bbd3 h1:2+dpIJzYMSbLi0587YXpi8tOJT52qCOI/1I0UNThc/I=
 github.com/cockroachdb/redact v0.0.0-20200622112456-cd282804bbd3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=
@@ -713,6 +713,8 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8=
+golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

diff --git a/vendor b/vendor
+6 −0		github.com/cockroachdb/pebble/batch.go
+55 −4		github.com/cockroachdb/pebble/compaction.go
+150 −83		github.com/cockroachdb/pebble/compaction_picker.go
+16 −4		github.com/cockroachdb/pebble/db.go
+17 −7		github.com/cockroachdb/pebble/event.go
+3 −0		github.com/cockroachdb/pebble/flushable.go
+14 −6		github.com/cockroachdb/pebble/internal/manifest/l0_sublevels.go
+52 −2		github.com/cockroachdb/pebble/merging_iter.go
+1 −0		github.com/cockroachdb/pebble/open.go
+35 −5		github.com/cockroachdb/pebble/options.go
+2 −0		github.com/cockroachdb/pebble/tool/lsm_data.go
+3 −3		github.com/cockroachdb/pebble/vfs/syncing_file_linux.go
+1 −1		github.com/cockroachdb/pebble/vfs/vfs.go
+8 −3		golang.org/x/sys/cpu/byteorder.go
+7 −1		golang.org/x/sys/cpu/cpu_arm64.go
+27 −1		golang.org/x/sys/unix/syscall_linux.go
+6 −60		golang.org/x/sys/unix/zerrors_linux.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_386.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_amd64.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_arm.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_arm64.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_mips.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_mips64.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_mips64le.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_mipsle.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_ppc64.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_riscv64.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_s390x.go
+1 −0		golang.org/x/sys/unix/zerrors_linux_sparc64.go
+6 −6		golang.org/x/sys/unix/ztypes_freebsd_arm.go
+245 −171		golang.org/x/sys/unix/ztypes_linux.go
+5 −0		golang.org/x/sys/windows/memory_windows.go
+2 −0		golang.org/x/sys/windows/syscall_windows.go
+19 −0		golang.org/x/sys/windows/zsyscall_windows.go
+2 −2		modules.txt