Skip to content

Commit

Permalink
Merge #58468
Browse files Browse the repository at this point in the history
58468: vendor: bump pebble to 97dabc1c2 r=dt a=dt

Upstream changes:
```
vfs,sstable: split out subset of vfs.File used for reading
docs: add a couple benchmark annotations
db: use uint64 for batch's memTableSize
sstable: add xxhash64 checksum support
sstable: Add ChecksumType to API
db: add an Iterator.Clone to iterate over the same db state
```
Release note: none.

Co-authored-by: David Taylor <[email protected]>
  • Loading branch information
craig[bot] and dt committed Jan 6, 2021
2 parents cf9b7d1 + 4330160 commit d87fa94
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 16 deletions.
20 changes: 14 additions & 6 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,14 @@ def go_deps():
sum = "h1:xvUo53O5MRZhVMJAxWCJcS5HHrqAiAG9SJ1LpMu6aAI=",
version = "v0.0.0-20191021191039-0944d244cd40",
)
go_repository(
name = "com_github_cespare_xxhash_v2",
build_file_proto_mode = "disable",
importpath = "github.com/cespare/xxhash/v2",
sum = "h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=",
version = "v2.1.1",
)

go_repository(
name = "com_github_client9_misspell",
build_file_proto_mode = "disable_global",
Expand Down Expand Up @@ -440,8 +448,8 @@ def go_deps():
name = "com_github_cockroachdb_pebble",
build_file_proto_mode = "disable_global",
importpath = "github.com/cockroachdb/pebble",
sum = "h1:ucQr+rdfI+sH8fNMAon3u0xnMkuxSoF2x67l/HhsnZw=",
version = "v0.0.0-20201223160501-f614b5ad0faa",
sum = "h1:7E8+895ZA2tkVvTTMbCNf2ejF47pFmo6wj0LSsvuGxM=",
version = "v0.0.0-20210105203824-97dabc1c2dca",
)
go_repository(
name = "com_github_cockroachdb_redact",
Expand Down Expand Up @@ -2917,8 +2925,8 @@ def go_deps():
name = "org_golang_x_exp",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/exp",
sum = "h1:GnGfrp0fiNhiBS/v/aCFTmfEWgkvxW4Qiu8oM2/IfZ4=",
version = "v0.0.0-20201221025956-e89b829e73ea",
sum = "h1:XlAInxBYX5nBofPaY51uv/x9xmRgZGr/lDOsePd2AcE=",
version = "v0.0.0-20201229011636-eab1b5eb1a03",
)
go_repository(
name = "org_golang_x_image",
Expand Down Expand Up @@ -2980,8 +2988,8 @@ def go_deps():
name = "org_golang_x_sys",
build_file_proto_mode = "disable_global",
importpath = "golang.org/x/sys",
sum = "h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo=",
version = "v0.0.0-20201223074533-0d417f636930",
sum = "h1:/dSxr6gT0FNI1MO5WLJo8mTmItROeOKTkDn+7OwWBos=",
version = "v0.0.0-20210105210732-16f7687f5001",
)
go_repository(
name = "org_golang_x_text",
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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-20201223160501-f614b5ad0faa
github.com/cockroachdb/pebble v0.0.0-20210105203824-97dabc1c2dca
github.com/cockroachdb/redact v1.0.9
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2
Expand Down Expand Up @@ -147,13 +147,13 @@ require (
github.com/zabawaba99/go-gitignore v0.0.0-20200117185801-39e6bddfb292
go.etcd.io/etcd/raft/v3 v3.0.0-20201109164711-01844fd28560
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/exp v0.0.0-20201221025956-e89b829e73ea
golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03
golang.org/x/lint v0.0.0-20200130185559-910be7a94367
golang.org/x/net v0.0.0-20201021035429-f5854403a974
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-20201020160332-67f06af15bc9
golang.org/x/sys v0.0.0-20201223074533-0d417f636930
golang.org/x/sys v0.0.0-20210105210732-16f7687f5001
golang.org/x/text v0.3.3
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee
Expand Down
14 changes: 8 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH
github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
Expand Down Expand Up @@ -161,8 +163,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-20201223160501-f614b5ad0faa h1:ucQr+rdfI+sH8fNMAon3u0xnMkuxSoF2x67l/HhsnZw=
github.com/cockroachdb/pebble v0.0.0-20201223160501-f614b5ad0faa/go.mod h1:c3G8ud5zF3+nYHCWmVmtsA8eEtjrDSa6qeLtcRZyevE=
github.com/cockroachdb/pebble v0.0.0-20210105203824-97dabc1c2dca h1:7E8+895ZA2tkVvTTMbCNf2ejF47pFmo6wj0LSsvuGxM=
github.com/cockroachdb/pebble v0.0.0-20210105203824-97dabc1c2dca/go.mod h1:9RB/z2OoNt2vP08nc73FlTVOUhwvgA2/nPSQfgSxq4g=
github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw=
github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/redact v1.0.9 h1:sjlUvGorKMIVQfo+w2RqDi5eewCHn453C/vdIXMzjzI=
Expand Down Expand Up @@ -763,8 +765,8 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
golang.org/x/exp v0.0.0-20201221025956-e89b829e73ea h1:GnGfrp0fiNhiBS/v/aCFTmfEWgkvxW4Qiu8oM2/IfZ4=
golang.org/x/exp v0.0.0-20201221025956-e89b829e73ea/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03 h1:XlAInxBYX5nBofPaY51uv/x9xmRgZGr/lDOsePd2AcE=
golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Expand Down Expand Up @@ -853,8 +855,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo=
golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210105210732-16f7687f5001 h1:/dSxr6gT0FNI1MO5WLJo8mTmItROeOKTkDn+7OwWBos=
golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 35 files
+8 −0 github.com/cespare/xxhash/v2/.travis.yml
+22 −0 github.com/cespare/xxhash/v2/LICENSE.txt
+67 −0 github.com/cespare/xxhash/v2/README.md
+3 −0 github.com/cespare/xxhash/v2/go.mod
+0 −0 github.com/cespare/xxhash/v2/go.sum
+236 −0 github.com/cespare/xxhash/v2/xxhash.go
+13 −0 github.com/cespare/xxhash/v2/xxhash_amd64.go
+215 −0 github.com/cespare/xxhash/v2/xxhash_amd64.s
+76 −0 github.com/cespare/xxhash/v2/xxhash_other.go
+15 −0 github.com/cespare/xxhash/v2/xxhash_safe.go
+46 −0 github.com/cespare/xxhash/v2/xxhash_unsafe.go
+8 −3 github.com/cockroachdb/pebble/batch.go
+28 −11 github.com/cockroachdb/pebble/db.go
+1 −0 github.com/cockroachdb/pebble/go.mod
+3 −0 github.com/cockroachdb/pebble/go.sum
+52 −0 github.com/cockroachdb/pebble/iterator.go
+4 −4 github.com/cockroachdb/pebble/mem_table.go
+1 −1 github.com/cockroachdb/pebble/open.go
+2 −1 github.com/cockroachdb/pebble/options.go
+1 −1 github.com/cockroachdb/pebble/snapshot.go
+15 −0 github.com/cockroachdb/pebble/sstable/options.go
+30 −6 github.com/cockroachdb/pebble/sstable/reader.go
+25 −10 github.com/cockroachdb/pebble/sstable/table.go
+22 −2 github.com/cockroachdb/pebble/sstable/writer.go
+3 −3 github.com/cockroachdb/pebble/vfs/prefetch_generic.go
+5 −11 github.com/cockroachdb/pebble/vfs/prefetch_linux.go
+5 −2 golang.org/x/sys/unix/syscall_darwin.go
+2 −4 golang.org/x/sys/unix/zsyscall_darwin_386.go
+2 −4 golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+2 −4 golang.org/x/sys/unix/zsyscall_darwin_arm.go
+2 −4 golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+2 −0 golang.org/x/sys/windows/syscall_windows.go
+41 −18 golang.org/x/sys/windows/types_windows.go
+17 −0 golang.org/x/sys/windows/zsyscall_windows.go
+5 −3 modules.txt

0 comments on commit d87fa94

Please sign in to comment.