zishuo/rpcx
1
0
Fork 0
mirror of https://github.com/smallnest/rpcx.git synced 2025-10-07 09:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove v5

Browse Source
This commit is contained in:
smallnest
2020-04-28 18:20:33 +08:00
parent 1eebab9d9c
commit c13fa98bc4
47 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/client.go
View File

@@ -15,9 +15,9 @@ import (
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
circuit "github.com/rubyist/circuitbreaker" circuit "github.com/rubyist/circuitbreaker"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
"go.opencensus.io/trace" "go.opencensus.io/trace"
) )

4
client/client_test.go
View File

@@ -8,8 +8,8 @@ import (
"time" "time"
testutils "github.com/smallnest/rpcx/_testutils" testutils "github.com/smallnest/rpcx/_testutils"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
) )
type Args struct { type Args struct {

4
client/connection.go
View File

@@ -9,8 +9,8 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
type ConnFactoryFn func(c *Client, network, address string) (net.Conn, error) type ConnFactoryFn func(c *Client, network, address string) (net.Conn, error)

2
client/consul_discovery.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/docker/libkv" "github.com/docker/libkv"
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/consul" "github.com/docker/libkv/store/consul"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

2
client/etcd_discovery.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/docker/libkv" "github.com/docker/libkv"
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/etcd" "github.com/docker/libkv/store/etcd"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

2
client/etcdv3_discovery.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/docker/libkv" "github.com/docker/libkv"
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
etcd "github.com/smallnest/libkv-etcdv3-store" etcd "github.com/smallnest/libkv-etcdv3-store"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

6
client/inprocess_client.go
View File

@@ -7,9 +7,9 @@ import (
"reflect" "reflect"
"sync" "sync"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
// InprocessClient is a in-process client for test. // InprocessClient is a in-process client for test.

2
client/mdns_discovery.go
View File

@@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/grandcat/zeroconf" "github.com/grandcat/zeroconf"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
type serviceMeta struct { type serviceMeta struct {

2
client/multiple_servers_discovery.go
View File

@@ -4,7 +4,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
// MultipleServersDiscovery is a multiple servers service discovery. // MultipleServersDiscovery is a multiple servers service discovery.

4
client/nacos_discovery.go
View File

@@ -10,8 +10,8 @@ import (
"github.com/nacos-group/nacos-sdk-go/common/constant" "github.com/nacos-group/nacos-sdk-go/common/constant"
"github.com/nacos-group/nacos-sdk-go/model" "github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo" "github.com/nacos-group/nacos-sdk-go/vo"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/util" "github.com/smallnest/rpcx/util"
) )
// NacosDiscovery is a nacos service discovery. // NacosDiscovery is a nacos service discovery.

4
client/oneclient.go
View File

@@ -6,10 +6,10 @@ import (
"io" "io"
"sync" "sync"
"github.com/smallnest/rpcx/v5/serverplugin" "github.com/smallnest/rpcx/serverplugin"
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
// OneClient wraps servicesPath and XClients. // OneClient wraps servicesPath and XClients.

2
client/oneclient_pool.go
View File

@@ -3,7 +3,7 @@ package client
import ( import (
"sync/atomic" "sync/atomic"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
// OneClientPool is a oneclient pool with fixed size. // OneClientPool is a oneclient pool with fixed size.

2
client/opencensus.go
View File

@@ -3,7 +3,7 @@ package client
import ( import (
"context" "context"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
"go.opencensus.io/trace" "go.opencensus.io/trace"
) )

2
client/opentracing.go
View File

@@ -5,7 +5,7 @@ import (
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/ext"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
type OpenTracingPlugin struct{} type OpenTracingPlugin struct{}

2
client/plugin.go
View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"net" "net"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
// pluginContainer implements PluginContainer interface. // pluginContainer implements PluginContainer interface.

2
client/redis_discovery.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/valkeyrie/store/redis" "github.com/smallnest/valkeyrie/store/redis"
) )

6
client/xclient.go
View File

@@ -15,9 +15,9 @@ import (
"github.com/juju/ratelimit" "github.com/juju/ratelimit"
ex "github.com/smallnest/rpcx/errors" ex "github.com/smallnest/rpcx/errors"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/serverplugin" "github.com/smallnest/rpcx/serverplugin"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
const ( const (

2
client/xclient_pool.go
View File

@@ -3,7 +3,7 @@ package client
import ( import (
"sync/atomic" "sync/atomic"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
// XClientPool is a xclient pool with fixed size. // XClientPool is a xclient pool with fixed size.

6
client/xclient_test.go
View File

@@ -9,9 +9,9 @@ import (
"fmt" "fmt"
testutils "github.com/smallnest/rpcx/_testutils" testutils "github.com/smallnest/rpcx/_testutils"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
func TestXClient_Thrift(t *testing.T) { func TestXClient_Thrift(t *testing.T) {

2
client/zookeeper_discovery.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/docker/libkv" "github.com/docker/libkv"
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/zookeeper" "github.com/docker/libkv/store/zookeeper"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

2
protocol/compressor.go
View File

@@ -1,7 +1,7 @@
package protocol package protocol
import ( import (
"github.com/smallnest/rpcx/v5/util" "github.com/smallnest/rpcx/util"
) )
// Compressor defines a common compression interface. // Compressor defines a common compression interface.

2
protocol/message.go
View File

@@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/smallnest/rpcx/v5/util" "github.com/smallnest/rpcx/util"
) )
var ( var (

2
reflection/server_reflection.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/ChimeraCoder/gojson" "github.com/ChimeraCoder/gojson"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
var typeOfError = reflect.TypeOf((*error)(nil)).Elem() var typeOfError = reflect.TypeOf((*error)(nil)).Elem()

4
server/converter.go
View File

@@ -6,8 +6,8 @@ import (
"net/url" "net/url"
"strconv" "strconv"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
const ( const (

6
server/gateway.go
View File

@@ -12,9 +12,9 @@ import (
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
"github.com/rs/cors" "github.com/rs/cors"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
"github.com/soheilhy/cmux" "github.com/soheilhy/cmux"
) )

4
server/jsonrpc2.go
View File

@@ -10,8 +10,8 @@ import (
"strings" "strings"
"github.com/rs/cors" "github.com/rs/cors"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
func (s *Server) jsonrpcHandler(w http.ResponseWriter, r *http.Request) { func (s *Server) jsonrpcHandler(w http.ResponseWriter, r *http.Request) {

4
server/plugin.go
View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"net" "net"
"github.com/smallnest/rpcx/v5/errors" "github.com/smallnest/rpcx/errors"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
//PluginContainer represents a plugin container that defines all methods to manage plugins. //PluginContainer represents a plugin container that defines all methods to manage plugins.

6
server/server.go
View File

@@ -21,9 +21,9 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
// ErrServerClosed is returned by the Server's Serve, ListenAndServe after a call to Shutdown or Close. // ErrServerClosed is returned by the Server's Serve, ListenAndServe after a call to Shutdown or Close.

4
server/server_test.go
View File

@@ -8,8 +8,8 @@ import (
"time" "time"
testutils "github.com/smallnest/rpcx/_testutils" testutils "github.com/smallnest/rpcx/_testutils"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
type Args struct { type Args struct {

2
server/service.go
View File

@@ -12,7 +12,7 @@ import (
"unicode/utf8" "unicode/utf8"
rerrors "github.com/smallnest/rpcx/errors" rerrors "github.com/smallnest/rpcx/errors"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
// Precompute the reflect type for error. Can't use error directly // Precompute the reflect type for error. Can't use error directly

2
serverplugin/alias.go
View File

@@ -3,7 +3,7 @@ package serverplugin
import ( import (
"context" "context"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
var aliasAppliedKey = "__aliasAppliedKey" var aliasAppliedKey = "__aliasAppliedKey"

2
serverplugin/consul.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/consul" "github.com/docker/libkv/store/consul"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

2
serverplugin/consul_test.go
View File

@@ -5,7 +5,7 @@ import (
"time" "time"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
) )
func TestConsulRegistry(t *testing.T) { func TestConsulRegistry(t *testing.T) {

2
serverplugin/etcd.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
"github.com/docker/libkv/store/etcd" "github.com/docker/libkv/store/etcd"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

2
serverplugin/etcd_test.go
View File

@@ -5,7 +5,7 @@ import (
"time" "time"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
) )
func TestEtcdRegistry(t *testing.T) { func TestEtcdRegistry(t *testing.T) {

2
serverplugin/etcdv3.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
etcd "github.com/smallnest/libkv-etcdv3-store" etcd "github.com/smallnest/libkv-etcdv3-store"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

4
serverplugin/file_transfer.go
View File

@@ -9,8 +9,8 @@ import (
"time" "time"
"github.com/hashicorp/golang-lru" "github.com/hashicorp/golang-lru"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
) )
var ( var (

4
serverplugin/metrics.go
View File

@@ -7,8 +7,8 @@ import (
"github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics"
"github.com/rcrowley/go-metrics/exp" "github.com/rcrowley/go-metrics/exp"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
) )
// MetricsPlugin has an issue. It changes seq of requests and it is wrong!!!! // MetricsPlugin has an issue. It changes seq of requests and it is wrong!!!!

4
serverplugin/nacos.go
View File

@@ -8,8 +8,8 @@ import (
"github.com/nacos-group/nacos-sdk-go/clients/naming_client" "github.com/nacos-group/nacos-sdk-go/clients/naming_client"
"github.com/nacos-group/nacos-sdk-go/common/constant" "github.com/nacos-group/nacos-sdk-go/common/constant"
"github.com/nacos-group/nacos-sdk-go/vo" "github.com/nacos-group/nacos-sdk-go/vo"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/rpcx/v5/util" "github.com/smallnest/rpcx/util"
) )
// NacosRegisterPlugin implements consul registry. // NacosRegisterPlugin implements consul registry.

6
serverplugin/opencensus.go
View File

@@ -4,9 +4,9 @@ import (
"context" "context"
"net" "net"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
"go.opencensus.io/trace" "go.opencensus.io/trace"
) )

6
serverplugin/opentracing.go
View File

@@ -7,9 +7,9 @@ import (
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/ext"
"github.com/opentracing/opentracing-go/log" "github.com/opentracing/opentracing-go/log"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
"github.com/smallnest/rpcx/v5/share" "github.com/smallnest/rpcx/share"
) )
type OpenTracingPlugin struct{} type OpenTracingPlugin struct{}

2
serverplugin/redis.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/abronan/valkeyrie" "github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store" "github.com/abronan/valkeyrie/store"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
"github.com/smallnest/valkeyrie/store/redis" "github.com/smallnest/valkeyrie/store/redis"
) )

2
serverplugin/trace.go
View File

@@ -6,7 +6,7 @@ package serverplugin
// "reflect" // "reflect"
// "runtime" // "runtime"
// "github.com/smallnest/rpcx/v5/protocol" // "github.com/smallnest/rpcx/protocol"
// "golang.org/x/net/trace" // "golang.org/x/net/trace"
// ) // )

2
serverplugin/zookeeper.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/docker/libkv/store" "github.com/docker/libkv/store"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/log" "github.com/smallnest/rpcx/log"
) )
func init() { func init() {

2
serverplugin/zookeeper_test.go
View File

@@ -5,7 +5,7 @@ import (
"time" "time"
metrics "github.com/rcrowley/go-metrics" metrics "github.com/rcrowley/go-metrics"
"github.com/smallnest/rpcx/v5/server" "github.com/smallnest/rpcx/server"
) )
func TestZookeeperRegistry(t *testing.T) { func TestZookeeperRegistry(t *testing.T) {

4
share/share.go
View File

@@ -1,8 +1,8 @@
package share package share
import ( import (
"github.com/smallnest/rpcx/v5/codec" "github.com/smallnest/rpcx/codec"
"github.com/smallnest/rpcx/v5/protocol" "github.com/smallnest/rpcx/protocol"
) )
const ( const (

2
tool/xgen/xgen.go
View File

@@ -9,7 +9,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/smallnest/rpcx/v5/tool/xgen/parser" "github.com/smallnest/rpcx/tool/xgen/parser"
) )
var ( var (