use apache/thrift

apache · May 25, 2022 · 9302d46 · 9302d46
1 parent e10f46b
commit 9302d46
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 21 deletions.
diff --git a/go-client/docs/how_to_add_new_interface.md b/go-client/docs/how_to_add_new_interface.md
@@ -40,7 +40,7 @@ you can follow [the building manual of thrift](https://thrift.apache.org/docs/Bu
 3. Compile thrift files to generate go code.
 
 ```sh
-thrift -I idl -out idl --gen go:thrift_import='github.com/pegasus-kv/thrift/lib/go/thrift',package_prefix='github.com/XiaoMi/pegasus-go-client/idl/' idl/admin.thrift
+thrift -I idl -out idl --gen go:thrift_import='github.com/apache/thrift/lib/go/thrift',package_prefix='github.com/XiaoMi/pegasus-go-client/idl/' idl/admin.thrift
 gofmt -w **/*.go
 goimports -w */**.go
 ```

diff --git a/go-client/go.mod b/go-client/go.mod
@@ -22,9 +22,9 @@ go 1.13
 require (
 	github.com/BurntSushi/toml v0.3.1 // indirect
 	github.com/agiledragon/gomonkey v2.0.2+incompatible
+	github.com/apache/thrift v0.13.0
 	github.com/cenkalti/backoff/v4 v4.1.0
 	github.com/fortytw2/leaktest v1.3.0
-	github.com/pegasus-kv/thrift v0.13.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/net v0.0.0-20191105084925-a882066a44e0 // indirect

diff --git a/go-client/go.sum b/go-client/go.sum
@@ -60,8 +60,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pegasus-kv/thrift v0.13.0 h1:4ESwaNoHImfbHa9RUGJiJZ4hrxorihZHk5aarYwY8d4=
-github.com/pegasus-kv/thrift v0.13.0/go.mod h1:Gl9NT/WHG6ABm6NsrbfE8LiJN0sAyneCrvB4qN4NPqQ=
+github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
+github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

diff --git a/go-client/idl/admin/admin-consts.go b/go-client/idl/admin/admin-consts.go
diff --git a/go-client/idl/admin/admin.go b/go-client/idl/admin/admin.go
diff --git a/go-client/idl/base/blob.go b/go-client/idl/base/blob.go
@@ -22,7 +22,7 @@ package base
 import (
 	"fmt"
 
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 )
 
 type Blob struct {

diff --git a/go-client/idl/base/error_code.go b/go-client/idl/base/error_code.go
@@ -22,7 +22,7 @@ package base
 import (
 	"fmt"
 
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 )
 
 /// Primitive for Pegasus thrift framework.

diff --git a/go-client/idl/base/gpid.go b/go-client/idl/base/gpid.go
@@ -22,7 +22,7 @@ package base
 import (
 	"fmt"
 
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 )
 
 type Gpid struct {

diff --git a/go-client/idl/base/gpid_test.go b/go-client/idl/base/gpid_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/XiaoMi/pegasus-go-client/pegalog"
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/go-client/idl/base/rpc_address.go b/go-client/idl/base/rpc_address.go
@@ -24,7 +24,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 )
 
 type RPCAddress struct {

diff --git a/go-client/idl/cmd/cmd-consts.go b/go-client/idl/cmd/cmd-consts.go
diff --git a/go-client/idl/cmd/cmd.go b/go-client/idl/cmd/cmd.go
diff --git a/go-client/idl/radmin/radmin-consts.go b/go-client/idl/radmin/radmin-consts.go
diff --git a/go-client/idl/radmin/radmin.go b/go-client/idl/radmin/radmin.go
diff --git a/go-client/idl/replication/replication-consts.go b/go-client/idl/replication/replication-consts.go
diff --git a/go-client/idl/replication/replication.go b/go-client/idl/replication/replication.go
diff --git a/go-client/idl/rrdb/rrdb-consts.go b/go-client/idl/rrdb/rrdb-consts.go
diff --git a/go-client/idl/rrdb/rrdb.go b/go-client/idl/rrdb/rrdb.go
diff --git a/go-client/session/codec.go b/go-client/session/codec.go
@@ -34,7 +34,7 @@ import (
 	"github.com/XiaoMi/pegasus-go-client/idl/rrdb"
 	"github.com/XiaoMi/pegasus-go-client/pegalog"
 	"github.com/XiaoMi/pegasus-go-client/rpc"
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 )
 
 type PegasusCodec struct {

diff --git a/go-client/session/session_test.go b/go-client/session/session_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/XiaoMi/pegasus-go-client/pegalog"
 	"github.com/XiaoMi/pegasus-go-client/rpc"
 	"github.com/fortytw2/leaktest"
-	"github.com/pegasus-kv/thrift/lib/go/thrift"
+	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ import ( @@
     	"fmt"
     	"net"
-    	"github.com/pegasus-kv/thrift/lib/go/thrift"
+    	"github.com/apache/thrift/lib/go/thrift"
     )
     type RPCAddress struct {
@@ Expand Down @@