vendor: bump Pebble to 9af7bb126851

go.mod

@@ -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-20200908153531-a9c6d3b6685c
+ github.com/cockroachdb/pebble v0.0.0-20200910205826-d7a278abeed4
  github.com/cockroachdb/redact v1.0.6
  github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
  github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2
@@ -145,9 +145,8 @@ require (
  github.com/zabawaba99/go-gitignore v0.0.0-20200117185801-39e6bddfb292
  go.etcd.io/etcd v0.0.0-00010101000000-000000000000
  golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
- golang.org/x/exp v0.0.0-20200901203048-c4f52b2c50aa
+ golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925
  golang.org/x/lint v0.0.0-20200130185559-910be7a94367
- golang.org/x/mod v0.3.0 // indirect
  golang.org/x/net v0.0.0-20200602114024-627f9648deb9
  golang.org/x/oauth2 v0.0.0-20190115181402-5dab4167f31c
  golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852

go.sum

@@ -162,8 +162,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-20200908153531-a9c6d3b6685c h1:BNozL+EzkybaDuPWgnnwGxfSe+jbokBvRvF+TX0RDCo=
-github.com/cockroachdb/pebble v0.0.0-20200908153531-a9c6d3b6685c/go.mod h1:hU7vhtrqonEphNF+xt8/lHdaBprxmV1h8BOGrd9XwmQ=
+github.com/cockroachdb/pebble v0.0.0-20200910205826-d7a278abeed4 h1:7lCGHHElrKF6cNcDsZUPORkjqFOJfCgm3TtzqHogGaQ=
+github.com/cockroachdb/pebble v0.0.0-20200910205826-d7a278abeed4/go.mod h1:hU7vhtrqonEphNF+xt8/lHdaBprxmV1h8BOGrd9XwmQ=
 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/redact v1.0.6 h1:W34uRRyNR4dlZFd0MibhNELsZSgMkl52uRV/tA1xToY=
@@ -773,8 +773,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-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc=
 golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
-golang.org/x/exp v0.0.0-20200901203048-c4f52b2c50aa h1:i1+omYRtqpxiCaQJB4MQhUToKvMPFqUUJKvRiRp0gtE=
-golang.org/x/exp v0.0.0-20200901203048-c4f52b2c50aa/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925 h1:5XVKs2rlCg8EFyRcvO8/XFwYxh1oKJO1Q3X5vttIf9c=
+golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw=
 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=
@@ -789,8 +789,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
+golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

pkg/storage/merge_test.go

@@ -241,7 +241,7 @@ func mergeValuesPebble(reverse bool, srcBytes [][]byte) ([]byte, error) {
  return nil, err
  }
  }
- val, _, err := valueMerger.Finish()
+ val, _, err := valueMerger.Finish(false)
  return val, err
  }
  valueMerger, err := MVCCMerger.Merge(nil /* key */, srcBytes[0])
@@ -254,7 +254,7 @@ func mergeValuesPebble(reverse bool, srcBytes [][]byte) ([]byte, error) {
  return nil, err
  }
  }
- val, _, err := valueMerger.Finish()
+ val, _, err := valueMerger.Finish(false)
  return val, err
 }
 

pkg/storage/pebble_merge.go

@@ -256,7 +256,7 @@ func (t *MVCCValueMerger) MergeOlder(value []byte) error {
 // In case of non-timeseries the values are simply concatenated from old to new. In case
 // of timeseries the values are sorted, deduplicated, and potentially migrated to columnar
 // format. When deduplicating, only the latest sample for a given offset is retained.
-func (t *MVCCValueMerger) Finish() ([]byte, io.Closer, error) {
+func (t *MVCCValueMerger) Finish(includesBase bool) ([]byte, io.Closer, error) {
  isColumnar := false
  if t.timeSeriesOps == nil && t.rawByteOps == nil {
  return nil, nil, errors.Errorf("empty merge unsupported")