Skip to content

Commit

Permalink
pump to 5.7.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@smallnest
smallnest committed Aug 14, 2020
1 parent 4a2f39c commit 909f628
Show file tree
Hide file tree
Showing 50 changed files with 84 additions and 84 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -45,7 +45,7 @@ doc:
godoc -http=:6060

deps:
go list -f '{{ join .Deps "\n"}}' ./... |grep "/" | grep -v "github.com/smallnest/rpcx"| grep "\." | sort |uniq
go list -f '{{ join .Deps "\n"}}' ./... |grep "/" | grep -v "github.com/smallnest/rpcx/v5"| grep "\." | sort |uniq

fmt:
go fmt ./...
Expand Down
6 changes: 3 additions & 3 deletions client/client.go
View file
Expand Up @@ -15,9 +15,9 @@ import (

opentracing "github.com/opentracing/opentracing-go"
circuit "github.com/rubyist/circuitbreaker"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
"go.opencensus.io/trace"
)

Expand Down
6 changes: 3 additions & 3 deletions client/client_test.go
View file
Expand Up @@ -7,9 +7,9 @@ import (
"testing"
"time"

testutils "github.com/smallnest/rpcx/_testutils"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/server"
testutils "github.com/smallnest/rpcx/v5/_testutils"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/server"
)

type Args struct {
Expand Down
4 changes: 2 additions & 2 deletions client/connection.go
View file
Expand Up @@ -9,8 +9,8 @@ import (
"net/http"
"time"

"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/rpcx/v5/share"
)

type ConnFactoryFn func(c *Client, network, address string) (net.Conn, error)
Expand Down
2 changes: 1 addition & 1 deletion client/consul_discovery.go
View file
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/docker/libkv"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/consul"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion client/etcd_discovery.go
View file
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/docker/libkv"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/etcd"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion client/etcdv3_discovery.go
View file
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/docker/libkv"
"github.com/docker/libkv/store"
etcd "github.com/smallnest/libkv-etcdv3-store"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

func init() {
Expand Down
6 changes: 3 additions & 3 deletions client/inprocess_client.go
View file
Expand Up @@ -7,9 +7,9 @@ import (
"reflect"
"sync"

"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
)

// InprocessClient is a in-process client for test.
Expand Down
2 changes: 1 addition & 1 deletion client/mdns_discovery.go
View file
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/grandcat/zeroconf"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

type serviceMeta struct {
Expand Down
2 changes: 1 addition & 1 deletion client/multiple_servers_discovery.go
View file
Expand Up @@ -4,7 +4,7 @@ import (
"sync"
"time"

"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

// MultipleServersDiscovery is a multiple servers service discovery.
Expand Down
4 changes: 2 additions & 2 deletions client/nacos_discovery.go
View file
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/nacos-group/nacos-sdk-go/common/constant"
"github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/util"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/rpcx/v5/util"
)

// NacosDiscovery is a nacos service discovery.
Expand Down
4 changes: 2 additions & 2 deletions client/oneclient.go
View file
Expand Up @@ -6,10 +6,10 @@ import (
"io"
"sync"

"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/share"

multierror "github.com/hashicorp/go-multierror"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/protocol"
)

// OneClient wraps servicesPath and XClients.
Expand Down
2 changes: 1 addition & 1 deletion client/oneclient_pool.go
View file
Expand Up @@ -3,7 +3,7 @@ package client
import (
"sync/atomic"

"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/protocol"
)

// OneClientPool is a oneclient pool with fixed size.
Expand Down
2 changes: 1 addition & 1 deletion client/opencensus.go
View file
Expand Up @@ -3,7 +3,7 @@ package client
import (
"context"

"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/share"
"go.opencensus.io/trace"
)

Expand Down
2 changes: 1 addition & 1 deletion client/opentracing.go
View file
Expand Up @@ -5,7 +5,7 @@ import (

opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/share"
)

type OpenTracingPlugin struct{}
Expand Down
2 changes: 1 addition & 1 deletion client/plugin.go
View file
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net"

"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/protocol"
)

// pluginContainer implements PluginContainer interface.
Expand Down
2 changes: 1 addition & 1 deletion client/redis_discovery.go
View file
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/valkeyrie/store/redis"
)

Expand Down
6 changes: 3 additions & 3 deletions client/xclient.go
View file
Expand Up @@ -14,9 +14,9 @@ import (
"time"

"github.com/juju/ratelimit"
ex "github.com/smallnest/rpcx/errors"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
ex "github.com/smallnest/rpcx/v5/errors"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
"golang.org/x/sync/singleflight"
)

Expand Down
2 changes: 1 addition & 1 deletion client/xclient_pool.go
View file
Expand Up @@ -3,7 +3,7 @@ package client
import (
"sync/atomic"

"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/protocol"
)

// XClientPool is a xclient pool with fixed size.
Expand Down
8 changes: 4 additions & 4 deletions client/xclient_test.go
View file
Expand Up @@ -8,10 +8,10 @@ import (

"fmt"

testutils "github.com/smallnest/rpcx/_testutils"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/server"
"github.com/smallnest/rpcx/share"
testutils "github.com/smallnest/rpcx/v5/_testutils"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/server"
"github.com/smallnest/rpcx/v5/share"
)

func TestXClient_Thrift(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion client/zookeeper_discovery.go
View file
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/docker/libkv"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/zookeeper"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
@@ -1,4 +1,4 @@
module github.com/smallnest/rpcx
module github.com/smallnest/rpcx/v5

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion protocol/compressor.go
View file
@@ -1,7 +1,7 @@
package protocol

import (
"github.com/smallnest/rpcx/util"
"github.com/smallnest/rpcx/v5/util"
)

// Compressor defines a common compression interface.
Expand Down
2 changes: 1 addition & 1 deletion protocol/message.go
View file
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"io"

"github.com/smallnest/rpcx/util"
"github.com/smallnest/rpcx/v5/util"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion reflection/server_reflection.go
View file
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/ChimeraCoder/gojson"
jsoniter "github.com/json-iterator/go"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

var typeOfError = reflect.TypeOf((*error)(nil)).Elem()
Expand Down
2 changes: 1 addition & 1 deletion reflection/server_reflection_test.go
View file
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/kr/pretty"

testutils "github.com/smallnest/rpcx/_testutils"
testutils "github.com/smallnest/rpcx/v5/_testutils"
)

type PBArith int
Expand Down
4 changes: 2 additions & 2 deletions server/converter.go
View file
Expand Up @@ -6,8 +6,8 @@ import (
"net/url"
"strconv"

"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions server/file_transfer.go
View file
Expand Up @@ -8,10 +8,10 @@ import (
"sync"
"time"

"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/share"

lru "github.com/hashicorp/golang-lru"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

// FileTransferHandler handles uploading file. Must close the connection after it finished.
Expand Down
6 changes: 3 additions & 3 deletions server/gateway.go
View file
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/julienschmidt/httprouter"
"github.com/rs/cors"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
"github.com/soheilhy/cmux"
)

Expand Down
4 changes: 2 additions & 2 deletions server/jsonrpc2.go
View file
Expand Up @@ -10,8 +10,8 @@ import (
"strings"

"github.com/rs/cors"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
)

func (s *Server) jsonrpcHandler(w http.ResponseWriter, r *http.Request) {
Expand Down
4 changes: 2 additions & 2 deletions server/plugin.go
View file
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"net"

"github.com/smallnest/rpcx/errors"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/errors"
"github.com/smallnest/rpcx/v5/protocol"
)

//PluginContainer represents a plugin container that defines all methods to manage plugins.
Expand Down
6 changes: 3 additions & 3 deletions server/server.go
View file
Expand Up @@ -22,9 +22,9 @@ import (
"os/signal"
"syscall"

"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
"github.com/smallnest/rpcx/v5/log"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
)

// ErrServerClosed is returned by the Server's Serve, ListenAndServe after a call to Shutdown or Close.
Expand Down
6 changes: 3 additions & 3 deletions server/server_test.go
View file
Expand Up @@ -7,9 +7,9 @@ import (

"time"

testutils "github.com/smallnest/rpcx/_testutils"
"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/share"
testutils "github.com/smallnest/rpcx/v5/_testutils"
"github.com/smallnest/rpcx/v5/protocol"
"github.com/smallnest/rpcx/v5/share"
)

type Args struct {
Expand Down
4 changes: 2 additions & 2 deletions server/service.go
View file
Expand Up @@ -11,8 +11,8 @@ import (
"unicode"
"unicode/utf8"

rerrors "github.com/smallnest/rpcx/errors"
"github.com/smallnest/rpcx/log"
rerrors "github.com/smallnest/rpcx/v5/errors"
"github.com/smallnest/rpcx/v5/log"
)

// Precompute the reflect type for error. Can't use error directly
Expand Down
2 changes: 1 addition & 1 deletion serverplugin/alias.go
View file
Expand Up @@ -3,7 +3,7 @@ package serverplugin
import (
"context"

"github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/protocol"
)

var aliasAppliedKey = "__aliasAppliedKey"
Expand Down
2 changes: 1 addition & 1 deletion serverplugin/consul.go
View file
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/consul"
metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion serverplugin/consul_test.go
View file
Expand Up @@ -5,7 +5,7 @@ import (
"time"

metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/server"
"github.com/smallnest/rpcx/v5/server"
)

func TestConsulRegistry(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion serverplugin/etcd.go
View file
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/etcd"
metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/log"
)

func init() {
Expand Down

0 comments on commit 909f628

Please sign in to comment.