You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/02/18 14:00:52 UTC
[dubbo-go-samples] branch master updated: upgrade seata-golang
version
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 497cc48 upgrade seata-golang version
new 6be9874 Merge pull request #48 from dk-lockdown/master
497cc48 is described below
commit 497cc4847c1a4605d684b4a60949edb4e5961357
Author: liuxiaomin <du...@qq.com>
AuthorDate: Tue Feb 16 22:03:48 2021 +0800
upgrade seata-golang version
---
go.mod | 2 +-
go.sum | 5 +++++
seata/client/app/client.go | 6 +++---
seata/client/app/svc/svc.go | 4 ++--
seata/client/profiles/dev/seata.yml | 11 ++---------
seata/client/profiles/release/seata.yml | 9 ++-------
seata/order-svc/app/dao/dao.go | 4 ++--
seata/order-svc/app/order_svc.go | 2 +-
seata/order-svc/app/server.go | 6 +++---
seata/order-svc/profiles/dev/seata.yml | 10 +---------
seata/order-svc/profiles/release/seata.yml | 11 ++---------
seata/product-svc/app/dao/dao.go | 4 ++--
seata/product-svc/app/product_svc.go | 2 +-
seata/product-svc/app/server.go | 6 +++---
seata/product-svc/profiles/dev/seata.yml | 11 ++---------
seata/product-svc/profiles/release/seata.yml | 11 ++---------
16 files changed, 34 insertions(+), 70 deletions(-)
diff --git a/go.mod b/go.mod
index 2b27f55..3f80a25 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ require (
github.com/apache/dubbo-go v1.5.6-0.20210204121013-9c3bd0e9c92d
github.com/apache/dubbo-go-hessian2 v1.8.2
github.com/bwmarrin/snowflake v0.3.0
- github.com/dk-lockdown/seata-golang v0.1.0-fix
+ github.com/transaction-wg/seata-golang v0.1.8
github.com/dubbogo/gost v1.11.0
github.com/emicklei/go-restful/v3 v3.4.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
diff --git a/go.sum b/go.sum
index 7f55e86..4308404 100644
--- a/go.sum
+++ b/go.sum
@@ -109,6 +109,7 @@ github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5/go.mod h1
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apache/dubbo-getty v1.3.10 h1:ys5mwjPdxG/KwkPjS6EI0RzQtU6p6FCPoKpaFEzpAL0=
github.com/apache/dubbo-getty v1.3.10/go.mod h1:x6rraK01BL5C7jUM2fPl5KMkAxLVIx54ZB8/XEOik9Y=
+github.com/apache/dubbo-getty v1.4.2/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek=
github.com/apache/dubbo-getty v1.4.3 h1:PCKpryDasKOxwT5MBC6MIMO+0NLOaHF6Xco9YXQw7HI=
github.com/apache/dubbo-getty v1.4.3/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek=
github.com/apache/dubbo-go v1.5.5 h1:bQX+eGANPFl/ldfvctQJdw5HKfTGBpiWx1gaXrrYwMA=
@@ -435,6 +436,7 @@ github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod h1:DavVbd41
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -836,6 +838,7 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=
@@ -933,6 +936,7 @@ github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod h1:BeybITEsBEg6
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shima-park/agollo v1.2.6/go.mod h1:pbHN4SgHDd84eTKyhCvG2LjQ+6mcZq/fEkElxL+oRYk=
github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shirou/gopsutil v2.19.12+incompatible h1:WRstheAymn1WOPesh+24+bZKFkqrdCR8JOc77v4xV3Q=
github.com/shirou/gopsutil v2.19.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
@@ -1015,6 +1019,7 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc h1:yUaosF
github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/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/transaction-wg/seata-golang v0.1.8/go.mod h1:12WVzArJcGyhOoSpBhCrurISYR+khSlFvtOIQVvHFr8=
github.com/transip/gotransip v0.0.0-20190812104329-6d8d9179b66f/go.mod h1:i0f4R4o2HM0m3DZYQWsj6/MEowD57VzoH0v3d7igeFY=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926 h1:G3dpKMzFDjgEh2q1Z7zUUtKa8ViPtH+ocF0bE0g00O8=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
diff --git a/seata/client/app/client.go b/seata/client/app/client.go
index 9576ce3..451fdbf 100644
--- a/seata/client/app/client.go
+++ b/seata/client/app/client.go
@@ -36,9 +36,9 @@ import (
"github.com/apache/dubbo-go/config"
_ "github.com/apache/dubbo-go/protocol/dubbo"
_ "github.com/apache/dubbo-go/registry/protocol"
- "github.com/dk-lockdown/seata-golang/client"
- config2 "github.com/dk-lockdown/seata-golang/client/config"
- "github.com/dk-lockdown/seata-golang/client/tm"
+ "github.com/transaction-wg/seata-golang/pkg/client"
+ config2 "github.com/transaction-wg/seata-golang/pkg/client/config"
+ "github.com/transaction-wg/seata-golang/pkg/client/tm"
_ "github.com/apache/dubbo-go/filter/filter_impl"
diff --git a/seata/client/app/svc/svc.go b/seata/client/app/svc/svc.go
index 3a33011..86cb849 100644
--- a/seata/client/app/svc/svc.go
+++ b/seata/client/app/svc/svc.go
@@ -31,8 +31,8 @@ import (
)
import (
- context2 "github.com/dk-lockdown/seata-golang/client/context"
- "github.com/dk-lockdown/seata-golang/client/tm"
+ context2 "github.com/transaction-wg/seata-golang/pkg/client/context"
+ "github.com/transaction-wg/seata-golang/pkg/client/tm"
)
type OrderSvc struct {
diff --git a/seata/client/profiles/dev/seata.yml b/seata/client/profiles/dev/seata.yml
index 86538fd..38dad5f 100644
--- a/seata/client/profiles/dev/seata.yml
+++ b/seata/client/profiles/dev/seata.yml
@@ -1,17 +1,12 @@
application_id: "aggregation-svc"
transaction_service_group: "127.0.0.1:8091"
-seata_version: "1.1.0"
+enable-client-batch-send-request: true
+seata_version: "1.2.0"
# tcp
getty:
reconnect_interval: 0
connection_number: 1
heartbeat_period: "10s"
- session_timeout: "180s"
- pool_size: 4
- pool_ttl: 600
- gr_pool_size: 200
- queue_len: 64
- queue_number: 10
getty_session_param:
compress_encoding : false
tcp_no_delay : true
@@ -19,8 +14,6 @@ getty:
keep_alive_period : "180s"
tcp_r_buf_size : 262144
tcp_w_buf_size : 65536
- pkg_rq_size : 512
- pkg_wq_size : 256
tcp_read_timeout : "1s"
tcp_write_timeout : "5s"
wait_timeout : "1s"
diff --git a/seata/client/profiles/release/seata.yml b/seata/client/profiles/release/seata.yml
index 86538fd..5a7ce4d 100644
--- a/seata/client/profiles/release/seata.yml
+++ b/seata/client/profiles/release/seata.yml
@@ -1,17 +1,12 @@
application_id: "aggregation-svc"
transaction_service_group: "127.0.0.1:8091"
-seata_version: "1.1.0"
+enable-client-batch-send-request: true
+seata_version: "1.2.0"
# tcp
getty:
reconnect_interval: 0
connection_number: 1
heartbeat_period: "10s"
- session_timeout: "180s"
- pool_size: 4
- pool_ttl: 600
- gr_pool_size: 200
- queue_len: 64
- queue_number: 10
getty_session_param:
compress_encoding : false
tcp_no_delay : true
diff --git a/seata/order-svc/app/dao/dao.go b/seata/order-svc/app/dao/dao.go
index e044b5a..a216fae 100644
--- a/seata/order-svc/app/dao/dao.go
+++ b/seata/order-svc/app/dao/dao.go
@@ -27,8 +27,8 @@ import (
)
import (
- "github.com/dk-lockdown/seata-golang/client/at/exec"
- "github.com/dk-lockdown/seata-golang/client/context"
+ "github.com/transaction-wg/seata-golang/pkg/client/at/exec"
+ "github.com/transaction-wg/seata-golang/pkg/client/context"
)
const (
diff --git a/seata/order-svc/app/order_svc.go b/seata/order-svc/app/order_svc.go
index fc11540..e76af65 100644
--- a/seata/order-svc/app/order_svc.go
+++ b/seata/order-svc/app/order_svc.go
@@ -27,7 +27,7 @@ import (
)
import (
- context2 "github.com/dk-lockdown/seata-golang/client/context"
+ context2 "github.com/transaction-wg/seata-golang/pkg/client/context"
)
type OrderSvc struct {
diff --git a/seata/order-svc/app/server.go b/seata/order-svc/app/server.go
index 34163bf..c45c1a1 100644
--- a/seata/order-svc/app/server.go
+++ b/seata/order-svc/app/server.go
@@ -35,9 +35,9 @@ import (
"github.com/apache/dubbo-go/config"
_ "github.com/apache/dubbo-go/protocol/dubbo"
_ "github.com/apache/dubbo-go/registry/protocol"
- "github.com/dk-lockdown/seata-golang/client"
- "github.com/dk-lockdown/seata-golang/client/at/exec"
- config2 "github.com/dk-lockdown/seata-golang/client/config"
+ "github.com/transaction-wg/seata-golang/pkg/client"
+ "github.com/transaction-wg/seata-golang/pkg/client/at/exec"
+ config2 "github.com/transaction-wg/seata-golang/pkg/client/config"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
_ "github.com/apache/dubbo-go/filter/filter_impl"
diff --git a/seata/order-svc/profiles/dev/seata.yml b/seata/order-svc/profiles/dev/seata.yml
index 2df8534..9209c9a 100644
--- a/seata/order-svc/profiles/dev/seata.yml
+++ b/seata/order-svc/profiles/dev/seata.yml
@@ -1,17 +1,11 @@
application_id: "order-svc"
transaction_service_group: "127.0.0.1:8091"
-seata_version: "1.1.0"
+seata_version: "1.2.0"
# tcp
getty:
reconnect_interval: 0
connection_number: 1
heartbeat_period: "10s"
- session_timeout: "180s"
- pool_size: 4
- pool_ttl: 600
- gr_pool_size: 200
- queue_len: 64
- queue_number: 10
getty_session_param:
compress_encoding : false
tcp_no_delay : true
@@ -19,8 +13,6 @@ getty:
keep_alive_period : "180s"
tcp_r_buf_size : 262144
tcp_w_buf_size : 65536
- pkg_rq_size : 512
- pkg_wq_size : 256
tcp_read_timeout : "1s"
tcp_write_timeout : "5s"
wait_timeout : "1s"
diff --git a/seata/order-svc/profiles/release/seata.yml b/seata/order-svc/profiles/release/seata.yml
index 2df8534..d602fbd 100644
--- a/seata/order-svc/profiles/release/seata.yml
+++ b/seata/order-svc/profiles/release/seata.yml
@@ -1,17 +1,12 @@
application_id: "order-svc"
transaction_service_group: "127.0.0.1:8091"
-seata_version: "1.1.0"
+enable-client-batch-send-request: true
+seata_version: "1.2.0"
# tcp
getty:
reconnect_interval: 0
connection_number: 1
heartbeat_period: "10s"
- session_timeout: "180s"
- pool_size: 4
- pool_ttl: 600
- gr_pool_size: 200
- queue_len: 64
- queue_number: 10
getty_session_param:
compress_encoding : false
tcp_no_delay : true
@@ -19,8 +14,6 @@ getty:
keep_alive_period : "180s"
tcp_r_buf_size : 262144
tcp_w_buf_size : 65536
- pkg_rq_size : 512
- pkg_wq_size : 256
tcp_read_timeout : "1s"
tcp_write_timeout : "5s"
wait_timeout : "1s"
diff --git a/seata/product-svc/app/dao/dao.go b/seata/product-svc/app/dao/dao.go
index ecfff34..5e5fe4f 100644
--- a/seata/product-svc/app/dao/dao.go
+++ b/seata/product-svc/app/dao/dao.go
@@ -19,8 +19,8 @@ package dao
import (
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/dk-lockdown/seata-golang/client/at/exec"
- "github.com/dk-lockdown/seata-golang/client/context"
+ "github.com/transaction-wg/seata-golang/pkg/client/at/exec"
+ "github.com/transaction-wg/seata-golang/pkg/client/context"
)
const (
diff --git a/seata/product-svc/app/product_svc.go b/seata/product-svc/app/product_svc.go
index cd23c2f..07f93ee 100644
--- a/seata/product-svc/app/product_svc.go
+++ b/seata/product-svc/app/product_svc.go
@@ -27,7 +27,7 @@ import (
)
import (
- context2 "github.com/dk-lockdown/seata-golang/client/context"
+ context2 "github.com/transaction-wg/seata-golang/pkg/client/context"
)
type ProductSvc struct {
diff --git a/seata/product-svc/app/server.go b/seata/product-svc/app/server.go
index 0f054a9..f39b1ac 100644
--- a/seata/product-svc/app/server.go
+++ b/seata/product-svc/app/server.go
@@ -35,9 +35,9 @@ import (
"github.com/apache/dubbo-go/config"
_ "github.com/apache/dubbo-go/protocol/dubbo"
_ "github.com/apache/dubbo-go/registry/protocol"
- "github.com/dk-lockdown/seata-golang/client"
- "github.com/dk-lockdown/seata-golang/client/at/exec"
- config2 "github.com/dk-lockdown/seata-golang/client/config"
+ "github.com/transaction-wg/seata-golang/pkg/client"
+ "github.com/transaction-wg/seata-golang/pkg/client/at/exec"
+ config2 "github.com/transaction-wg/seata-golang/pkg/client/config"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
_ "github.com/apache/dubbo-go/filter/filter_impl"
diff --git a/seata/product-svc/profiles/dev/seata.yml b/seata/product-svc/profiles/dev/seata.yml
index b555d9c..cc5beeb 100644
--- a/seata/product-svc/profiles/dev/seata.yml
+++ b/seata/product-svc/profiles/dev/seata.yml
@@ -1,17 +1,12 @@
application_id: "product-svc"
transaction_service_group: "127.0.0.1:8091"
-seata_version: "1.1.0"
+enable-client-batch-send-request: true
+seata_version: "1.2.0"
# tcp
getty:
reconnect_interval: 0
connection_number: 1
heartbeat_period: "10s"
- session_timeout: "180s"
- pool_size: 4
- pool_ttl: 600
- gr_pool_size: 200
- queue_len: 64
- queue_number: 10
getty_session_param:
compress_encoding : false
tcp_no_delay : true
@@ -19,8 +14,6 @@ getty:
keep_alive_period : "180s"
tcp_r_buf_size : 262144
tcp_w_buf_size : 65536
- pkg_rq_size : 512
- pkg_wq_size : 256
tcp_read_timeout : "1s"
tcp_write_timeout : "5s"
wait_timeout : "1s"
diff --git a/seata/product-svc/profiles/release/seata.yml b/seata/product-svc/profiles/release/seata.yml
index b555d9c..cc5beeb 100644
--- a/seata/product-svc/profiles/release/seata.yml
+++ b/seata/product-svc/profiles/release/seata.yml
@@ -1,17 +1,12 @@
application_id: "product-svc"
transaction_service_group: "127.0.0.1:8091"
-seata_version: "1.1.0"
+enable-client-batch-send-request: true
+seata_version: "1.2.0"
# tcp
getty:
reconnect_interval: 0
connection_number: 1
heartbeat_period: "10s"
- session_timeout: "180s"
- pool_size: 4
- pool_ttl: 600
- gr_pool_size: 200
- queue_len: 64
- queue_number: 10
getty_session_param:
compress_encoding : false
tcp_no_delay : true
@@ -19,8 +14,6 @@ getty:
keep_alive_period : "180s"
tcp_r_buf_size : 262144
tcp_w_buf_size : 65536
- pkg_rq_size : 512
- pkg_wq_size : 256
tcp_read_timeout : "1s"
tcp_write_timeout : "5s"
wait_timeout : "1s"