Skip to content

Commit 9d51421

Browse files
ijsongijsong
committed
build(deps): bump github.com/cockroachdb/pebble from v1.1.5 to v2.0.3
This change updates `github.com/cockroachdb/pebble` from v1 to v2.
1 parent ed3cbf8 commit 9d51421

File tree

508 files changed

+84794
-37833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

508 files changed

+84794
-37833
lines changed

‎go.mod

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/kakao/varlog
33
go 1.24.0
44

55
require (
6-
github.com/cockroachdb/pebble v1.1.5
6+
github.com/cockroachdb/pebble/v2 v2.0.3
77
github.com/docker/go-units v0.5.0
88
github.com/gogo/protobuf v1.3.2
99
github.com/gogo/status v1.1.1
@@ -46,14 +46,17 @@ require (
4646
)
4747

4848
require (
49-
github.com/DataDog/zstd v1.4.5 // indirect
49+
github.com/DataDog/zstd v1.5.7 // indirect
5050
github.com/beorn7/perks v1.0.1 // indirect
5151
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
5252
github.com/cespare/xxhash/v2 v2.3.0 // indirect
53+
github.com/cockroachdb/crlib v0.0.0-20241112164430-1264a2edc35b // indirect
54+
github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5 // indirect
5355
github.com/cockroachdb/errors v1.11.3 // indirect
5456
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
5557
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
5658
github.com/cockroachdb/redact v1.1.5 // indirect
59+
github.com/cockroachdb/swiss v0.0.0-20250304010804-34a2c6a59016 // indirect
5760
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
5861
github.com/coreos/go-semver v0.3.0 // indirect
5962
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
@@ -70,7 +73,7 @@ require (
7073
github.com/go-openapi/jsonreference v0.20.2 // indirect
7174
github.com/go-openapi/swag v0.23.0 // indirect
7275
github.com/gogo/googleapis v1.4.1 // indirect
73-
github.com/golang/snappy v0.0.4 // indirect
76+
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
7477
github.com/google/gnostic-models v0.6.9 // indirect
7578
github.com/google/go-cmp v0.7.0 // indirect
7679
github.com/google/renameio v0.1.0 // indirect
@@ -80,7 +83,7 @@ require (
8083
github.com/josharian/intern v1.0.0 // indirect
8184
github.com/json-iterator/go v1.1.12 // indirect
8285
github.com/jtolds/gls v4.20.0+incompatible // indirect
83-
github.com/klauspost/compress v1.16.0 // indirect
86+
github.com/klauspost/compress v1.17.11 // indirect
8487
github.com/kr/pretty v0.3.1 // indirect
8588
github.com/kr/text v0.2.0 // indirect
8689
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
@@ -91,10 +94,10 @@ require (
9194
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9295
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
9396
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
94-
github.com/prometheus/client_golang v1.15.0 // indirect
97+
github.com/prometheus/client_golang v1.16.0 // indirect
9598
github.com/prometheus/client_model v0.3.0 // indirect
9699
github.com/prometheus/common v0.42.0 // indirect
97-
github.com/prometheus/procfs v0.9.0 // indirect
100+
github.com/prometheus/procfs v0.10.1 // indirect
98101
github.com/rogpeppe/go-internal v1.13.1 // indirect
99102
github.com/russross/blackfriday/v2 v2.1.0 // indirect
100103
github.com/shirou/gopsutil/v4 v4.25.4 // indirect

‎go.sum

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
1-
github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
2-
github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
1+
github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE=
2+
github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
3+
github.com/aclements/go-perfevent v0.0.0-20240301234650-f7843625020f h1:JjxwchlOepwsUWcQwD2mLUAGE9aCp0/ehy6yCHFBOvo=
4+
github.com/aclements/go-perfevent v0.0.0-20240301234650-f7843625020f/go.mod h1:tMDTce/yLLN/SK8gMOxQfnyeMeCg8KGzp0D1cbECEeo=
35
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
46
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
57
github.com/cenkalti/backoff/v5 v5.0.2 h1:rIfFVxEf1QsI7E1ZHfp/B4DF/6QBAUhmgkxc0H7Zss8=
68
github.com/cenkalti/backoff/v5 v5.0.2/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
79
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
810
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
9-
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
10-
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
11+
github.com/cockroachdb/crlib v0.0.0-20241112164430-1264a2edc35b h1:SHlYZ/bMx7frnmeqCu+xm0TCxXLzX3jQIVuFbnFGtFU=
12+
github.com/cockroachdb/crlib v0.0.0-20241112164430-1264a2edc35b/go.mod h1:Gq51ZeKaFCXk6QwuGM0w1dnaOqc/F5zKT2zA9D6Xeac=
13+
github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5 h1:UycK/E0TkisVrQbSoxvU827FwgBBcZ95nRRmpj/12QI=
14+
github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5/go.mod h1:jsaKMvD3RBCATk1/jbUZM8C9idWBJME9+VRZ5+Liq1g=
1115
github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=
1216
github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8=
1317
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=
1418
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M=
1519
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
1620
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
17-
github.com/cockroachdb/pebble v1.1.5 h1:5AAWCBWbat0uE0blr8qzufZP5tBjkRyy/jWe1QWLnvw=
18-
github.com/cockroachdb/pebble v1.1.5/go.mod h1:17wO9el1YEigxkP/YtV8NtCivQDgoCyBg5c4VR/eOWo=
21+
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
22+
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
23+
github.com/cockroachdb/pebble/v2 v2.0.3 h1:YJ3Sc9jRN/q6OOCNyRHPbcpenbxL1DdgdpUqPlPus6o=
24+
github.com/cockroachdb/pebble/v2 v2.0.3/go.mod h1:NgxgNcWwyG/uxkLUZGM2aelshaLIZvc0hCX7SCfaO8s=
1925
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
2026
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
27+
github.com/cockroachdb/swiss v0.0.0-20250304010804-34a2c6a59016 h1:d0dxi6Q8yGtRBupybhtBC4GJk8WegtDAFr+Xk+/3sSE=
28+
github.com/cockroachdb/swiss v0.0.0-20250304010804-34a2c6a59016/go.mod h1:yBRu/cnL4ks9bgy4vAASdjIW+/xMlFwuHKqtmh3GZQg=
2129
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
2230
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
2331
github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
@@ -41,6 +49,8 @@ github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv
4149
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
4250
github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=
4351
github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
52+
github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9 h1:r5GgOLGbza2wVHRzK7aAj6lWZjfbAwiu/RDCVOKjRyM=
53+
github.com/ghemawat/stream v0.0.0-20171120220530-696b145b53b9/go.mod h1:106OIgooyS7OzLDOpUGgm9fA3bQENb/cFSyyBmMoJDs=
4454
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
4555
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
4656
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -73,8 +83,8 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
7383
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
7484
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
7585
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
76-
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
77-
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
86+
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e h1:4bw4WeyTYPp0smaXiJZCNnLrvVBqirQVreixayXezGc=
87+
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
7888
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
7989
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
8090
github.com/google/go-cmdtest v0.4.0 h1:ToXh6W5spLp3npJV92tk6d5hIpUPYEzHLkD+rncbyhI=
@@ -104,8 +114,8 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
104114
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
105115
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
106116
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
107-
github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4=
108-
github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
117+
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
118+
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
109119
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
110120
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
111121
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -144,14 +154,14 @@ github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt
144154
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
145155
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
146156
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
147-
github.com/prometheus/client_golang v1.15.0 h1:5fCgGYogn0hFdhyhLbw7hEsWxufKtY9klyvdNfFlFhM=
148-
github.com/prometheus/client_golang v1.15.0/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
157+
github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
158+
github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
149159
github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
150160
github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
151161
github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM=
152162
github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc=
153-
github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
154-
github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
163+
github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
164+
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
155165
github.com/puzpuzpuz/xsync/v2 v2.5.1 h1:mVGYAvzDSu52+zaGyNjC+24Xw2bQi3kTr4QJ6N9pIIU=
156166
github.com/puzpuzpuz/xsync/v2 v2.5.1/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU=
157167
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=

‎internal/storage/append_batch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"sync"
66

7-
"github.com/cockroachdb/pebble"
7+
"github.com/cockroachdb/pebble/v2"
88

99
"github.com/kakao/varlog/pkg/types"
1010
)

‎internal/storage/cache.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package storage
33
import (
44
"sync"
55

6-
"github.com/cockroachdb/pebble"
6+
"github.com/cockroachdb/pebble/v2"
77
)
88

99
const (

‎internal/storage/commit_batch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package storage
33
import (
44
"sync"
55

6-
"github.com/cockroachdb/pebble"
6+
"github.com/cockroachdb/pebble/v2"
77

88
"github.com/kakao/varlog/pkg/types"
99
)

‎internal/storage/compatibility_test.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"runtime"
88
"testing"
99

10-
"github.com/cockroachdb/pebble"
10+
"github.com/cockroachdb/pebble/v2"
1111
"github.com/stretchr/testify/require"
1212
)
1313

@@ -35,16 +35,19 @@ func TestStorage_CompatibilityV1(t *testing.T) {
3535
golden string
3636
old pebble.FormatMajorVersion
3737
new pebble.FormatMajorVersion
38+
skip bool
3839
}{
3940
{
4041
golden: "from_FormatMostCompatible_to_FormatFlushableIngest",
41-
old: pebble.FormatMostCompatible,
42+
old: pebble.FormatMajorVersion(1),
4243
new: pebble.FormatFlushableIngest,
44+
skip: true,
4345
},
4446
{
4547
golden: "from_FormatMostCompatible_to_FormatVirtualSSTables",
46-
old: pebble.FormatMostCompatible,
48+
old: pebble.FormatMajorVersion(1),
4749
new: pebble.FormatVirtualSSTables,
50+
skip: true,
4851
},
4952
{
5053
golden: "from_FormatFlushableIngest_to_FormatVirtualSSTables",
@@ -60,6 +63,10 @@ func TestStorage_CompatibilityV1(t *testing.T) {
6063

6164
for _, tc := range tcs {
6265
t.Run(tc.golden, func(t *testing.T) {
66+
if tc.skip {
67+
t.Skip("Skipping: FormatMostCompatible from v1 cannot be migrated to any v2 format")
68+
}
69+
6370
path := filepath.Join(basepath, "testdata", tc.golden)
6471
opts := &pebble.Options{}
6572

‎internal/storage/logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package storage
22

33
import (
4-
"github.com/cockroachdb/pebble"
4+
"github.com/cockroachdb/pebble/v2"
55
"go.uber.org/zap"
66
)
77

‎internal/storage/recovery_points.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/cockroachdb/pebble"
7+
"github.com/cockroachdb/pebble/v2"
88
"go.uber.org/zap"
99
"go.uber.org/zap/zapcore"
1010

‎internal/storage/scanner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"slices"
88
"sync"
99

10-
"github.com/cockroachdb/pebble"
10+
"github.com/cockroachdb/pebble/v2"
1111

1212
"github.com/kakao/varlog/pkg/types"
1313
"github.com/kakao/varlog/proto/varlogpb"

‎internal/storage/storage.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"sync"
1010
"time"
1111

12-
"github.com/cockroachdb/pebble"
13-
"github.com/cockroachdb/pebble/bloom"
12+
"github.com/cockroachdb/pebble/v2"
13+
"github.com/cockroachdb/pebble/v2/bloom"
1414

1515
"github.com/kakao/varlog/pkg/types"
1616
"github.com/kakao/varlog/proto/varlogpb"

‎internal/storage/storage_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/cockroachdb/pebble"
8+
"github.com/cockroachdb/pebble/v2"
99
"github.com/stretchr/testify/assert"
1010
"github.com/stretchr/testify/require"
1111
"go.uber.org/goleak"

‎internal/storage/testing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"testing"
66

7-
"github.com/cockroachdb/pebble"
7+
"github.com/cockroachdb/pebble/v2"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
1010

‎internal/storage/write_batch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package storage
33
import (
44
"sync"
55

6-
"github.com/cockroachdb/pebble"
6+
"github.com/cockroachdb/pebble/v2"
77

88
"github.com/kakao/varlog/pkg/types"
99
)

‎vendor/github.com/DataDog/zstd/README.md

Lines changed: 21 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/DataDog/zstd/ZSTD_LICENSE

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)