Skip to content

Commit

Permalink
Upgrade streams to use pkg/v4 with clix v2 and bump major version up.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Skandalik
Skandalik committed Apr 27, 2020
1 parent e2ec44d commit f61d9c4
Show file tree
Hide file tree
Showing 36 changed files with 78 additions and 143 deletions.
4 changes: 2 additions & 2 deletions cache/sink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cache
import (
"time"

"github.com/msales/pkg/v3/cache"
"github.com/msales/streams/v4"
"github.com/msales/pkg/v4/cache"
"github.com/msales/streams/v5"
)

// Sink represents a Cache streams sink.
Expand Down
8 changes: 4 additions & 4 deletions cache/sink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"testing"
"time"

cache2 "github.com/msales/pkg/v3/cache"
"github.com/msales/streams/v4"
"github.com/msales/streams/v4/cache"
"github.com/msales/streams/v4/mocks"
cache2 "github.com/msales/pkg/v4/cache"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/cache"
"github.com/msales/streams/v5/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion channel/sink.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package channel

import "github.com/msales/streams/v4"
import "github.com/msales/streams/v5"

// Sink represents a channel sink.
type Sink struct {
Expand Down
6 changes: 3 additions & 3 deletions channel/sink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package channel_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v4/channel"
"github.com/msales/streams/v4/mocks"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/channel"
"github.com/msales/streams/v5/mocks"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion channel/source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package channel
import (
"time"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

// Compile-time interface check.
Expand Down
4 changes: 2 additions & 2 deletions channel/source_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package channel_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v4/channel"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/channel"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions example/benchmark/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net/http"
"time"

"github.com/msales/pkg/v3/clix"
"github.com/msales/pkg/v3/stats"
"github.com/msales/streams/v4"
"github.com/msales/pkg/v4/clix"
"github.com/msales/pkg/v4/stats"
"github.com/msales/streams/v5"
)

import _ "net/http/pprof"
Expand Down
6 changes: 3 additions & 3 deletions example/branch/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"log"
"math/rand"

"github.com/msales/pkg/v3/clix"
"github.com/msales/pkg/v3/stats"
"github.com/msales/streams/v4"
"github.com/msales/pkg/v4/clix"
"github.com/msales/pkg/v4/stats"
"github.com/msales/streams/v5"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions example/kafka/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"time"

"github.com/Shopify/sarama"
"github.com/msales/pkg/v3/clix"
"github.com/msales/pkg/v3/stats"
"github.com/msales/streams/v4"
"github.com/msales/streams/v4/kafka"
"github.com/msales/pkg/v4/clix"
"github.com/msales/pkg/v4/stats"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/kafka"
)

// BatchSize is the size of commit batches.
Expand Down
2 changes: 1 addition & 1 deletion example/merge/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os/signal"
"syscall"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion example/simple/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os/signal"
"syscall"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion fakes_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

type fakeSource struct {
Expand Down
10 changes: 2 additions & 8 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
module github.com/msales/streams/v4
module github.com/msales/streams/v5

go 1.13

require (
github.com/DATA-DOG/go-sqlmock v1.4.1
github.com/DataDog/zstd v1.4.0 // indirect
github.com/Shopify/sarama v1.26.1
github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 // indirect
github.com/bsm/sarama-cluster v2.1.15+incompatible
github.com/cactus/go-statsd-client v3.2.0+incompatible // indirect
github.com/cactus/go-statsd-client/statsd v0.0.0-20191106001114-12b4e2b38748 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/msales/pkg/v3 v3.21.3
github.com/msales/pkg/v4 v4.0.0
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pkg/profile v1.2.1 // indirect
github.com/prometheus/client_golang v1.2.1 // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/stretchr/testify v1.5.1
golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd // indirect
golang.org/x/text v0.3.2 // indirect
)
99 changes: 20 additions & 79 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kafka/encoder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"testing"

"github.com/msales/streams/v4/kafka"
"github.com/msales/streams/v5/kafka"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion kafka/sink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/Shopify/sarama"
"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

// SinkConfig represents the configuration of a Sink.
Expand Down
2 changes: 1 addition & 1 deletion kafka/sink_internal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/Shopify/sarama"
"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
)
Expand Down
6 changes: 3 additions & 3 deletions kafka/sink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"

"github.com/Shopify/sarama"
"github.com/msales/streams/v4"
"github.com/msales/streams/v4/kafka"
"github.com/msales/streams/v4/mocks"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/kafka"
"github.com/msales/streams/v5/mocks"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion kafka/source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Shopify/sarama"
"github.com/bsm/sarama-cluster"
"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions kafka/source_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"time"

"github.com/Shopify/sarama"
"github.com/msales/streams/v4"
"github.com/msales/streams/v4/kafka"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/kafka"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion message_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion metastore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package streams_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion mocks/pipe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

type record struct {
Expand Down
4 changes: 2 additions & 2 deletions mocks/pipe_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package mocks_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v4/mocks"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/mocks"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion mocks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/mock"
)

Expand Down
2 changes: 1 addition & 1 deletion monitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"
"time"

"github.com/msales/pkg/v3/stats"
"github.com/msales/pkg/v4/stats"
)

type event struct {
Expand Down
4 changes: 2 additions & 2 deletions monitor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/msales/pkg/v3/stats"
"github.com/msales/streams/v4"
"github.com/msales/pkg/v4/stats"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion pipe_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package streams_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions processor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package streams_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v4/mocks"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/mocks"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pump_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion sql/sink.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"database/sql"
"errors"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
)

// Transaction represents a SQL transaction handler.
Expand Down
6 changes: 3 additions & 3 deletions sql/sink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"

"github.com/DATA-DOG/go-sqlmock"
"github.com/msales/streams/v4"
"github.com/msales/streams/v4/mocks"
sqlx "github.com/msales/streams/v4/sql"
"github.com/msales/streams/v5"
"github.com/msales/streams/v5/mocks"
sqlx "github.com/msales/streams/v5/sql"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion supervisor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync/atomic"
"time"

"github.com/msales/pkg/v3/syncx"
"github.com/msales/pkg/v4/syncx"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion supervisor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion task_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion topology_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package streams_test
import (
"testing"

"github.com/msales/streams/v4"
"github.com/msales/streams/v5"
"github.com/stretchr/testify/assert"
)

Expand Down

0 comments on commit f61d9c4

Please sign in to comment.