Merge remote-tracking branch 'upstream/develop' into feature/saga_con…

…current_task
apache · Feb 9, 2022 · 1616cea · 1616cea
2 parents 32eb2ac + b62f03e
commit 1616cea
Show file tree

Hide file tree

Showing 62 changed files with 871 additions and 152 deletions.
diff --git a/changes/1.5.0.md b/changes/1.5.0.md
@@ -40,11 +40,11 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
   - [[#3968](https://github.com/seata/seata/pull/3968)] 支持 brpc-java RPC框架
   - [[#4134](https://github.com/seata/seata/pull/4134)] 初始化控制台基础代码
   - [[#4268](https://github.com/seata/seata/pull/4268)] 控制台Global Session页面File模式实现
+  - [[#4293](https://github.com/seata/seata/pull/4293)] 控制台Global Lock页面File模式实现
   - [[#4335](https://github.com/seata/seata/pull/4335)] 实现配置中心上传配置交互脚本(nacos,etcd3)
   - [[#4349](https://github.com/seata/seata/pull/4349)] saga 支持并发运行多事务节点
 
 
-
 ### bugfix：
   - [[#3497](https://github.com/seata/seata/pull/3497)] 修复TCC模式并发量较大时线程池导致的超时问题
   - [[#3686](https://github.com/seata/seata/pull/3686)] 修复Apollo集群配置项错误及NPE错误
@@ -92,6 +92,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
   - [[#4302](https://github.com/seata/seata/pull/4302)] 修复其他ORM可能存在获取不到自增主键值的问题
   - [[#4308](https://github.com/seata/seata/pull/4308)] 修复Postgresql多个schema下存在相同表的TableMetaCache解析问题
   - [[#4326](https://github.com/seata/seata/pull/4326)] 修复使用 mariadb 驱动程序时无法构建 Executor 的问题
+  - [[#4355](https://github.com/seata/seata/pull/4355)] 修复使用 mysql Loadbalance模式resourceId被误判为resourceIds的问题
   - [[#4310](https://github.com/seata/seata/pull/4310)] 修复通过"SELECT LAST_INSERT_ID"获取mysql数据库自增id失败的问题
   - [[#4331](https://github.com/seata/seata/pull/4331)] 修复使用ONLY_CARE_UPDATE_COLUMNS配置可能出现的脏写校验异常
 
@@ -174,7 +175,9 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
   - [[#4299](https://github.com/seata/seata/pull/4296)] 优化异常提示
   - [[#4300](https://github.com/seata/seata/pull/4300)] 优化NettyRemotingServer的close()由DefaultCoordinator来调用，不再额外注册到ServerRunner
   - [[#4270](https://github.com/seata/seata/pull/4270)] 提高全局提交和全局回滚的性能，分支事务清理异步化
+  - [[#4303](https://github.com/seata/seata/pull/4303)] `tcc_fence_log`表悬挂日志记录异步删除
   - [[#4328](https://github.com/seata/seata/pull/4328)] 配置上传脚本支持注释
+  - [[#4336](https://github.com/seata/seata/pull/4336)] 添加AT模式不支持的SQL语句异常提示
 
 
 
@@ -225,6 +228,7 @@ Seata 是一款开源的分布式事务解决方案，提供高性能和简单
   - [anselleeyy](https://github.com/anselleeyy)
   - [GoodBoyCoder](https://github.com/GoodBoyCoder)
   - [xiaochangbai](https://github.com/xiaochangbai)
+  - [imherewait](https://github.com/imherewait)
   - [wangyuewen](https://github.com/2858917634)
 
 

diff --git a/changes/en-us/1.5.0.md b/changes/en-us/1.5.0.md
@@ -40,9 +40,10 @@
   - [[#3968](https://github.com/seata/seata/pull/3968)] support brpc-java RPC framework
   - [[#4134](https://github.com/seata/seata/pull/4134)] init the console basic code
   - [[#4268](https://github.com/seata/seata/pull/4268)] query global session in the file mode
+  - [[#4293](https://github.com/seata/seata/pull/4293)] get global lock in the file mode
   - [[#4335](https://github.com/seata/seata/pull/4335)] Realize configuration center upload configuration interactive script (nacos,etcd3)
   - [[#4349](https://github.com/seata/seata/pull/4349)] saga support parallel execution with multiple states
-
+  
 
   ### bugfix：
   - [[#3497](https://github.com/seata/seata/pull/3497)] fix tcc phase two response timeout exception
@@ -89,11 +90,14 @@
   - [[#4276](https://github.com/seata/seata/pull/4276)] fix seata-test module UT not work
   - [[#4278](https://github.com/seata/seata/pull/4278)] fix the problem that mysql's Blob/Clob/NClob data type cannot be deserialized
   - [[#4302](https://github.com/seata/seata/pull/4302)] fix the problem that other ORMs may not be able to obtain the auto-incrementing primary key value
+  - [[#4233](https://github.com/seata/seata/pull/4233)] fix data remanence problems in lock and branch under specific circumstances.
+  - [[#4276](https://github.com/seata/seata/pull/4276)] fix seata-test module UT not work
+  - [[#4278](https://github.com/seata/seata/pull/4278)] fix the problem that mysql's Blob/Clob/NClob data type cannot be deserialized
   - [[#4308](https://github.com/seata/seata/pull/4308)] fix the TableMetaCache parsing problem with the same table under multiple Postgresql schemas
   - [[#4326](https://github.com/seata/seata/pull/4326)] fix inability to build Executor when using mariadb driver
+  - [[#4355](https://github.com/seata/seata/pull/4355)] fix mysql-loadbalance resource id error
   - [[#4310](https://github.com/seata/seata/pull/4310)] fix the problem that failed to obtain the self increment ID of MySQL database through "select last_insert_id"
   - [[#4331](https://github.com/seata/seata/pull/4331)] fix dirty write check exception that may occur when using ONLY_CARE_UPDATE_COLUMNS configuration
-
 
 
 
@@ -175,7 +179,11 @@
   - [[#4299](https://github.com/seata/seata/pull/4296)] optimize exceptions to make them friendly
   - [[#4300](https://github.com/seata/seata/pull/4300)] optimize let DefaultCoordinator invoke NettyRemotingServer's close method,no longer closed by ServerRunner
   - [[#4270](https://github.com/seata/seata/pull/4270)] improve the performance of global commit and global rollback, asynchronous branch transaction cleanup
+  - [[#4303](https://github.com/seata/seata/pull/4303)] `tcc_fence_log` table hanging log records are deleted asynchronously
   - [[#4328](https://github.com/seata/seata/pull/4328)] upload configuration script support comments
+  - [[#4336](https://github.com/seata/seata/pull/4336)] add SQL exception prompt not supported by AT mode
+
+
 
 
   ### test:	
@@ -223,9 +231,11 @@
   - [anselleeyy](https://github.com/anselleeyy)
   - [GoodBoyCoder](https://github.com/GoodBoyCoder)
   - [xiaochangbai](https://github.com/xiaochangbai)
+  - [imherewait](https://github.com/imherewait)
   - [wangyuewen](https://github.com/2858917634)
 
 
+
   Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.	
 
    #### Link	

diff --git a/common/src/main/java/io/seata/common/exception/InvalidParamException.java b/common/src/main/java/io/seata/common/exception/InvalidParamException.java
diff --git a/config/seata-config-custom/pom.xml b/config/seata-config-custom/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/config/seata-config-etcd3/pom.xml b/config/seata-config-etcd3/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>

diff --git a/config/seata-config-nacos/pom.xml b/config/seata-config-nacos/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.nacos</groupId>

diff --git a/config/seata-config-spring-cloud/pom.xml b/config/seata-config-spring-cloud/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/config/seata-config-zk/pom.xml b/config/seata-config-zk/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-config-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.101tec</groupId>

diff --git a/core/src/main/java/io/seata/core/console/result/PageResult.java b/core/src/main/java/io/seata/core/console/result/PageResult.java
@@ -23,6 +23,7 @@
 /**
  * The page result
  * @author: zhongxiang.wang
+ * @author miaoxueyu
  */
 public class PageResult<T> extends Result<T>  implements Serializable {
     private static final long serialVersionUID = 7761262662429121287L;

diff --git a/core/src/main/java/io/seata/core/console/vo/BranchSessionVO.java b/core/src/main/java/io/seata/core/console/vo/BranchSessionVO.java
@@ -15,13 +15,13 @@
  */
 package io.seata.core.console.vo;
 
-import io.seata.core.constants.ServerTableColumnsName;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.Objects;
 
+import io.seata.core.constants.ServerTableColumnsName;
+
 /**
  * BranchSessionVO
  * @author: zhongxiang.wang

diff --git a/core/src/main/java/io/seata/core/console/vo/GlobalLockVO.java b/core/src/main/java/io/seata/core/console/vo/GlobalLockVO.java
@@ -15,15 +15,21 @@
  */
 package io.seata.core.console.vo;
 
-import io.seata.core.constants.ServerTableColumnsName;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
+
+import io.seata.common.util.CollectionUtils;
+import io.seata.core.constants.ServerTableColumnsName;
+import io.seata.core.lock.RowLock;
 
 /**
  * GlobalLockVO
  * @author: zhongxiang.wang
+ * @author miaoxueyu
  */
 public class GlobalLockVO {
 
@@ -45,6 +51,41 @@ public class GlobalLockVO {
 
     private Date gmtModified;
 
+    /**
+     * convert RowLock list to GlobalLockVO list
+     * @param rowLocks the RowLock list
+     * @return the GlobalLockVO list
+     */
+    public static List<GlobalLockVO> convert(List<RowLock> rowLocks) {
+        if (CollectionUtils.isEmpty(rowLocks)) {
+            return Collections.emptyList();
+        }
+        final List<GlobalLockVO> result = new ArrayList<>(rowLocks.size());
+        for (RowLock rowLock : rowLocks) {
+            result.add(convert(rowLock));
+        }
+
+        return result;
+    }
+
+
+    /**
+     * convert RowLock to GlobalLockVO
+     * @param rowLock the RowLock
+     * @return the GlobalLockVO
+     */
+    public static GlobalLockVO convert(RowLock rowLock) {
+        final GlobalLockVO globalLockVO = new GlobalLockVO();
+        globalLockVO.setXid(rowLock.getXid());
+        globalLockVO.setTransactionId(rowLock.getTransactionId());
+        globalLockVO.setBranchId(rowLock.getBranchId());
+        globalLockVO.setResourceId(rowLock.getResourceId());
+        globalLockVO.setTableName(rowLock.getTableName());
+        globalLockVO.setPk(rowLock.getPk());
+        globalLockVO.setRowKey(rowLock.getRowKey());
+        return globalLockVO;
+    }
+
 
     public String getXid() {
         return xid;

diff --git a/discovery/seata-discovery-consul/pom.xml b/discovery/seata-discovery-consul/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.ecwid.consul</groupId>

diff --git a/discovery/seata-discovery-custom/pom.xml b/discovery/seata-discovery-custom/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/discovery/seata-discovery-etcd3/pom.xml b/discovery/seata-discovery-etcd3/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>

diff --git a/discovery/seata-discovery-eureka/pom.xml b/discovery/seata-discovery-eureka/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.netflix.eureka</groupId>

diff --git a/discovery/seata-discovery-nacos/pom.xml b/discovery/seata-discovery-nacos/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba.nacos</groupId>

diff --git a/discovery/seata-discovery-redis/pom.xml b/discovery/seata-discovery-redis/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>

diff --git a/discovery/seata-discovery-sofa/pom.xml b/discovery/seata-discovery-sofa/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
          <dependency>
             <groupId>com.alipay.sofa</groupId>

diff --git a/discovery/seata-discovery-zk/pom.xml b/discovery/seata-discovery-zk/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-discovery-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.101tec</groupId>

diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
@@ -52,7 +52,6 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-testing</artifactId>
             <scope>test</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>

diff --git a/metrics/seata-metrics-core/pom.xml b/metrics/seata-metrics-core/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-metrics-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/metrics/seata-metrics-exporter-prometheus/pom.xml b/metrics/seata-metrics-exporter-prometheus/pom.xml
@@ -35,13 +35,13 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-metrics-api</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>seata-core</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>