Skip to content

Commit f5d747d

Browse files
RaduBerindeRaduBerinde
committed
pebble-release-2.0: change path to v2
A go module with version `v2.0` must have a path that ends in `/v2`; otherwise `go get` gives you a "module path must match major version" error. This commit enacts this change for the `pebble-release-2.0` branch. In the future we will consider making this change on master as well so we don't have inconsistency between the branches. Fixes #4271
1 parent 0a3b621 commit f5d747d

File tree

412 files changed

+1651
-1651
lines changed

Some content is hidden

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

412 files changed

+1651
-1651
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ gen-bazel:
7979
@echo "Generating WORKSPACE"
8080
@echo 'workspace(name = "com_github_cockroachdb_pebble")' > WORKSPACE
8181
@echo 'Running gazelle...'
82-
${GO} run github.com/bazelbuild/bazel-gazelle/cmd/[email protected] update --go_prefix=github.com/cockroachdb/pebble --repo_root=.
82+
${GO} run github.com/bazelbuild/bazel-gazelle/cmd/[email protected] update --go_prefix=github.com/cockroachdb/pebble/v2 --repo_root=.
8383
@echo 'You should now be able to build Cockroach using:'
8484
@echo ' ./dev build short -- --override_repository=com_github_cockroachdb_pebble=${CURDIR}'
8585

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Pebble [![Build Status](https://github.com/cockroachdb/pebble/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/cockroachdb/pebble/actions/workflows/ci.yaml) [![GoDoc](https://godoc.org/github.com/cockroachdb/pebble?status.svg)](https://godoc.org/github.com/cockroachdb/pebble) <sup><sub><sub>[Coverage](https://storage.googleapis.com/crl-codecover-public/pebble/index.html)</sub></sub></sup>
1+
# Pebble [![Build Status](https://github.com/cockroachdb/pebble/v2/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/cockroachdb/pebble/v2/actions/workflows/ci.yaml) [![GoDoc](https://godoc.org/github.com/cockroachdb/pebble/v2?status.svg)](https://godoc.org/github.com/cockroachdb/pebble/v2) <sup><sub><sub>[Coverage](https://storage.googleapis.com/crl-codecover-public/pebble/index.html)</sub></sub></sup>
22

33
#### [Nightly benchmarks](https://cockroachdb.github.io/pebble/)
44

@@ -118,7 +118,7 @@ incompatibilities.
118118
* SSTable format version 3 and 4. Pebble does not support version 3
119119
and version 4 format sstables. The sstable format version is
120120
controlled by the `BlockBasedTableOptions::format_version` option.
121-
See [#97](https://github.com/cockroachdb/pebble/issues/97).
121+
See [#97](https://github.com/cockroachdb/pebble/v2/issues/97).
122122

123123
## Format major versions
124124

@@ -134,11 +134,11 @@ to a compatible format major version before running newer Pebble versions. Newer
134134
Pebble versions will refuse to open databases in no longer supported formats.
135135

136136
To opt into new formats, a user may set `FormatMajorVersion` on the
137-
[`Options`](https://pkg.go.dev/github.com/cockroachdb/pebble#Options)
137+
[`Options`](https://pkg.go.dev/github.com/cockroachdb/pebble/v2#Options)
138138
supplied to
139-
[`Open`](https://pkg.go.dev/github.com/cockroachdb/pebble#Open), or
139+
[`Open`](https://pkg.go.dev/github.com/cockroachdb/pebble/v2#Open), or
140140
upgrade the format major version at runtime using
141-
[`DB.RatchetFormatMajorVersion`](https://pkg.go.dev/github.com/cockroachdb/pebble#DB.RatchetFormatMajorVersion).
141+
[`DB.RatchetFormatMajorVersion`](https://pkg.go.dev/github.com/cockroachdb/pebble/v2#DB.RatchetFormatMajorVersion).
142142
Format major version upgrades are permanent; There is no option to
143143
return to an earlier format.
144144

@@ -180,7 +180,7 @@ property collectors, the `pebble` tool can also be used, at the latest version
180180
that supports the format. For example:
181181
```
182182
# WARNING: only use if no custom comparer/merger/property collector are necessary.
183-
go run github.com/cockroachdb/pebble/cmd/[email protected] db upgrade <db-dir>
183+
go run github.com/cockroachdb/pebble/v2/cmd/[email protected] db upgrade <db-dir>
184184
```
185185

186186
For reference, the table below lists the range of supported Pebble format major
@@ -224,7 +224,7 @@ import (
224224
"fmt"
225225
"log"
226226

227-
"github.com/cockroachdb/pebble"
227+
"github.com/cockroachdb/pebble/v2"
228228
)
229229

230230
func main() {

‎batch.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ import (
1818
"unsafe"
1919

2020
"github.com/cockroachdb/errors"
21-
"github.com/cockroachdb/pebble/batchrepr"
22-
"github.com/cockroachdb/pebble/internal/base"
23-
"github.com/cockroachdb/pebble/internal/batchskl"
24-
"github.com/cockroachdb/pebble/internal/humanize"
25-
"github.com/cockroachdb/pebble/internal/invariants"
26-
"github.com/cockroachdb/pebble/internal/keyspan"
27-
"github.com/cockroachdb/pebble/internal/private"
28-
"github.com/cockroachdb/pebble/internal/rangedel"
29-
"github.com/cockroachdb/pebble/internal/rangekey"
30-
"github.com/cockroachdb/pebble/internal/rawalloc"
31-
"github.com/cockroachdb/pebble/internal/treeprinter"
21+
"github.com/cockroachdb/pebble/v2/batchrepr"
22+
"github.com/cockroachdb/pebble/v2/internal/base"
23+
"github.com/cockroachdb/pebble/v2/internal/batchskl"
24+
"github.com/cockroachdb/pebble/v2/internal/humanize"
25+
"github.com/cockroachdb/pebble/v2/internal/invariants"
26+
"github.com/cockroachdb/pebble/v2/internal/keyspan"
27+
"github.com/cockroachdb/pebble/v2/internal/private"
28+
"github.com/cockroachdb/pebble/v2/internal/rangedel"
29+
"github.com/cockroachdb/pebble/v2/internal/rangekey"
30+
"github.com/cockroachdb/pebble/v2/internal/rawalloc"
31+
"github.com/cockroachdb/pebble/v2/internal/treeprinter"
3232
)
3333

3434
const (

‎batch_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import (
1919

2020
"github.com/cockroachdb/datadriven"
2121
"github.com/cockroachdb/errors"
22-
"github.com/cockroachdb/pebble/batchrepr"
23-
"github.com/cockroachdb/pebble/internal/base"
24-
"github.com/cockroachdb/pebble/internal/batchskl"
25-
"github.com/cockroachdb/pebble/internal/datadrivenutil"
26-
"github.com/cockroachdb/pebble/internal/itertest"
27-
"github.com/cockroachdb/pebble/internal/keyspan"
28-
"github.com/cockroachdb/pebble/internal/testkeys"
29-
"github.com/cockroachdb/pebble/vfs"
22+
"github.com/cockroachdb/pebble/v2/batchrepr"
23+
"github.com/cockroachdb/pebble/v2/internal/base"
24+
"github.com/cockroachdb/pebble/v2/internal/batchskl"
25+
"github.com/cockroachdb/pebble/v2/internal/datadrivenutil"
26+
"github.com/cockroachdb/pebble/v2/internal/itertest"
27+
"github.com/cockroachdb/pebble/v2/internal/keyspan"
28+
"github.com/cockroachdb/pebble/v2/internal/testkeys"
29+
"github.com/cockroachdb/pebble/v2/vfs"
3030
"github.com/stretchr/testify/require"
3131
)
3232

‎batchrepr/reader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"fmt"
1313
"unsafe"
1414

15-
"github.com/cockroachdb/pebble/internal/base"
15+
"github.com/cockroachdb/pebble/v2/internal/base"
1616
"github.com/pkg/errors"
1717
)
1818

‎batchrepr/writer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package batchrepr
77
import (
88
"encoding/binary"
99

10-
"github.com/cockroachdb/pebble/internal/base"
10+
"github.com/cockroachdb/pebble/v2/internal/base"
1111
)
1212

1313
// SetSeqNum mutates the provided batch representation, storing the provided

‎batchrepr/writer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"testing"
1111

1212
"github.com/cockroachdb/datadriven"
13-
"github.com/cockroachdb/pebble/internal/base"
14-
"github.com/cockroachdb/pebble/internal/binfmt"
13+
"github.com/cockroachdb/pebble/v2/internal/base"
14+
"github.com/cockroachdb/pebble/v2/internal/binfmt"
1515
)
1616

1717
func TestWriter(t *testing.T) {

‎bloom/bloom.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// the LICENSE file.
44

55
// Package bloom implements Bloom filters.
6-
package bloom // import "github.com/cockroachdb/pebble/bloom"
6+
package bloom // import "github.com/cockroachdb/pebble/v2/bloom"
77

88
import (
99
"encoding/binary"
1010
"fmt"
1111
"sync"
1212

13-
"github.com/cockroachdb/pebble/internal/base"
13+
"github.com/cockroachdb/pebble/v2/internal/base"
1414
)
1515

1616
const (

‎bloom/bloom_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/cockroachdb/pebble/internal/base"
12+
"github.com/cockroachdb/pebble/v2/internal/base"
1313
"github.com/stretchr/testify/require"
1414
)
1515

‎cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package pebble
66

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

99
// Cache exports the cache.Cache type.
1010
type Cache = cache.Cache

‎checkpoint.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111

1212
"github.com/cockroachdb/errors"
1313
"github.com/cockroachdb/errors/oserror"
14-
"github.com/cockroachdb/pebble/internal/base"
15-
"github.com/cockroachdb/pebble/record"
16-
"github.com/cockroachdb/pebble/vfs"
17-
"github.com/cockroachdb/pebble/vfs/atomicfs"
18-
"github.com/cockroachdb/pebble/wal"
14+
"github.com/cockroachdb/pebble/v2/internal/base"
15+
"github.com/cockroachdb/pebble/v2/record"
16+
"github.com/cockroachdb/pebble/v2/vfs"
17+
"github.com/cockroachdb/pebble/v2/vfs/atomicfs"
18+
"github.com/cockroachdb/pebble/v2/wal"
1919
)
2020

2121
// checkpointOptions hold the optional parameters to construct checkpoint

‎checkpoint_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"testing"
1818

1919
"github.com/cockroachdb/datadriven"
20-
"github.com/cockroachdb/pebble/internal/base"
21-
"github.com/cockroachdb/pebble/objstorage/remote"
22-
"github.com/cockroachdb/pebble/vfs"
20+
"github.com/cockroachdb/pebble/v2/internal/base"
21+
"github.com/cockroachdb/pebble/v2/objstorage/remote"
22+
"github.com/cockroachdb/pebble/v2/vfs"
2323
"github.com/stretchr/testify/require"
2424
)
2525

‎cmd/pebble/db.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ package main
77
import (
88
"log"
99

10-
"github.com/cockroachdb/pebble"
11-
"github.com/cockroachdb/pebble/bloom"
12-
"github.com/cockroachdb/pebble/internal/bytealloc"
13-
"github.com/cockroachdb/pebble/internal/crdbtest"
14-
"github.com/cockroachdb/pebble/objstorage/remote"
15-
"github.com/cockroachdb/pebble/sstable"
16-
"github.com/cockroachdb/pebble/vfs"
10+
"github.com/cockroachdb/pebble/v2"
11+
"github.com/cockroachdb/pebble/v2/bloom"
12+
"github.com/cockroachdb/pebble/v2/internal/bytealloc"
13+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
14+
"github.com/cockroachdb/pebble/v2/objstorage/remote"
15+
"github.com/cockroachdb/pebble/v2/sstable"
16+
"github.com/cockroachdb/pebble/v2/vfs"
1717
)
1818

1919
// DB specifies the minimal interfaces that need to be implemented to support

‎cmd/pebble/fsbench.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/cockroachdb/errors"
14-
"github.com/cockroachdb/pebble/vfs"
14+
"github.com/cockroachdb/pebble/v2/vfs"
1515
"github.com/spf13/cobra"
1616
)
1717

‎cmd/pebble/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"os"
1111
"time"
1212

13-
"github.com/cockroachdb/pebble"
14-
"github.com/cockroachdb/pebble/internal/base"
15-
"github.com/cockroachdb/pebble/internal/crdbtest"
16-
"github.com/cockroachdb/pebble/internal/testkeys"
17-
"github.com/cockroachdb/pebble/sstable/colblk"
18-
"github.com/cockroachdb/pebble/tool"
13+
"github.com/cockroachdb/pebble/v2"
14+
"github.com/cockroachdb/pebble/v2/internal/base"
15+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
16+
"github.com/cockroachdb/pebble/v2/internal/testkeys"
17+
"github.com/cockroachdb/pebble/v2/sstable/colblk"
18+
"github.com/cockroachdb/pebble/v2/tool"
1919
"github.com/spf13/cobra"
2020
)
2121

‎cmd/pebble/mvcc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package main
77
import (
88
"bytes"
99

10-
"github.com/cockroachdb/pebble"
11-
"github.com/cockroachdb/pebble/internal/bytealloc"
12-
"github.com/cockroachdb/pebble/internal/crdbtest"
10+
"github.com/cockroachdb/pebble/v2"
11+
"github.com/cockroachdb/pebble/v2/internal/bytealloc"
12+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
1313
)
1414

1515
// MVCC routines adapted from CockroachDB sources. Used to perform

‎cmd/pebble/queue.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"sync/atomic"
1313
"time"
1414

15-
"github.com/cockroachdb/pebble"
16-
"github.com/cockroachdb/pebble/internal/crdbtest"
17-
"github.com/cockroachdb/pebble/internal/randvar"
15+
"github.com/cockroachdb/pebble/v2"
16+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
17+
"github.com/cockroachdb/pebble/v2/internal/randvar"
1818
"github.com/spf13/cobra"
1919
)
2020

‎cmd/pebble/random.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"time"
1111

1212
"github.com/cockroachdb/errors"
13-
"github.com/cockroachdb/pebble/internal/randvar"
14-
"github.com/cockroachdb/pebble/internal/rate"
13+
"github.com/cockroachdb/pebble/v2/internal/randvar"
14+
"github.com/cockroachdb/pebble/v2/internal/rate"
1515
)
1616

1717
type rateFlag struct {

‎cmd/pebble/replay.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020
"unicode"
2121

2222
"github.com/cockroachdb/errors"
23-
"github.com/cockroachdb/pebble"
24-
"github.com/cockroachdb/pebble/bloom"
25-
"github.com/cockroachdb/pebble/internal/base"
26-
"github.com/cockroachdb/pebble/internal/cache"
27-
"github.com/cockroachdb/pebble/internal/crdbtest"
28-
"github.com/cockroachdb/pebble/replay"
29-
"github.com/cockroachdb/pebble/vfs"
23+
"github.com/cockroachdb/pebble/v2"
24+
"github.com/cockroachdb/pebble/v2/bloom"
25+
"github.com/cockroachdb/pebble/v2/internal/base"
26+
"github.com/cockroachdb/pebble/v2/internal/cache"
27+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
28+
"github.com/cockroachdb/pebble/v2/replay"
29+
"github.com/cockroachdb/pebble/v2/vfs"
3030
"github.com/spf13/cobra"
3131
)
3232

‎cmd/pebble/replay_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"fmt"
99
"testing"
1010

11-
"github.com/cockroachdb/pebble"
12-
"github.com/cockroachdb/pebble/internal/cache"
11+
"github.com/cockroachdb/pebble/v2"
12+
"github.com/cockroachdb/pebble/v2/internal/cache"
1313
"github.com/stretchr/testify/require"
1414
)
1515

‎cmd/pebble/scan.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
"github.com/cockroachdb/pebble"
17-
"github.com/cockroachdb/pebble/internal/crdbtest"
18-
"github.com/cockroachdb/pebble/internal/randvar"
16+
"github.com/cockroachdb/pebble/v2"
17+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
18+
"github.com/cockroachdb/pebble/v2/internal/randvar"
1919
"github.com/spf13/cobra"
2020
)
2121

‎cmd/pebble/sync.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"sync/atomic"
1313
"time"
1414

15-
"github.com/cockroachdb/pebble"
16-
"github.com/cockroachdb/pebble/internal/crdbtest"
17-
"github.com/cockroachdb/pebble/internal/randvar"
15+
"github.com/cockroachdb/pebble/v2"
16+
"github.com/cockroachdb/pebble/v2/internal/crdbtest"
17+
"github.com/cockroachdb/pebble/v2/internal/randvar"
1818
"github.com/spf13/cobra"
1919
)
2020

‎cmd/pebble/test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"time"
1919

2020
"github.com/HdrHistogram/hdrhistogram-go"
21-
"github.com/cockroachdb/pebble"
21+
"github.com/cockroachdb/pebble/v2"
2222
)
2323

2424
const (

‎cmd/pebble/tombstone.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/cockroachdb/errors"
14-
"github.com/cockroachdb/pebble/internal/humanize"
14+
"github.com/cockroachdb/pebble/v2/internal/humanize"
1515
"github.com/spf13/cobra"
1616
)
1717

‎cmd/pebble/write_bench.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"sync"
1111
"time"
1212

13-
"github.com/cockroachdb/pebble/internal/ackseq"
14-
"github.com/cockroachdb/pebble/internal/randvar"
15-
"github.com/cockroachdb/pebble/internal/rate"
13+
"github.com/cockroachdb/pebble/v2/internal/ackseq"
14+
"github.com/cockroachdb/pebble/v2/internal/randvar"
15+
"github.com/cockroachdb/pebble/v2/internal/rate"
1616
"github.com/spf13/cobra"
1717
)
1818

‎cmd/pebble/ycsb.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"time"
1616

1717
"github.com/cockroachdb/errors"
18-
"github.com/cockroachdb/pebble"
19-
"github.com/cockroachdb/pebble/internal/ackseq"
20-
"github.com/cockroachdb/pebble/internal/randvar"
21-
"github.com/cockroachdb/pebble/internal/rate"
18+
"github.com/cockroachdb/pebble/v2"
19+
"github.com/cockroachdb/pebble/v2/internal/ackseq"
20+
"github.com/cockroachdb/pebble/v2/internal/randvar"
21+
"github.com/cockroachdb/pebble/v2/internal/rate"
2222
"github.com/spf13/cobra"
2323
)
2424

0 commit comments

Comments
 (0)