From 451b43511f5cfa3fd37c6c0f21cb05a4adf09cce Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Mon, 6 Jun 2022 20:18:12 +0800 Subject: [PATCH 1/3] add table kv --- sqls/dtmsvr.storage.mysql.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sqls/dtmsvr.storage.mysql.sql b/sqls/dtmsvr.storage.mysql.sql index 283bb75..019f877 100644 --- a/sqls/dtmsvr.storage.mysql.sql +++ b/sqls/dtmsvr.storage.mysql.sql @@ -41,3 +41,15 @@ CREATE TABLE IF NOT EXISTS dtm.trans_branch_op ( PRIMARY KEY (`id`), UNIQUE KEY `gid_uniq` (`gid`, `branch_id`, `op`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; +drop table IF EXISTS dtm.kv; +CREATE TABLE IF NOT EXISTS dtm.kv ( + `id` bigint(22) NOT NULL AUTO_INCREMENT, + `cat` varchar(45) NOT NULL COMMENT 'the category of this data', + `k` varchar(128) NOT NULL, + `v` TEXT, + `version` bigint(22) default 1 COMMENT 'version of the value', + create_time datetime default NULL, + update_time datetime DEFAULT NULL, + PRIMARY KEY (`id`) + UNIQUE key `uniq_k`(`cat`, `k`) +) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; From a18972e0b3289307c32218d7a61794c639d1d944 Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Mon, 6 Jun 2022 20:43:15 +0800 Subject: [PATCH 2/3] fix sql syntax --- sqls/dtmsvr.storage.mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqls/dtmsvr.storage.mysql.sql b/sqls/dtmsvr.storage.mysql.sql index 019f877..dd2a097 100644 --- a/sqls/dtmsvr.storage.mysql.sql +++ b/sqls/dtmsvr.storage.mysql.sql @@ -50,6 +50,6 @@ CREATE TABLE IF NOT EXISTS dtm.kv ( `version` bigint(22) default 1 COMMENT 'version of the value', create_time datetime default NULL, update_time datetime DEFAULT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), UNIQUE key `uniq_k`(`cat`, `k`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; From 779e17fab9b893ecd3a7a999565f91e4157f9c39 Mon Sep 17 00:00:00 2001 From: phprao Date: Mon, 13 Jun 2022 10:57:10 +0800 Subject: [PATCH 3/3] fix api logic of '/TransOutXa' --- test/busi/base_http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/busi/base_http.go b/test/busi/base_http.go index 11bc525..c2bf076 100644 --- a/test/busi/base_http.go +++ b/test/busi/base_http.go @@ -141,7 +141,7 @@ func BaseAddRoute(app *gin.Engine) { })) app.POST(BusiAPI+"/TransOutXa", dtmutil.WrapHandler(func(c *gin.Context) interface{} { return dtmcli.XaLocalTransaction(c.Request.URL.Query(), BusiConf, func(db *sql.DB, xa *dtmcli.Xa) error { - return SagaAdjustBalance(db, TransOutUID, reqFrom(c).Amount, reqFrom(c).TransOutResult) + return SagaAdjustBalance(db, TransOutUID, -reqFrom(c).Amount, reqFrom(c).TransOutResult) }) })) app.POST(BusiAPI+"/TransOutTimeout", dtmutil.WrapHandler(func(c *gin.Context) interface{} {