Skip to content

Upgrade pebble to v2.1.1 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masih merged 3 commits into from
Nov 22, 2025
Merged

Upgrade pebble to v2.1.1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f31e155
Upgrade pebble to v2.1.1
gammazero Nov 20, 2025
83de5db
mod tidy
gammazero Nov 20, 2025
0a9b3ff
Log and skip unknown pebble options
gammazero Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.24.3-bullseye AS build
FROM golang:1.25-bookworm AS build

WORKDIR /go/src/relayx

Expand All @@ -11,4 +11,4 @@ RUN go build -o /go/bin/relayx ./cmd/relayx
FROM gcr.io/distroless/base
COPY --from=build /go/bin/relayx /usr/bin/

ENTRYPOINT ["/usr/bin/relayx"]
ENTRYPOINT ["/usr/bin/relayx"]
14 changes: 8 additions & 6 deletions cmd/relayx/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"os"

ppebble "github.com/cockroachdb/pebble"
"github.com/cockroachdb/pebble/bloom"
ppebble "github.com/cockroachdb/pebble/v2"
"github.com/cockroachdb/pebble/v2/bloom"
"github.com/ipfs/go-log/v2"
"github.com/ipni/go-indexer-core"
"github.com/ipni/go-indexer-core/store/pebble"
Expand Down Expand Up @@ -49,16 +49,14 @@ func main() {
var delegate indexer.Interface
switch d := cctx.String("delegate"); d {
case "pebble":
opts := (&ppebble.Options{}).EnsureDefaults()
opts := &ppebble.Options{}
opts.EnsureDefaults()
if cctx.IsSet("pebbleOptions") {
popts, err := os.ReadFile(cctx.Path("pebbleOptions"))
if err != nil {
return fmt.Errorf("failed to read pebble options file: %w", err)
}
if err := opts.Parse(string(popts), &ppebble.ParseHooks{
NewCache: func(size int64) *ppebble.Cache {
return ppebble.NewCache(size)
},
NewFilterPolicy: func(name string) (ppebble.FilterPolicy, error) {
switch name {
case "none":
Expand All @@ -69,6 +67,10 @@ func main() {
return nil, fmt.Errorf("unknown filter policy: %s", name)
}
},
SkipUnknown: func(name, value string) bool {
logger.Errorw("Unknown pebble option", "name", name, "value", value)
return true
},
}); err != nil {
return fmt.Errorf("failed to parse pebble options: %w", err)
}
Expand Down
46 changes: 25 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,58 @@
module github.com/ipni/relayx

go 1.24.3
go 1.24.6

require (
github.com/cockroachdb/pebble v1.1.4
github.com/cockroachdb/pebble/v2 v2.1.1
github.com/ipfs/go-cid v0.5.0
github.com/ipfs/go-log/v2 v2.5.1
github.com/ipni/go-indexer-core v0.8.22
github.com/libp2p/go-libp2p v0.41.0
github.com/ipfs/go-log/v2 v2.9.0
github.com/ipni/go-indexer-core v0.8.24-0.20251031033056-1a253159e353
github.com/libp2p/go-libp2p v0.45.0
github.com/multiformats/go-multihash v0.2.3
github.com/stretchr/testify v1.10.0
github.com/urfave/cli/v2 v2.27.6
github.com/stretchr/testify v1.11.1
github.com/urfave/cli/v2 v2.27.7
)

require (
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
github.com/DataDog/zstd v1.5.7 // indirect
github.com/RaduBerinde/axisds v0.0.0-20250419182453-5135a0650657 // indirect
github.com/RaduBerinde/btreemap v0.0.0-20250419174037-3d62b7205d54 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/crlib v0.0.0-20241112164430-1264a2edc35b // indirect
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/swiss v0.0.0-20250624142022-d6e517c1d961 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/minio/minlz v1.0.1-0.20250507153514-87eb42fe8882 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.1.0 // indirect
github.com/multiformats/go-base36 v0.2.0 // indirect
github.com/multiformats/go-multiaddr v0.15.0 // indirect
github.com/multiformats/go-multiaddr v0.16.1 // indirect
github.com/multiformats/go-multibase v0.2.0 // indirect
github.com/multiformats/go-multicodec v0.9.0 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/multiformats/go-multicodec v0.9.2 // indirect
github.com/multiformats/go-varint v0.1.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.21.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/client_golang v1.23.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.65.0 // indirect
github.com/prometheus/procfs v0.17.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
Expand All @@ -57,10 +61,10 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/text v0.31.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.4.0 // indirect
lukechampine.com/blake3 v1.4.1 // indirect
)
Loading