From 758bc4d9044f5966d865a819c9f40628c3ca0fbe Mon Sep 17 00:00:00 2001 From: "liu.xiaomin" Date: Fri, 28 Jan 2022 14:36:33 +0800 Subject: [PATCH] upgrade getty version --- cmd/tc/main.go | 1 + go.mod | 7 +- go.sum | 66 ++++++++----------- pkg/base/common/xid.go | 2 +- pkg/base/config/config_center_config.go | 4 +- pkg/base/config/registry_config.go | 4 +- pkg/base/config_center/base_operate.go | 4 +- .../config_center/config_center_factory.go | 4 +- pkg/base/config_center/etcdv3/factory.go | 1 + pkg/base/config_center/nacos/factory.go | 1 + pkg/base/constant/key.go | 4 +- pkg/base/extension/registry.go | 2 + pkg/base/getty/message_future.go | 4 +- pkg/base/getty/readwriter/readwriter.go | 25 +++---- pkg/base/meta/branch_status.go | 24 +++---- pkg/base/meta/branch_type.go | 5 +- pkg/base/meta/global_status.go | 4 +- pkg/base/meta/transaction_exception_code.go | 4 +- pkg/base/meta/transaction_role.go | 4 +- pkg/base/model/resource.go | 4 +- pkg/base/model/set.go | 4 +- pkg/base/protocal/message_type.go | 2 +- pkg/base/registry/etcdv3/registry.go | 2 + pkg/base/registry/nacos/registry.go | 7 +- pkg/client/config/client_config.go | 4 +- pkg/client/config/getty_config.go | 8 ++- pkg/client/rpc_client.go | 2 + pkg/client/rpc_client/rpc_remoting_client.go | 2 + pkg/client/rpc_client/rpc_rm_message.go | 4 +- pkg/client/tcc/proxy.go | 7 +- pkg/client/tm/transaction_info.go | 4 +- pkg/client/tm/transaction_manager.go | 4 +- pkg/tc/config/server_config.go | 9 ++- pkg/tc/config/store_config.go | 1 + pkg/tc/event/global_transaction_event.go | 4 +- pkg/tc/holder/default_session_manager_test.go | 5 ++ .../holder/file_based_session_manager_test.go | 5 ++ .../holder/file_transaction_store_manager.go | 1 - pkg/tc/holder/log_store_database_dao.go | 1 + pkg/tc/lock/lock_store_database_dao.go | 1 + pkg/tc/model/branch_transaction_do.go | 4 +- pkg/tc/model/global_transaction_do.go | 4 +- pkg/tc/model/lock_do.go | 4 +- pkg/tc/model/session_condition.go | 4 +- pkg/tc/server/default_coordinator.go | 16 +++-- ...fault_coordinator_server_message_sender.go | 1 + pkg/tc/server/default_core.go | 1 - pkg/tc/server/getty_session_manager.go | 6 ++ pkg/tc/server/server.go | 1 + pkg/tc/server/tc_inbound_handler.go | 4 +- pkg/tc/session/branch_session.go | 1 + pkg/tc/session/global_session.go | 8 ++- pkg/tc/session/global_session_test.go | 2 + pkg/util/log/logging.go | 5 +- pkg/util/mysql/mysql_keyword_checker.go | 4 +- pkg/util/parser/parser.go | 6 +- pkg/util/sql/sql_type.go | 5 +- pkg/util/uuid/id_worker.go | 4 +- 58 files changed, 211 insertions(+), 120 deletions(-) diff --git a/cmd/tc/main.go b/cmd/tc/main.go index 6048c6c7..023d464d 100644 --- a/cmd/tc/main.go +++ b/cmd/tc/main.go @@ -8,6 +8,7 @@ import ( import ( gxnet "github.com/dubbogo/gost/net" + "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 6a138c4d..9127c1c7 100644 --- a/go.mod +++ b/go.mod @@ -3,22 +3,17 @@ module github.com/transaction-wg/seata-golang go 1.14 require ( - github.com/apache/dubbo-getty v1.4.3 + github.com/apache/dubbo-getty v1.4.7 github.com/creasty/defaults v1.5.2 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd // indirect github.com/dubbogo/gost v1.11.16 - github.com/go-playground/assert/v2 v2.0.1 github.com/go-sql-driver/mysql v1.5.0 github.com/go-xorm/xorm v0.7.9 - github.com/golang/protobuf v1.4.3 - github.com/google/go-cmp v0.5.0 github.com/imdario/mergo v0.3.12 github.com/lib/pq v1.1.1 // indirect github.com/mattn/go-sqlite3 v2.0.1+incompatible // indirect github.com/nacos-group/nacos-sdk-go v1.0.8 github.com/natefinch/lumberjack v2.0.0+incompatible - github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/pingcap/parser v0.0.0-00010101000000-000000000000 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.9.0 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a diff --git a/go.sum b/go.sum index c90d61f0..70c0cf5f 100644 --- a/go.sum +++ b/go.sum @@ -36,7 +36,6 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= @@ -55,6 +54,7 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40 h1:xvUo53O5MRZhVMJAxWCJcS5HHrqAiAG9SJ1LpMu6aAI= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -66,10 +66,14 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= +github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 h1:xD/lrqdvwsc+O2bjSSi3YqY73Ke3LAiSCx49aCesA0E= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= +github.com/cockroachdb/errors v1.2.4 h1:Lap807SXTH5tri2TivECb/4abUkMZC9zRoLarvcKDqs= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= +github.com/coreos/bbolt v1.3.4 h1:0VqjxUwoTLxM3PmsSIk0hI2ao6gTtButQ2z8FT4//yo= github.com/coreos/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -90,12 +94,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creasty/defaults v1.5.2 h1:/VfB6uxpyp6h0fr7SPp7n8WJBoV8jfxQXPCnkVSjyls= github.com/creasty/defaults v1.5.2/go.mod h1:FPZ+Y0WNrbqOVw+c6av63eyHUAl6pMHZwqLPvXUZGfY= -github.com/cznic/golex v0.0.0-20181122101858-9c343928389c/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc= -github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= -github.com/cznic/parser v0.0.0-20160622100904-31edd927e5b1/go.mod h1:2B43mz36vGZNZEwkWi8ayRSSUXLfjL8OkbzwW4NcPMM= -github.com/cznic/sortutil v0.0.0-20181122101858-f5f958428db8/go.mod h1:q2w6Bg5jeox1B+QkJ6Wp/+Vn0G/bo3f1uY7Fn3vivIQ= -github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= -github.com/cznic/y v0.0.0-20170802143616-045f81c6662a/go.mod h1:1rk5VM7oSnA4vjp+hrLQ3HWHa+Y4yPCa3/CsJrcNnvs= 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= @@ -108,12 +106,11 @@ github.com/dubbogo/getty v1.4.3 h1:GK+N1+lyYFIC7tZJ3my2BRWtFDuI/n2ku0IzhdKktTg= github.com/dubbogo/getty v1.4.3/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek= github.com/dubbogo/go-zookeeper v1.0.3/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c= github.com/dubbogo/gost v1.10.1/go.mod h1:+mQGS51XQEUWZP2JeGZTxJwipjRKtJO7Tr+FOg+72rI= -github.com/dubbogo/gost v1.11.11 h1:u6kY0oJEZEKLCdo9Hz5eAqeDZev2e7+3rJrUkqgC24s= -github.com/dubbogo/gost v1.11.11/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/gost v1.11.16 h1:fvOw8aKQ0BuUYuD+MaXAYFvT7tg2l7WAS5SL5gZJpFs= github.com/dubbogo/gost v1.11.16/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= @@ -128,11 +125,13 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU= github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= @@ -147,8 +146,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= @@ -196,6 +193,7 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -223,10 +221,13 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 h1:FlFbCRLd5Jr4iYXZufAvgWN6Ao0JrI5chLINnUXDDr0= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= @@ -265,6 +266,7 @@ github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -280,6 +282,7 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= @@ -292,12 +295,12 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 h1:0iQektZGS248WXmGIYOwRXSQhD4qn3icjMpuxwO7qlo= github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570/go.mod h1:BLt8L9ld7wVsvEWQbuLrUZnCMnUmLZ+CGDzKtclrTlE= github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f h1:sgUSP4zdTUZYZgAGGtN5Lxk92rK+JUFOwf+FT99EEI4= @@ -373,22 +376,11 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= -github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ= -github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= -github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= -github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9 h1:AJD9pZYm72vMgPcQDww9rkZ1DnWfl0pXV3BOWlkYIjA= -github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= -github.com/pingcap/parser v0.0.0-20200422082501-7329d80eaf2c h1:eXC+xkHerLvR6+mceugr4e8ALAQHj25S5slt8A2f6Ho= -github.com/pingcap/parser v0.0.0-20200422082501-7329d80eaf2c/go.mod h1:9v0Edh8IbgjGYW2ArJr19E+bvL8zKahsFp+ixWeId+4= -github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330/go.mod h1:RtkHW8WbcNxj8lsbzjaILci01CtYnYbIkQhjyZWrWVI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -433,7 +425,6 @@ github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -451,6 +442,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -458,6 +450,7 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5 h1:GJTW+uNMIV1RKwox+T4aN0/sQlYRg78uHZf2H0aBcDw= github.com/soheilhy/cmux v0.1.5-0.20210205191134-5ec6847320e5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -468,6 +461,7 @@ github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -488,21 +482,16 @@ github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIU github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3 h1:kF/7m/ZU+0D4Jj5eZ41Zm3IH/J8OElK1Qtd7tVKAwLk= github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3/go.mod h1:QDlpd3qS71vYtakd2hmdpqhJ9nwv6mD6A30bQ1BPBFE= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4= -github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -513,12 +502,15 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0 h1:+e5nrluATIy3GP53znpkHMFzPTHGYyzvJGFCbuI6ZLc= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= +go.etcd.io/etcd/client/v2 v2.305.0-alpha.0 h1:jZepGpOeJATxsbMNBZczDS2jHdK/QVHM1iPe9jURJ8o= go.etcd.io/etcd/client/v2 v2.305.0-alpha.0/go.mod h1:kdV+xzCJ3luEBSIeQyB/OEKkWKd8Zkux4sbDeANrosU= go.etcd.io/etcd/client/v3 v3.5.0-alpha.0 h1:dr1EOILak2pu4Nf5XbRIOCNIBjcz6UmkQd7hHRXwxaM= go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8= go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 h1:3yLUEC0nFCxw/RArImOyRUI4OAFbg4PFpBbAhSNzKNY= go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY= +go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0 h1:DvYJotxV9q1Lkn7pknzAbFO/CLtCVidCr2K9qRLJ8pA= go.etcd.io/etcd/raft/v3 v3.5.0-alpha.0/go.mod h1:FAwse6Zlm5v4tEWZaTjmNhe17Int4Oxbu7+2r0DiD3w= +go.etcd.io/etcd/server/v3 v3.5.0-alpha.0 h1:fYv7CmmdyuIu27UmKQjS9K/1GtcCa+XnPKqiKBbQkrk= go.etcd.io/etcd/server/v3 v3.5.0-alpha.0/go.mod h1:tsKetYpt980ZTpzl/gb+UOJj9RkIyCb1u4wjzMg90BQ= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -537,9 +529,7 @@ go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKY go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= @@ -553,9 +543,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -669,6 +658,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -693,7 +683,6 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -799,10 +788,9 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= vimagination.zapto.org/byteio v0.0.0-20200222190125-d27cba0f0b10 h1:pxt6fVJP67Hxo1qk8JalUghLlk3abYByl+3e0JYfUlE= diff --git a/pkg/base/common/xid.go b/pkg/base/common/xid.go index 4c2ae03f..847de6bc 100644 --- a/pkg/base/common/xid.go +++ b/pkg/base/common/xid.go @@ -36,4 +36,4 @@ func GetTransactionID(xid string) int64 { } tranID, _ := strconv.ParseInt(xid[idx+1:], 10, 64) return tranID -} \ No newline at end of file +} diff --git a/pkg/base/config/config_center_config.go b/pkg/base/config/config_center_config.go index dfd7448f..fab775f1 100644 --- a/pkg/base/config/config_center_config.go +++ b/pkg/base/config/config_center_config.go @@ -1,6 +1,8 @@ package config -import "time" +import ( + "time" +) // ConfigCenterConfig config center config type ConfigCenterConfig struct { diff --git a/pkg/base/config/registry_config.go b/pkg/base/config/registry_config.go index 1d451faf..70392528 100644 --- a/pkg/base/config/registry_config.go +++ b/pkg/base/config/registry_config.go @@ -1,6 +1,8 @@ package config -import "time" +import ( + "time" +) var config *RegistryConfig diff --git a/pkg/base/config_center/base_operate.go b/pkg/base/config_center/base_operate.go index f7e96559..fb03b243 100644 --- a/pkg/base/config_center/base_operate.go +++ b/pkg/base/config_center/base_operate.go @@ -1,6 +1,8 @@ package config_center -import "github.com/transaction-wg/seata-golang/pkg/base/config" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/config" +) // AddListener add config center listener func AddListener(cc DynamicConfigurationFactory, conf *config.ConfigCenterConfig, listener ConfigurationListener) { diff --git a/pkg/base/config_center/config_center_factory.go b/pkg/base/config_center/config_center_factory.go index b286dff3..033a920a 100644 --- a/pkg/base/config_center/config_center_factory.go +++ b/pkg/base/config_center/config_center_factory.go @@ -1,6 +1,8 @@ package config_center -import "github.com/transaction-wg/seata-golang/pkg/base/config" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/config" +) type DynamicConfigurationFactory interface { GetConfig(conf *config.ConfigCenterConfig) string //返回配置信息 diff --git a/pkg/base/config_center/etcdv3/factory.go b/pkg/base/config_center/etcdv3/factory.go index 48d35798..65117122 100644 --- a/pkg/base/config_center/etcdv3/factory.go +++ b/pkg/base/config_center/etcdv3/factory.go @@ -7,6 +7,7 @@ import ( import ( gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3" + clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/pkg/base/config_center/nacos/factory.go b/pkg/base/config_center/nacos/factory.go index fc057719..b5110401 100644 --- a/pkg/base/config_center/nacos/factory.go +++ b/pkg/base/config_center/nacos/factory.go @@ -5,6 +5,7 @@ import ( "strconv" "strings" ) + import ( "github.com/nacos-group/nacos-sdk-go/clients" "github.com/nacos-group/nacos-sdk-go/clients/config_client" diff --git a/pkg/base/constant/key.go b/pkg/base/constant/key.go index ecb2a432..86b7287d 100644 --- a/pkg/base/constant/key.go +++ b/pkg/base/constant/key.go @@ -2,14 +2,14 @@ package constant const ( // NacosDefaultGroup - NacosDefaultGroup = "SEATA_GROUP" + NacosDefaultGroup = "SEATA_GROUP" // NacosDefaultDataID NacosDefaultDataID = "seata" // NacosKey NacosKey = "nacos" // FileKey FileKey = "file" - + Etcdv3Key = "etcdv3" Etcdv3RegistryPrefix = "etcdv3-seata-" // according to seata java version Etcdv3LeaseRenewInterval = 5 // according to seata java version diff --git a/pkg/base/extension/registry.go b/pkg/base/extension/registry.go index fdc1e6f0..19aca018 100644 --- a/pkg/base/extension/registry.go +++ b/pkg/base/extension/registry.go @@ -3,9 +3,11 @@ package extension import ( "sync" ) + import ( "github.com/pkg/errors" ) + import ( "github.com/transaction-wg/seata-golang/pkg/base/registry" ) diff --git a/pkg/base/getty/message_future.go b/pkg/base/getty/message_future.go index c58fa733..c8992da5 100644 --- a/pkg/base/getty/message_future.go +++ b/pkg/base/getty/message_future.go @@ -1,6 +1,8 @@ package getty -import "github.com/transaction-wg/seata-golang/pkg/base/protocal" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/protocal" +) // MessageFuture ... type MessageFuture struct { diff --git a/pkg/base/getty/readwriter/readwriter.go b/pkg/base/getty/readwriter/readwriter.go index cd9b475f..60758be2 100644 --- a/pkg/base/getty/readwriter/readwriter.go +++ b/pkg/base/getty/readwriter/readwriter.go @@ -7,7 +7,9 @@ import ( import ( getty "github.com/apache/dubbo-getty" + "github.com/pkg/errors" + "vimagination.zapto.org/byteio" ) @@ -39,7 +41,6 @@ import ( *

* https://github.com/seata/seata/issues/893 */ - const ( SeataV1PackageHeaderReservedLength = 16 ) @@ -59,17 +60,17 @@ var ( type RpcPackageHandler struct{} type SeataV1PackageHeader struct { - Magic0 byte - Magic1 byte - Version byte - TotalLength uint32 - HeadLength uint16 - MessageType byte - CodecType byte + Magic0 byte + Magic1 byte + Version byte + TotalLength uint32 + HeadLength uint16 + MessageType byte + CodecType byte CompressType byte - ID uint32 - Meta map[string]string - BodyLength uint32 + ID uint32 + Meta map[string]string + BodyLength uint32 } func (h *SeataV1PackageHeader) Unmarshal(buf *bytes.Buffer) (int, error) { @@ -153,7 +154,7 @@ func (p *RpcPackageHandler) Read(ss getty.Session, data []byte) (interface{}, in ID: int32(header.ID), Compressor: header.CompressType, MessageType: header.MessageType, - HeadMap: header.Meta, + HeadMap: header.Meta, } if header.MessageType == protocal.MSGTypeHeartbeatRequest { diff --git a/pkg/base/meta/branch_status.go b/pkg/base/meta/branch_status.go index eaf08d87..dadaf4cd 100644 --- a/pkg/base/meta/branch_status.go +++ b/pkg/base/meta/branch_status.go @@ -1,6 +1,8 @@ package meta -import "fmt" +import ( + "fmt" +) // BranchStatus type BranchStatus byte @@ -9,43 +11,43 @@ const ( // The BranchStatus_Unknown. // description:BranchStatus_Unknown branch status. BranchStatusUnknown BranchStatus = iota - + // The BranchStatus_Registered. // description:BranchStatus_Registered to TC. BranchStatusRegistered - + // The Phase one done. // description:Branch logic is successfully done at phase one. BranchStatusPhaseOneDone - + // The Phase one failed. // description:Branch logic is failed at phase one. BranchStatusPhaseOneFailed - + // The Phase one timeout. // description:Branch logic is NOT reported for a timeout. BranchStatusPhaseOneTimeout - + // The Phase two committed. // description:Commit logic is successfully done at phase two. BranchStatusPhaseTwoCommitted - + // The Phase two commit failed retryable. // description:Commit logic is failed but retryable. BranchStatusPhaseTwoCommitFailedRetryable - + // The Phase two commit failed can not retry. // description:Commit logic is failed and NOT retryable. BranchStatusPhaseTwoCommitFailedCanNotRetry - + // The Phase two rolled back. // description:Rollback logic is successfully done at phase two. BranchStatusPhaseTwoRolledBack - + // The Phase two rollback failed retryable. // description:Rollback logic is failed but retryable. BranchStatusPhaseTwoRollbackFailedRetryable - + // The Phase two rollback failed can not retry. // description:Rollback logic is failed but NOT retryable. BranchStatusPhaseTwoRollbackFailedCanNotRetry diff --git a/pkg/base/meta/branch_type.go b/pkg/base/meta/branch_type.go index a79f9e50..f6bfa0ae 100644 --- a/pkg/base/meta/branch_type.go +++ b/pkg/base/meta/branch_type.go @@ -1,6 +1,8 @@ package meta -import "fmt" +import ( + "fmt" +) // BranchTrype type BranchType byte @@ -31,7 +33,6 @@ func (t BranchType) String() string { } } - // ValueOfBranchType value of branch type func ValueOfBranchType(branchType string) BranchType { switch branchType { diff --git a/pkg/base/meta/global_status.go b/pkg/base/meta/global_status.go index 078c1679..b5bdb4f8 100644 --- a/pkg/base/meta/global_status.go +++ b/pkg/base/meta/global_status.go @@ -1,6 +1,8 @@ package meta -import "fmt" +import ( + "fmt" +) type GlobalStatus int32 diff --git a/pkg/base/meta/transaction_exception_code.go b/pkg/base/meta/transaction_exception_code.go index 0ee5b7d6..af36f758 100644 --- a/pkg/base/meta/transaction_exception_code.go +++ b/pkg/base/meta/transaction_exception_code.go @@ -1,6 +1,8 @@ package meta -import "errors" +import ( + "errors" +) type TransactionExceptionCode byte diff --git a/pkg/base/meta/transaction_role.go b/pkg/base/meta/transaction_role.go index 1ef84d85..d2ba46bc 100644 --- a/pkg/base/meta/transaction_role.go +++ b/pkg/base/meta/transaction_role.go @@ -1,6 +1,8 @@ package meta -import "fmt" +import ( + "fmt" +) // TransactionRole type TransactionRole byte diff --git a/pkg/base/model/resource.go b/pkg/base/model/resource.go index 24914746..39a2d959 100644 --- a/pkg/base/model/resource.go +++ b/pkg/base/model/resource.go @@ -1,6 +1,8 @@ package model -import "github.com/transaction-wg/seata-golang/pkg/base/meta" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/meta" +) type IResource interface { /** diff --git a/pkg/base/model/set.go b/pkg/base/model/set.go index 867abced..af6ec6c7 100644 --- a/pkg/base/model/set.go +++ b/pkg/base/model/set.go @@ -1,6 +1,8 @@ package model -import "sync" +import ( + "sync" +) // Set type Set struct { diff --git a/pkg/base/protocal/message_type.go b/pkg/base/protocal/message_type.go index 052d64ed..9314bc8c 100644 --- a/pkg/base/protocal/message_type.go +++ b/pkg/base/protocal/message_type.go @@ -36,7 +36,7 @@ const ( // The constant TYPE_GLOBAL_LOCK_QUERY_RESULT. TypeGlobalLockQueryResult int16 = 22 - + // The constant TYPE_BRANCH_COMMIT. TypeBranchCommit int16 = 3 diff --git a/pkg/base/registry/etcdv3/registry.go b/pkg/base/registry/etcdv3/registry.go index 0dc2fde8..775ac012 100644 --- a/pkg/base/registry/etcdv3/registry.go +++ b/pkg/base/registry/etcdv3/registry.go @@ -11,7 +11,9 @@ import ( import ( gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3" + perrors "github.com/pkg/errors" + clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/pkg/base/registry/nacos/registry.go b/pkg/base/registry/nacos/registry.go index 359bf077..c2437e1b 100644 --- a/pkg/base/registry/nacos/registry.go +++ b/pkg/base/registry/nacos/registry.go @@ -6,14 +6,17 @@ import ( "strconv" "strings" ) + import ( "github.com/nacos-group/nacos-sdk-go/clients" "github.com/nacos-group/nacos-sdk-go/clients/naming_client" nacosConstant "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/pkg/errors" ) + import ( "github.com/transaction-wg/seata-golang/pkg/base/config" "github.com/transaction-wg/seata-golang/pkg/base/constant" @@ -82,7 +85,7 @@ func (nr *nacosRegistry) Lookup() ([]string, error) { instances, err := nr.namingClient.SelectInstances(vo.SelectInstancesParam{ ServiceName: nr.registryConfig.NacosConfig.Application, GroupName: nr.registryConfig.NacosConfig.Group, // default value is DEFAULT_GROUP - Clusters: []string{clusterName}, // default value is DEFAULT + Clusters: []string{clusterName}, // default value is DEFAULT HealthyOnly: true, }) if err != nil { @@ -102,7 +105,7 @@ func (nr *nacosRegistry) Subscribe(notifyListener registry.EventListener) error err := nr.namingClient.Subscribe(&vo.SubscribeParam{ ServiceName: nr.registryConfig.NacosConfig.Application, GroupName: nr.registryConfig.NacosConfig.Group, // default value is DEFAULT_GROUP - Clusters: []string{clusterName}, // default value is DEFAULT + Clusters: []string{clusterName}, // default value is DEFAULT SubscribeCallback: func(services []model.SubscribeService, err error) { serviceList := make([]*registry.Service, 0, len(services)) for _, s := range services { diff --git a/pkg/client/config/client_config.go b/pkg/client/config/client_config.go index a0df3ced..2851db1a 100644 --- a/pkg/client/config/client_config.go +++ b/pkg/client/config/client_config.go @@ -1,7 +1,6 @@ package config import ( - "github.com/creasty/defaults" "io" "io/ioutil" "os" @@ -9,7 +8,10 @@ import ( ) import ( + "github.com/creasty/defaults" + "github.com/imdario/mergo" + "gopkg.in/yaml.v2" ) diff --git a/pkg/client/config/getty_config.go b/pkg/client/config/getty_config.go index f1bd6ba6..12d8023a 100644 --- a/pkg/client/config/getty_config.go +++ b/pkg/client/config/getty_config.go @@ -1,10 +1,13 @@ package config import ( - config2 "github.com/transaction-wg/seata-golang/pkg/base/config" "time" ) +import ( + config2 "github.com/transaction-wg/seata-golang/pkg/base/config" +) + // GettyConfig //Config holds supported types by the multiconfig package type GettyConfig struct { @@ -19,13 +22,12 @@ type GettyConfig struct { GettySessionParam config2.GettySessionParam `required:"true" yaml:"getty_session_param" json:"getty_session_param,omitempty"` } - // GetDefaultGettyConfig ... func GetDefaultGettyConfig() GettyConfig { return GettyConfig{ ReconnectInterval: 0, ConnectionNum: 1, - HeartbeatPeriod: 10 * time.Second, + HeartbeatPeriod: 10 * time.Second, GettySessionParam: config2.GettySessionParam{ CompressEncoding: false, TCPNoDelay: true, diff --git a/pkg/client/rpc_client.go b/pkg/client/rpc_client.go index 7722102e..93d1bcd3 100644 --- a/pkg/client/rpc_client.go +++ b/pkg/client/rpc_client.go @@ -7,7 +7,9 @@ import ( import ( getty "github.com/apache/dubbo-getty" + gxsync "github.com/dubbogo/gost/sync" + "github.com/nacos-group/nacos-sdk-go/common/logger" ) diff --git a/pkg/client/rpc_client/rpc_remoting_client.go b/pkg/client/rpc_client/rpc_remoting_client.go index e13e233b..32699318 100644 --- a/pkg/client/rpc_client/rpc_remoting_client.go +++ b/pkg/client/rpc_client/rpc_remoting_client.go @@ -9,7 +9,9 @@ import ( import ( getty "github.com/apache/dubbo-getty" + "github.com/pkg/errors" + "go.uber.org/atomic" ) diff --git a/pkg/client/rpc_client/rpc_rm_message.go b/pkg/client/rpc_client/rpc_rm_message.go index 377e9150..6d922a4c 100644 --- a/pkg/client/rpc_client/rpc_rm_message.go +++ b/pkg/client/rpc_client/rpc_rm_message.go @@ -1,6 +1,8 @@ package rpc_client -import "github.com/transaction-wg/seata-golang/pkg/base/protocal" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/protocal" +) type RpcRMMessage struct { RpcMessage protocal.RpcMessage diff --git a/pkg/client/tcc/proxy.go b/pkg/client/tcc/proxy.go index fb125493..a27ef729 100644 --- a/pkg/client/tcc/proxy.go +++ b/pkg/client/tcc/proxy.go @@ -8,6 +8,7 @@ import ( import ( gxnet "github.com/dubbogo/gost/net" + "github.com/pkg/errors" ) @@ -33,11 +34,11 @@ var ( // ActionStartTime ActionStartTime = "action-start-time" // ActionName - ActionName = "actionName" + ActionName = "actionName" // PrepareMethod - PrepareMethod = "sys::prepare" + PrepareMethod = "sys::prepare" // CommitMethod - CommitMethod = "sys::commit" + CommitMethod = "sys::commit" // RollbackMethod RollbackMethod = "sys::rollback" // HostName diff --git a/pkg/client/tm/transaction_info.go b/pkg/client/tm/transaction_info.go index 79402722..35992b60 100644 --- a/pkg/client/tm/transaction_info.go +++ b/pkg/client/tm/transaction_info.go @@ -1,6 +1,8 @@ package tm -import "fmt" +import ( + "fmt" +) type Propagation byte diff --git a/pkg/client/tm/transaction_manager.go b/pkg/client/tm/transaction_manager.go index 38fccaf5..5fe255e1 100644 --- a/pkg/client/tm/transaction_manager.go +++ b/pkg/client/tm/transaction_manager.go @@ -1,6 +1,8 @@ package tm -import "github.com/transaction-wg/seata-golang/pkg/base/meta" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/meta" +) type TransactionManager interface { // GlobalStatus_Begin a new global transaction. diff --git a/pkg/tc/config/server_config.go b/pkg/tc/config/server_config.go index 97f1d83c..2b53364c 100644 --- a/pkg/tc/config/server_config.go +++ b/pkg/tc/config/server_config.go @@ -2,8 +2,6 @@ package config import ( "fmt" - "github.com/creasty/defaults" - "github.com/go-xorm/xorm" "io" "io/ioutil" "os" @@ -12,8 +10,15 @@ import ( import ( getty "github.com/apache/dubbo-getty" + + "github.com/creasty/defaults" + + "github.com/go-xorm/xorm" + "github.com/imdario/mergo" + "github.com/pkg/errors" + "gopkg.in/yaml.v2" ) diff --git a/pkg/tc/config/store_config.go b/pkg/tc/config/store_config.go index 7cf3b16e..edfe0d13 100644 --- a/pkg/tc/config/store_config.go +++ b/pkg/tc/config/store_config.go @@ -2,6 +2,7 @@ package config import ( _ "github.com/go-sql-driver/mysql" + "github.com/go-xorm/xorm" ) diff --git a/pkg/tc/event/global_transaction_event.go b/pkg/tc/event/global_transaction_event.go index a6cc8272..d8f40b48 100644 --- a/pkg/tc/event/global_transaction_event.go +++ b/pkg/tc/event/global_transaction_event.go @@ -1,6 +1,8 @@ package event -import "github.com/transaction-wg/seata-golang/pkg/base/meta" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/meta" +) const ( RoleTC = "tc" diff --git a/pkg/tc/holder/default_session_manager_test.go b/pkg/tc/holder/default_session_manager_test.go index 32179793..de6c171b 100644 --- a/pkg/tc/holder/default_session_manager_test.go +++ b/pkg/tc/holder/default_session_manager_test.go @@ -2,8 +2,13 @@ package holder import ( "testing" +) +import ( "github.com/stretchr/testify/assert" +) + +import ( "github.com/transaction-wg/seata-golang/pkg/base/common" "github.com/transaction-wg/seata-golang/pkg/base/meta" "github.com/transaction-wg/seata-golang/pkg/tc/session" diff --git a/pkg/tc/holder/file_based_session_manager_test.go b/pkg/tc/holder/file_based_session_manager_test.go index fc4e766f..a37956e5 100644 --- a/pkg/tc/holder/file_based_session_manager_test.go +++ b/pkg/tc/holder/file_based_session_manager_test.go @@ -2,8 +2,13 @@ package holder import ( "testing" +) +import ( "github.com/stretchr/testify/assert" +) + +import ( "github.com/transaction-wg/seata-golang/pkg/base/meta" "github.com/transaction-wg/seata-golang/pkg/tc/config" "github.com/transaction-wg/seata-golang/pkg/tc/model" diff --git a/pkg/tc/holder/file_transaction_store_manager.go b/pkg/tc/holder/file_transaction_store_manager.go index 7c13303b..96e931d7 100644 --- a/pkg/tc/holder/file_transaction_store_manager.go +++ b/pkg/tc/holder/file_transaction_store_manager.go @@ -113,7 +113,6 @@ func (storeManager *FileTransactionStoreManager) Shutdown() { storeManager.currFileChannel.Close() } - func (storeManager *FileTransactionStoreManager) saveHistory() { storeManager.findTimeoutAndSave() os.Rename(storeManager.currFullFileName, storeManager.hisFullFileName) diff --git a/pkg/tc/holder/log_store_database_dao.go b/pkg/tc/holder/log_store_database_dao.go index 8dbfc53e..c3f48261 100644 --- a/pkg/tc/holder/log_store_database_dao.go +++ b/pkg/tc/holder/log_store_database_dao.go @@ -2,6 +2,7 @@ package holder import ( "github.com/go-xorm/xorm" + "xorm.io/builder" ) diff --git a/pkg/tc/lock/lock_store_database_dao.go b/pkg/tc/lock/lock_store_database_dao.go index d905d03c..4f30c4bf 100644 --- a/pkg/tc/lock/lock_store_database_dao.go +++ b/pkg/tc/lock/lock_store_database_dao.go @@ -2,6 +2,7 @@ package lock import ( "github.com/go-xorm/xorm" + "xorm.io/builder" ) diff --git a/pkg/tc/model/branch_transaction_do.go b/pkg/tc/model/branch_transaction_do.go index 2a218282..8afc98fb 100644 --- a/pkg/tc/model/branch_transaction_do.go +++ b/pkg/tc/model/branch_transaction_do.go @@ -1,6 +1,8 @@ package model -import "time" +import ( + "time" +) // BranchTransactionDO for persist BranchTransaction. type BranchTransactionDO struct { diff --git a/pkg/tc/model/global_transaction_do.go b/pkg/tc/model/global_transaction_do.go index f46d3cf4..ea190d9d 100644 --- a/pkg/tc/model/global_transaction_do.go +++ b/pkg/tc/model/global_transaction_do.go @@ -1,6 +1,8 @@ package model -import "time" +import ( + "time" +) // GlobalTransactionDO for persist GlobalTransaction. type GlobalTransactionDO struct { diff --git a/pkg/tc/model/lock_do.go b/pkg/tc/model/lock_do.go index a38915d6..7e920771 100644 --- a/pkg/tc/model/lock_do.go +++ b/pkg/tc/model/lock_do.go @@ -1,6 +1,8 @@ package model -import "time" +import ( + "time" +) // LockDO for persist Lock. type LockDO struct { diff --git a/pkg/tc/model/session_condition.go b/pkg/tc/model/session_condition.go index bb45578d..909631c8 100644 --- a/pkg/tc/model/session_condition.go +++ b/pkg/tc/model/session_condition.go @@ -1,6 +1,8 @@ package model -import "github.com/transaction-wg/seata-golang/pkg/base/meta" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/meta" +) // SessionCondition for query GlobalSession type SessionCondition struct { diff --git a/pkg/tc/server/default_coordinator.go b/pkg/tc/server/default_coordinator.go index f92e51fc..75e12c1c 100644 --- a/pkg/tc/server/default_coordinator.go +++ b/pkg/tc/server/default_coordinator.go @@ -7,7 +7,9 @@ import ( import ( getty "github.com/apache/dubbo-getty" + "github.com/pkg/errors" + "go.uber.org/atomic" ) @@ -32,17 +34,17 @@ const ( ) type DefaultCoordinator struct { - conf *config.ServerConfig - core TransactionCoordinator - idGenerator *atomic.Uint32 - futures *sync.Map + conf *config.ServerConfig + core TransactionCoordinator + idGenerator *atomic.Uint32 + futures *sync.Map } func NewDefaultCoordinator(conf *config.ServerConfig) *DefaultCoordinator { coordinator := &DefaultCoordinator{ - conf: conf, - idGenerator: &atomic.Uint32{}, - futures: &sync.Map{}, + conf: conf, + idGenerator: &atomic.Uint32{}, + futures: &sync.Map{}, } core := NewCore(coordinator) coordinator.core = core diff --git a/pkg/tc/server/default_coordinator_server_message_sender.go b/pkg/tc/server/default_coordinator_server_message_sender.go index ddff4865..e619b94a 100644 --- a/pkg/tc/server/default_coordinator_server_message_sender.go +++ b/pkg/tc/server/default_coordinator_server_message_sender.go @@ -6,6 +6,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" + "github.com/pkg/errors" ) diff --git a/pkg/tc/server/default_core.go b/pkg/tc/server/default_core.go index 9cf9df07..c1eacde8 100644 --- a/pkg/tc/server/default_core.go +++ b/pkg/tc/server/default_core.go @@ -54,7 +54,6 @@ import ( * DefaultCore 内嵌入 ATCore。 * */ - type AbstractCore struct { MessageSender ServerMessageSender } diff --git a/pkg/tc/server/getty_session_manager.go b/pkg/tc/server/getty_session_manager.go index 12d20972..9ec8a6ed 100644 --- a/pkg/tc/server/getty_session_manager.go +++ b/pkg/tc/server/getty_session_manager.go @@ -4,9 +4,15 @@ import ( "strconv" "strings" "sync" +) +import ( getty "github.com/apache/dubbo-getty" + "github.com/pkg/errors" +) + +import ( "github.com/transaction-wg/seata-golang/pkg/base/meta" "github.com/transaction-wg/seata-golang/pkg/base/model" "github.com/transaction-wg/seata-golang/pkg/base/protocal" diff --git a/pkg/tc/server/server.go b/pkg/tc/server/server.go index 4db0d14d..1b121e69 100644 --- a/pkg/tc/server/server.go +++ b/pkg/tc/server/server.go @@ -12,6 +12,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" + gxnet "github.com/dubbogo/gost/net" "github.com/dubbogo/gost/sync" ) diff --git a/pkg/tc/server/tc_inbound_handler.go b/pkg/tc/server/tc_inbound_handler.go index a9ffab32..325e7d7e 100644 --- a/pkg/tc/server/tc_inbound_handler.go +++ b/pkg/tc/server/tc_inbound_handler.go @@ -1,6 +1,8 @@ package server -import "github.com/transaction-wg/seata-golang/pkg/base/protocal" +import ( + "github.com/transaction-wg/seata-golang/pkg/base/protocal" +) type TCInboundHandler interface { doGlobalBegin(request protocal.GlobalBeginRequest, ctx RpcContext) protocal.GlobalBeginResponse diff --git a/pkg/tc/session/branch_session.go b/pkg/tc/session/branch_session.go index 0dee730c..eed7769b 100644 --- a/pkg/tc/session/branch_session.go +++ b/pkg/tc/session/branch_session.go @@ -6,6 +6,7 @@ import ( import ( "github.com/pkg/errors" + "vimagination.zapto.org/byteio" ) diff --git a/pkg/tc/session/global_session.go b/pkg/tc/session/global_session.go index d73166a8..24fe9f56 100644 --- a/pkg/tc/session/global_session.go +++ b/pkg/tc/session/global_session.go @@ -4,15 +4,21 @@ import ( "bytes" "sort" "sync" +) +import ( "github.com/pkg/errors" + + "vimagination.zapto.org/byteio" +) + +import ( "github.com/transaction-wg/seata-golang/pkg/base/common" "github.com/transaction-wg/seata-golang/pkg/base/meta" "github.com/transaction-wg/seata-golang/pkg/tc/config" "github.com/transaction-wg/seata-golang/pkg/util/log" "github.com/transaction-wg/seata-golang/pkg/util/time" "github.com/transaction-wg/seata-golang/pkg/util/uuid" - "vimagination.zapto.org/byteio" ) type GlobalSession struct { diff --git a/pkg/tc/session/global_session_test.go b/pkg/tc/session/global_session_test.go index 2e3c1dc0..521d353e 100644 --- a/pkg/tc/session/global_session_test.go +++ b/pkg/tc/session/global_session_test.go @@ -2,7 +2,9 @@ package session import ( "testing" +) +import ( "github.com/stretchr/testify/assert" ) diff --git a/pkg/util/log/logging.go b/pkg/util/log/logging.go index 87dafd34..56583c67 100644 --- a/pkg/util/log/logging.go +++ b/pkg/util/log/logging.go @@ -4,8 +4,11 @@ import ( "bytes" "errors" "fmt" +) +import ( "github.com/natefinch/lumberjack" + "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -195,4 +198,4 @@ func Fatal(v ...interface{}) { // Fatalf ... func Fatalf(format string, v ...interface{}) { log.Fatalf(format, v...) -} \ No newline at end of file +} diff --git a/pkg/util/mysql/mysql_keyword_checker.go b/pkg/util/mysql/mysql_keyword_checker.go index 429ef8d6..1e3f2373 100644 --- a/pkg/util/mysql/mysql_keyword_checker.go +++ b/pkg/util/mysql/mysql_keyword_checker.go @@ -1,6 +1,8 @@ package mysql -import "strings" +import ( + "strings" +) var MySQLKeyword = map[string]string{ "ACCESSIBLE": "ACCESSIBLE", diff --git a/pkg/util/parser/parser.go b/pkg/util/parser/parser.go index ab19e26f..4e67779e 100644 --- a/pkg/util/parser/parser.go +++ b/pkg/util/parser/parser.go @@ -6,9 +6,13 @@ import ( "reflect" "sort" "strings" +) +import ( "gopkg.in/yaml.v2" +) +import ( "github.com/transaction-wg/seata-golang/pkg/util/log" ) @@ -206,4 +210,4 @@ func (p *Parser) overwriteMap(m reflect.Value, fullpath string, path []string, p m.SetMapIndex(reflect.ValueOf(strings.ToLower(path[0])), reflect.Indirect(mapValue)) return nil -} \ No newline at end of file +} diff --git a/pkg/util/sql/sql_type.go b/pkg/util/sql/sql_type.go index 1bfa2dee..a5ba86d1 100644 --- a/pkg/util/sql/sql_type.go +++ b/pkg/util/sql/sql_type.go @@ -1,9 +1,10 @@ package sql -import "strings" +import ( + "strings" +) // refer to [Types](java.sql.Types) - type SqlType int32 const ( diff --git a/pkg/util/uuid/id_worker.go b/pkg/util/uuid/id_worker.go index 3ce484a4..8ecce338 100644 --- a/pkg/util/uuid/id_worker.go +++ b/pkg/util/uuid/id_worker.go @@ -5,7 +5,9 @@ import ( "math/rand" "net" "sync/atomic" +) +import ( time2 "github.com/transaction-wg/seata-golang/pkg/util/time" ) @@ -107,4 +109,4 @@ func generateWorkerIDBaseOnMac() (int64, error) { // randomly generate one as workerID func generateRandomWorkerID() int64 { return rand.Int63n(maxWorkerID + 1) -} \ No newline at end of file +}