Skip to content

Commit

Permalink
using new api
Browse files Browse the repository at this point in the history
  • Loading branch information
joway committed Nov 12, 2024
1 parent ffb9929 commit c3534ad
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 49 deletions.
17 changes: 9 additions & 8 deletions codec/thrift/kitex_gen/echo/streamserver/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 17 additions & 8 deletions codec/thrift/kitex_gen/echo/streamserver/server.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions codec/thrift/kitex_gen/echo/streamserver/streamserver.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/cloudfoundry/gosigar v1.3.3
github.com/cloudwego/fastpb v0.0.5
github.com/cloudwego/gopkg v0.1.2-0.20240919030844-cb7123236682
github.com/cloudwego/kitex v0.11.2-0.20241010053736-f4746b81e7d9
github.com/cloudwego/kitex v0.11.3-0.20241112064056-c0dad5a05e03
github.com/gogo/protobuf v1.3.2
github.com/juju/ratelimit v1.0.1
github.com/lesismal/arpc v1.2.4
Expand All @@ -29,13 +29,13 @@ require (
github.com/cheekybits/genny v1.0.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/configmanager v0.2.2 // indirect
github.com/cloudwego/dynamicgo v0.4.0 // indirect
github.com/cloudwego/dynamicgo v0.4.4 // indirect
github.com/cloudwego/frugal v0.2.0 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/cloudwego/localsession v0.0.2 // indirect
github.com/cloudwego/localsession v0.1.1 // indirect
github.com/cloudwego/netpoll v0.6.5-0.20240911104114-8a1f5597a920 // indirect
github.com/cloudwego/runtimex v0.1.0 // indirect
github.com/cloudwego/thriftgo v0.3.17 // indirect
github.com/cloudwego/thriftgo v0.3.18 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-jump v0.0.0-20170409065014-e1f439676b57 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/
github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
github.com/cloudwego/configmanager v0.2.2 h1:sVrJB8gWYTlPV2OS3wcgJSO9F2/9Zbkmcm1Z7jempOU=
github.com/cloudwego/configmanager v0.2.2/go.mod h1:ppiyU+5TPLonE8qMVi/pFQk2eL3Q4P7d4hbiNJn6jwI=
github.com/cloudwego/dynamicgo v0.4.0 h1:wQqNRNiSQaLkbcn3sfpEJGZsz3xf8Il4P/3DcENsrFI=
github.com/cloudwego/dynamicgo v0.4.0/go.mod h1:zgWk2oz56EyH790LJSxrTz1j01GJBO964jJQ/y7qjJc=
github.com/cloudwego/dynamicgo v0.4.4 h1:RuHhjy44Ajy2PLjrwOhI9EY874t9srhgwd/rkKTUKfQ=
github.com/cloudwego/dynamicgo v0.4.4/go.mod h1:DknfxjIMuGvXow409bS/AWycXONdc02HECBL0qpNqTY=
github.com/cloudwego/fastpb v0.0.5 h1:vYnBPsfbAtU5TVz5+f9UTlmSCixG9F9vRwaqE0mZPZU=
github.com/cloudwego/fastpb v0.0.5/go.mod h1:Bho7aAKBUtT9RPD2cNVkTdx4yQumfSv3If7wYnm1izk=
github.com/cloudwego/frugal v0.2.0 h1:0ETSzQYoYqVvdl7EKjqJ9aJnDoG6TzvNKV3PMQiQTS8=
Expand All @@ -71,16 +71,16 @@ github.com/cloudwego/gopkg v0.1.2-0.20240919030844-cb7123236682 h1:hj/AhlEngERp5
github.com/cloudwego/gopkg v0.1.2-0.20240919030844-cb7123236682/go.mod h1:WoNTdXDPdvL97cBmRUWXVGkh2l2UFmpd9BUvbW2r0Aw=
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/cloudwego/kitex v0.11.2-0.20241010053736-f4746b81e7d9 h1:E0NJGsawD+Jpv9VL5Nvr4vgThpNqIti4vzFRbEzvHRw=
github.com/cloudwego/kitex v0.11.2-0.20241010053736-f4746b81e7d9/go.mod h1:xavkyMxJxzdHCLuSDk9r51V6z11eQVAL4UDow3DH0kM=
github.com/cloudwego/localsession v0.0.2 h1:N9/IDtCPj1fCL9bCTP+DbXx3f40YjVYWcwkJG0YhQkY=
github.com/cloudwego/localsession v0.0.2/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8=
github.com/cloudwego/kitex v0.11.3-0.20241112064056-c0dad5a05e03 h1:MlgUHc+caxiEUeFz0xSrb04tQI7WcpxDPv8yPMXi19g=
github.com/cloudwego/kitex v0.11.3-0.20241112064056-c0dad5a05e03/go.mod h1:/beJ9Uxjzxv+tOu8JR404PMG7pObWoTR3UtYeytXjug=
github.com/cloudwego/localsession v0.1.1 h1:tbK7laDVrYfFDXoBXo4uCGMAxU4qmz2dDm8d4BGBnDo=
github.com/cloudwego/localsession v0.1.1/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8=
github.com/cloudwego/netpoll v0.6.5-0.20240911104114-8a1f5597a920 h1:WT7vsDDb+ammyB7XLmNSS4vKGpPvM2JDl6h34Jj7mY4=
github.com/cloudwego/netpoll v0.6.5-0.20240911104114-8a1f5597a920/go.mod h1:BtM+GjKTdwKoC8IOzD08/+8eEn2gYoiNLipFca6BVXQ=
github.com/cloudwego/runtimex v0.1.0 h1:HG+WxWoj5/CDChDZ7D99ROwvSMkuNXAqt6hnhTTZDiI=
github.com/cloudwego/runtimex v0.1.0/go.mod h1:23vL/HGV0W8nSCHbe084AgEBdDV4rvXenEUMnUNvUd8=
github.com/cloudwego/thriftgo v0.3.17 h1:k0iQe2jEAN1WhPsXWvatwHzoxObUSX2Nw5NqdnywS8k=
github.com/cloudwego/thriftgo v0.3.17/go.mod h1:AdLEJJVGW/ZJYvkkYAZf5SaJH+pA3OyC801WSwqcBwI=
github.com/cloudwego/thriftgo v0.3.18 h1:gnr1vz7G3RbwwCK9AMKHZf63VYGa7ene6WbI9VrBJSw=
github.com/cloudwego/thriftgo v0.3.18/go.mod h1:AdLEJJVGW/ZJYvkkYAZf5SaJH+pA3OyC801WSwqcBwI=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
Expand Down
5 changes: 3 additions & 2 deletions streaming/kitex_tts_lconn/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/cloudwego/kitex-benchmark/codec/thrift/kitex_gen/echo"
"github.com/cloudwego/kitex-benchmark/codec/thrift/kitex_gen/echo/streamserver"
"github.com/cloudwego/kitex-benchmark/runner"
"github.com/cloudwego/kitex/client"
"github.com/cloudwego/kitex/client/streamxclient"
"github.com/cloudwego/kitex/pkg/klog"
"github.com/cloudwego/kitex/pkg/streamx"
Expand All @@ -42,7 +43,7 @@ func NewKClient(opt *runner.Options) runner.Client {
)
c, err := streamserver.NewClient(
"test.echo.kitex",
streamxclient.WithHostPorts(opt.Address),
client.WithHostPorts(opt.Address),
streamxclient.WithProvider(cp),
)
if err != nil {
Expand All @@ -53,7 +54,7 @@ func NewKClient(opt *runner.Options) runner.Client {
streampool: &sync.Pool{
New: func() interface{} {
ctx := metainfo.WithValue(context.Background(), "header", "hello")
stream, err := c.Echo(ctx)
_, stream, err := c.Echo(ctx)
if err != nil {
log.Printf("client new stream failed: %v", err)
return nil
Expand Down
7 changes: 2 additions & 5 deletions streaming/kitex_tts_lconn/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,10 @@ func main() {
perf.ServeMonitor(fmt.Sprintf(":%d", port+10000))
}()

svr := server.NewServer(
svr := streamserver.NewServer(
new(StreamServerImpl),
server.WithServiceAddr(&net.TCPAddr{IP: net.IPv4zero, Port: port}),
)
err := streamserver.RegisterService(svr, new(StreamServerImpl))
if err != nil {
panic(err)
}
if err := svr.Run(); err != nil {
log.Println(err.Error())
}
Expand Down
9 changes: 6 additions & 3 deletions streaming/kitex_tts_mux/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,18 @@ import (
"github.com/cloudwego/kitex-benchmark/codec/thrift/kitex_gen/echo"
"github.com/cloudwego/kitex-benchmark/codec/thrift/kitex_gen/echo/streamserver"
"github.com/cloudwego/kitex-benchmark/runner"
"github.com/cloudwego/kitex/client/streamxclient"
"github.com/cloudwego/kitex/client"
"github.com/cloudwego/kitex/pkg/klog"
"github.com/cloudwego/kitex/pkg/streamx"
)

func NewKClient(opt *runner.Options) runner.Client {
klog.SetLevel(klog.LevelWarn)

c, err := streamserver.NewClient("test.echo.kitex", streamxclient.WithHostPorts(opt.Address))
c, err := streamserver.NewClient(
"test.echo.kitex",
client.WithHostPorts(opt.Address),
)
if err != nil {
log.Fatal(err)
}
Expand All @@ -44,7 +47,7 @@ func NewKClient(opt *runner.Options) runner.Client {
streampool: &sync.Pool{
New: func() interface{} {
ctx := metainfo.WithValue(context.Background(), "header", "hello")
stream, err := c.Echo(ctx)
_, stream, err := c.Echo(ctx)
if err != nil {
log.Printf("client new stream failed: %v", err)
return nil
Expand Down
7 changes: 2 additions & 5 deletions streaming/kitex_tts_mux/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,10 @@ func main() {
perf.ServeMonitor(fmt.Sprintf(":%d", port+10000))
}()

svr := server.NewServer(
svr := streamserver.NewServer(
new(StreamServerImpl),
server.WithServiceAddr(&net.TCPAddr{IP: net.IPv4zero, Port: port}),
)
err := streamserver.RegisterService(svr, new(StreamServerImpl))
if err != nil {
panic(err)
}
if err := svr.Run(); err != nil {
log.Println(err.Error())
}
Expand Down

0 comments on commit c3534ad

Please sign in to comment.