You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@seata.apache.org by xi...@apache.org on 2024/04/08 02:20:45 UTC
(incubator-seata) branch 2.x updated: optimize: clarify if conditions (#6442)
This is an automated email from the ASF dual-hosted git repository.
xingfudeshi pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 77bcaa222a optimize: clarify if conditions (#6442)
77bcaa222a is described below
commit 77bcaa222a10e8f4a6d78ccf55af30c1c188744c
Author: YEONCHEOL JANG <65...@users.noreply.github.com>
AuthorDate: Mon Apr 8 11:20:40 2024 +0900
optimize: clarify if conditions (#6442)
---
changes/en-us/2.x.md | 5 +++++
changes/zh-cn/2.x.md | 5 +++++
.../org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java | 3 ++-
.../src/main/java/org/apache/seata/server/session/SessionHolder.java | 3 ++-
.../apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java | 3 ++-
.../seata/server/storage/redis/lock/RedisDistributedLocker.java | 2 +-
6 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 21cbc90a36..3485e6e47c 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -113,6 +113,11 @@ Add changes here for all PR submitted to the 2.x branch.
retry mechanism
- [[#6387](https://github.com/apache/incubator-seata/pull/6387)] optimize tcc use compatible
- [[#6402](https://github.com/apache/incubator-seata/pull/6402)] optimize rm-datasource use compatible
+- [[#6419](https://github.com/apache/incubator-seata/pull/6419)] optimize integration-tx-api compatibl
+- [[#6442](https://github.com/apache/incubator-seata/pull/6442)] clarify if conditions
+
+### refactor:
+- [[#6269](https://github.com/apache/incubator-seata/pull/6269)] standardize Seata Exception
- [[#6419](https://github.com/apache/incubator-seata/pull/6419)] optimize integration-tx-api compatible
- [[#6405](https://github.com/apache/incubator-seata/pull/6405)] fix kotlin compile failure
- [[#6412](https://github.com/apache/incubator-seata/pull/6412)] optimize core compatible module
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index e9c1c29736..8091f52609 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -115,6 +115,11 @@
- [[#6387](https://github.com/apache/incubator-seata/pull/6387)] 优化tcc使用兼容
- [[#6402](https://github.com/apache/incubator-seata/pull/6402)] 优化rm-datasource向下兼容
- [[#6419](https://github.com/apache/incubator-seata/pull/6419)] 优化integration-tx-api向下兼容
+- [[#6442](https://github.com/apache/incubator-seata/pull/6442)] 阐明 if
+
+
+### refactor:
+- [[#6269](https://github.com/apache/incubator-seata/pull/6269)] 统一Seata异常规范
- [[#6405](https://github.com/apache/incubator-seata/pull/6405)] 修复 kotlin 编译失败
- [[#6412](https://github.com/apache/incubator-seata/pull/6412)] 优化 core 兼容模块
- [[#6429](https://github.com/apache/incubator-seata/pull/6429)] 移除重复注释
diff --git a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java
index 6c2de1681f..69fc501a72 100644
--- a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java
+++ b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/AbstractUndoLogManager.java
@@ -264,9 +264,10 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
try {
connectionProxy = dataSourceProxy.getConnection();
conn = connectionProxy.getTargetConnection();
+ originalAutoCommit = conn.getAutoCommit();
// The entire undo process should run in a local transaction.
- if (originalAutoCommit = conn.getAutoCommit()) {
+ if (originalAutoCommit) {
conn.setAutoCommit(false);
}
diff --git a/server/src/main/java/org/apache/seata/server/session/SessionHolder.java b/server/src/main/java/org/apache/seata/server/session/SessionHolder.java
index 364508949d..f32839e78e 100644
--- a/server/src/main/java/org/apache/seata/server/session/SessionHolder.java
+++ b/server/src/main/java/org/apache/seata/server/session/SessionHolder.java
@@ -361,7 +361,8 @@ public class SessionHolder {
public static boolean distributedLockAndExecute(String key, NoArgsFunc func) {
boolean lock = false;
try {
- if (lock = acquireDistributedLock(key)) {
+ lock = acquireDistributedLock(key);
+ if (lock) {
func.call();
}
} catch (Exception e) {
diff --git a/server/src/main/java/org/apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java b/server/src/main/java/org/apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java
index 54a655ef5d..3bc6a4e324 100644
--- a/server/src/main/java/org/apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java
+++ b/server/src/main/java/org/apache/seata/server/storage/db/lock/LockStoreDataBaseDAO.java
@@ -116,7 +116,8 @@ public class LockStoreDataBaseDAO implements LockStore {
}
try {
conn = lockStoreDataSource.getConnection();
- if (originalAutoCommit = conn.getAutoCommit()) {
+ originalAutoCommit = conn.getAutoCommit();
+ if (originalAutoCommit) {
conn.setAutoCommit(false);
}
List<LockDO> unrepeatedLockDOs = lockDOs;
diff --git a/server/src/main/java/org/apache/seata/server/storage/redis/lock/RedisDistributedLocker.java b/server/src/main/java/org/apache/seata/server/storage/redis/lock/RedisDistributedLocker.java
index acee186744..b740d6a352 100644
--- a/server/src/main/java/org/apache/seata/server/storage/redis/lock/RedisDistributedLocker.java
+++ b/server/src/main/java/org/apache/seata/server/storage/redis/lock/RedisDistributedLocker.java
@@ -45,7 +45,7 @@ public class RedisDistributedLocker implements DistributedLocker {
@Override
public boolean acquireLock(DistributedLockDO distributedLockDO) {
try (Jedis jedis = JedisPooledFactory.getJedisInstance()) {
- //Don't need retry,if can't acquire the lock,let the other get the lock
+ //Don't need to retry, if you can't acquire the lock,let the other get the lock
String result = jedis.set(distributedLockDO.getLockKey(), distributedLockDO.getLockValue(), SetParams.setParams().nx().px(distributedLockDO.getExpireTime()));
return SUCCESS.equalsIgnoreCase(result);
} catch (Exception ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@seata.apache.org
For additional commands, e-mail: notifications-help@seata.apache.org