fix thrift conflict

XiaoMi · Sep 25, 2019 · b67c0f1 · b67c0f1
1 parent 10121a7
commit b67c0f1
Show file tree

Hide file tree

Showing 89 changed files with 9,974 additions and 38 deletions.
diff --git a/client/TalosClientFactory.go b/client/TalosClientFactory.go
@@ -21,7 +21,7 @@ import (
 	"github.com/XiaoMi/talos-sdk-golang/thrift/topic"
 	"github.com/XiaoMi/talos-sdk-golang/utils"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 )
 
 //var log = utils.Instance

diff --git a/client/TalosHttpClient.go b/client/TalosHttpClient.go
@@ -36,8 +36,7 @@ import (
 
 	"github.com/XiaoMi/talos-sdk-golang/thrift/auth"
 	"github.com/XiaoMi/talos-sdk-golang/thrift/common"
-
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	"github.com/gofrs/uuid"
 	log "github.com/sirupsen/logrus"
 )

diff --git a/example/admin/TalosAdminDemo.go b/example/admin/TalosAdminDemo.go
@@ -12,10 +12,9 @@ import (
 	"github.com/XiaoMi/talos-sdk-golang/thrift/auth"
 	"github.com/XiaoMi/talos-sdk-golang/thrift/authorization"
 	"github.com/XiaoMi/talos-sdk-golang/thrift/message"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	"github.com/XiaoMi/talos-sdk-golang/thrift/topic"
 	"github.com/XiaoMi/talos-sdk-golang/utils"
-
-	"git.apache.org/thrift.git/lib/go/thrift"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/example/simple_producer/TalosSimpleProducerDemo.go b/example/simple_producer/TalosSimpleProducerDemo.go
@@ -15,7 +15,7 @@ import (
 	"github.com/XiaoMi/talos-sdk-golang/thrift/message"
 	"github.com/XiaoMi/talos-sdk-golang/utils"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/XiaoMi/talos-sdk-golang
 go 1.12
 
 require (
-	git.apache.org/thrift.git v0.0.0-20141105021220-591e20f9636c
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/golang/mock v1.3.1

diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-git.apache.org/thrift.git v0.0.0-20141105021220-591e20f9636c h1:8Z1BqdpEgzGJNfAhMtW8SP/zdw6uoLLJZSSALQcCuak=
-git.apache.org/thrift.git v0.0.0-20141105021220-591e20f9636c/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/test/producer/partitionSender_test.go b/test/producer/partitionSender_test.go
@@ -21,7 +21,7 @@ import (
 	"talos-sdk-golang/testos-sdk-golang/test/mock_message"
 	"talos-sdk-golang/testos-sdk-golang/test/mock_producer"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/test/producer/simpleProducer_test.go b/test/producer/simpleProducer_test.go
@@ -19,7 +19,7 @@ import (
 	"talos-sdk-golang/producer"
 	"talos-sdk-golang/testos-sdk-golang/test/mock_message"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	"github.com/golang/mock/gomock"
 	log4go "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"

diff --git a/test/producer/talosProducer_test.go b/test/producer/talosProducer_test.go
@@ -30,7 +30,7 @@ import (
 
 	"talos-sdk-golang/thrift/auth"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	"github.com/golang/mock/gomock"
 	log4go "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"

diff --git a/test/producer/userMessage_test.go b/test/producer/userMessage_test.go
@@ -14,7 +14,7 @@ import (
 
 	"talos-sdk-golang/producer"
 
-	"git.apache.org/thrift.git/lib/go/thrift"
+	"github.com/XiaoMi/talos-sdk-golang/thrift/thrift"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/thrift/auth/constants.go b/thrift/auth/constants.go
diff --git a/thrift/auth/ttypes.go b/thrift/auth/ttypes.go
diff --git a/thrift/authorization/constants.go b/thrift/authorization/constants.go
diff --git a/thrift/authorization/ttypes.go b/thrift/authorization/ttypes.go
diff --git a/thrift/common/constants.go b/thrift/common/constants.go
diff --git a/thrift/common/talos_base_service-remote/talos_base_service-remote.go b/thrift/common/talos_base_service-remote/talos_base_service-remote.go
diff --git a/thrift/common/talosbaseservice.go b/thrift/common/talosbaseservice.go
diff --git a/thrift/common/ttypes.go b/thrift/common/ttypes.go
diff --git a/thrift/consumer/constants.go b/thrift/consumer/constants.go
diff --git a/thrift/consumer/consumer_service-remote/consumer_service-remote.go b/thrift/consumer/consumer_service-remote/consumer_service-remote.go
diff --git a/thrift/consumer/consumerservice.go b/thrift/consumer/consumerservice.go
diff --git a/thrift/consumer/ttypes.go b/thrift/consumer/ttypes.go
diff --git a/thrift/message/constants.go b/thrift/message/constants.go
diff --git a/thrift/message/message_service-remote/message_service-remote.go b/thrift/message/message_service-remote/message_service-remote.go
diff --git a/thrift/message/messageservice.go b/thrift/message/messageservice.go
diff --git a/thrift/message/ttypes.go b/thrift/message/ttypes.go
diff --git a/thrift/quota/constants.go b/thrift/quota/constants.go
diff --git a/thrift/quota/quota_service-remote/quota_service-remote.go b/thrift/quota/quota_service-remote/quota_service-remote.go
diff --git a/thrift/quota/quotaservice.go b/thrift/quota/quotaservice.go
diff --git a/thrift/quota/ttypes.go b/thrift/quota/ttypes.go