Skip to content

Commit 23c20c4

Browse files
authored
Merge pull request #7471 from onflow/leo/pebble2
[Storage] Upgrade to Pebble 2
2 parents 437ec9b + fd4b602 commit 23c20c4

Some content is hidden

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

62 files changed

+199
-195
lines changed

admin/commands/storage/pebble_checkpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path"
77
"time"
88

9-
"github.com/cockroachdb/pebble"
9+
"github.com/cockroachdb/pebble/v2"
1010
"github.com/rs/zerolog/log"
1111

1212
"github.com/onflow/flow-go/admin"

cmd/execution_builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
awsconfig "github.com/aws/aws-sdk-go-v2/config"
1515
"github.com/aws/aws-sdk-go-v2/service/s3"
16-
"github.com/cockroachdb/pebble"
16+
"github.com/cockroachdb/pebble/v2"
1717
"github.com/ipfs/boxo/bitswap"
1818
"github.com/ipfs/go-cid"
1919
"github.com/onflow/cadence"

cmd/node_builder.go

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

7-
"github.com/cockroachdb/pebble"
7+
"github.com/cockroachdb/pebble/v2"
88
"github.com/dgraph-io/badger/v2"
99
"github.com/jordanschalm/lockctx"
1010
madns "github.com/multiformats/go-multiaddr-dns"

cmd/scaffold.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313

1414
gcemd "cloud.google.com/go/compute/metadata"
15-
"github.com/cockroachdb/pebble"
15+
"github.com/cockroachdb/pebble/v2"
1616
"github.com/dgraph-io/badger/v2"
1717
"github.com/hashicorp/go-multierror"
1818
dht "github.com/libp2p/go-libp2p-kad-dht"

cmd/scaffold/pebble_db.go

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

8-
"github.com/cockroachdb/pebble"
8+
"github.com/cockroachdb/pebble/v2"
99
"github.com/rs/zerolog"
1010

1111
pebblestorage "github.com/onflow/flow-go/storage/pebble"

cmd/util/cmd/common/storage.go

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

6-
"github.com/cockroachdb/pebble"
6+
"github.com/cockroachdb/pebble/v2"
77
"github.com/dgraph-io/badger/v2"
88
"github.com/rs/zerolog/log"
99

cmd/util/cmd/read-badger/cmd/chunk_data_pack.go

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

6-
"github.com/cockroachdb/pebble"
6+
"github.com/cockroachdb/pebble/v2"
77
"github.com/dgraph-io/badger/v2"
88
"github.com/rs/zerolog/log"
99
"github.com/spf13/cobra"

cmd/util/cmd/read-badger/cmd/storages.go

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

33
import (
4-
"github.com/cockroachdb/pebble"
4+
"github.com/cockroachdb/pebble/v2"
55
"github.com/dgraph-io/badger/v2"
66
"github.com/rs/zerolog/log"
77

cmd/util/cmd/read-badger/cmd/transaction_results.go

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

6-
"github.com/cockroachdb/pebble"
6+
"github.com/cockroachdb/pebble/v2"
77
"github.com/dgraph-io/badger/v2"
88
"github.com/rs/zerolog/log"
99
"github.com/spf13/cobra"

cmd/util/cmd/rollback-executed-height/cmd/rollback_executed_height_test.go

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

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

0 commit comments

Comments
 (0)