Skip to content

Commit

Permalink
bump substreams-sink-sql
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArnaudBger
ArnaudBger committed Sep 13, 2024
1 parent 0345bc3 commit caf35cb
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 124 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## v4.2.1
Bump substreams to v1.10.3 to support new manifest data like `protobuf:excludePaths`

## v4.2.0

* Added the --cursor-table and --history-table flags to allow running to sinks on the same database (be careful that you have no collision in table names)
Expand Down
4 changes: 2 additions & 2 deletions cmd/substreams-sink-sql/generate_csv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ func generateCsvE(cmd *cobra.Command, args []string) error {
if err != nil {
return fmt.Errorf("setup manifest reader: %w", err)
}
pkg, _, err := reader.Read()
pkgBundle, err := reader.Read()
if err != nil {
return fmt.Errorf("read manifest: %w", err)
}
network = pkg.Network
network = pkgBundle.Package.Network
}
var err error
endpoint, err = manifest.ExtractNetworkEndpoint(network, sflags.MustGetString(cmd, "endpoint"), zlog)
Expand Down
4 changes: 2 additions & 2 deletions cmd/substreams-sink-sql/run.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ func sinkRunE(cmd *cobra.Command, args []string) error {
if err != nil {
return fmt.Errorf("setup manifest reader: %w", err)
}
pkg, _, err := reader.Read()
pkgBundle, err := reader.Read()
if err != nil {
return fmt.Errorf("read manifest: %w", err)
}
network = pkg.Network
network = pkgBundle.Package.Network
}
var err error
endpoint, err = manifest.ExtractNetworkEndpoint(network, sflags.MustGetString(cmd, "endpoint"), zlog)
Expand Down
4 changes: 2 additions & 2 deletions cmd/substreams-sink-sql/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ func sinkSetupE(cmd *cobra.Command, args []string) error {
if err != nil {
return fmt.Errorf("setup manifest reader: %w", err)
}
pkg, _, err := reader.Read()
pkgBundle, err := reader.Read()
if err != nil {
return fmt.Errorf("read manifest: %w", err)
}

sinkConfig, err := extractSinkConfig(pkg)
sinkConfig, err := extractSinkConfig(pkgBundle.Package)
if err != nil {
return fmt.Errorf("extract sink config: %w", err)
}
Expand Down
5 changes: 3 additions & 2 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
version: "3"

services:
postgres:
container_name: postgres-ssp
container_name: postgres-ssp2
image: postgres:14
ports:
- "5432:5432"
Expand All @@ -21,7 +22,7 @@ services:
timeout: 10s
retries: 15
pgweb:
container_name: pgweb-ssp
container_name: pgweb-ssp2
image: sosedoff/pgweb:0.11.12
restart: on-failure
ports:
Expand Down
50 changes: 14 additions & 36 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/ClickHouse/clickhouse-go/v2 v2.25.0
github.com/bobg/go-generics/v2 v2.1.1
github.com/bobg/go-generics/v2 v2.2.2
github.com/drone/envsubst v1.0.3
github.com/golang/protobuf v1.5.4
github.com/jimsmart/schema v0.2.0
Expand All @@ -13,13 +13,13 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.15.0
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091
github.com/streamingfast/substreams v1.9.3-0.20240724192119-4163f825c7b5
github.com/streamingfast/substreams-sink v0.4.0
github.com/streamingfast/substreams v1.10.3
github.com/streamingfast/substreams-sink v0.4.2
github.com/streamingfast/substreams-sink-database-changes v1.1.3
github.com/stretchr/testify v1.9.0
github.com/wk8/go-ordered-map/v2 v2.1.7
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
google.golang.org/protobuf v1.33.0
)

Expand All @@ -33,14 +33,11 @@ require (
github.com/alecthomas/participle v0.7.1 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/bits-and-blooms/bitset v1.12.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand All @@ -52,9 +49,6 @@ require (
github.com/google/s2a-go v0.1.7 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/ipfs/boxo v0.8.0 // indirect
github.com/ipfs/go-cid v0.4.0 // indirect
github.com/ipfs/go-ipfs-api v0.6.0 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
Expand All @@ -63,25 +57,10 @@ require (
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
github.com/libp2p/go-libp2p v0.26.3 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/mschoch/smat v0.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.8.0 // indirect
github.com/multiformats/go-multibase v0.1.1 // indirect
github.com/multiformats/go-multicodec v0.8.1 // indirect
github.com/multiformats/go-multihash v0.2.1 // indirect
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/paulbellamy/ratecounter v0.2.0 // indirect
github.com/paulmach/orb v0.11.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
Expand All @@ -92,26 +71,23 @@ require (
github.com/segmentio/asm v1.2.0 // indirect
github.com/sethvargo/go-retry v0.2.3 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/streamingfast/derr v0.0.0-20230515163924-8570aaa43fe1 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf // indirect
github.com/whyrusleeping/tar-utils v0.0.0-20201201191210-20a61371de5b // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
lukechampine.com/blake3 v1.1.7 // indirect
)

require (
Expand Down Expand Up @@ -145,27 +121,27 @@ require (
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/streamingfast/bstream v0.0.2-0.20240603153252-ec8d37625188
github.com/streamingfast/bstream v0.0.2-0.20240906151250-c7bc58efc760
github.com/streamingfast/cli v0.0.4-0.20230825151644-8cc84512cd80
github.com/streamingfast/dbin v0.9.1-0.20231117225723-59790c798e2c // indirect
github.com/streamingfast/dgrpc v0.0.0-20240219152146-57bb131c39ca // indirect
github.com/streamingfast/dhammer v0.0.0-20220506192416-3797a7906da2
github.com/streamingfast/dmetrics v0.0.0-20240214191810-524a5c58fbaa
github.com/streamingfast/dstore v0.1.1-0.20240311181234-470a7a84936f
github.com/streamingfast/dstore v0.1.1-0.20240826190906-91345d4a31f2
github.com/streamingfast/opaque v0.0.0-20210811180740-0c01d37ea308 // indirect
github.com/streamingfast/pbgo v0.0.6-0.20231120172814-537d034aad5e // indirect
github.com/streamingfast/pbgo v0.0.6-0.20240823134334-812f6a16c5cb // indirect
github.com/streamingfast/shutter v1.5.0
github.com/yourbasic/graph v0.0.0-20210606180040-8ecfec1c2869 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/api v0.172.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
Expand All @@ -174,3 +150,5 @@ require (
)

replace github.com/jimsmart/schema => github.com/streamingfast/schema v0.0.0-20240621180609-1de2e05fe3bd


Loading

0 comments on commit caf35cb

Please sign in to comment.