From e24facfafcb75db5b6a104eb8a656f32d74d6316 Mon Sep 17 00:00:00 2001 From: jsbxyyx Date: Thu, 11 Jul 2024 11:05:25 +0800 Subject: [PATCH] fix: review --- .../seata/common/util}/UUIDGenerator.java | 7 +++---- common/src/test/resources/io/TestFile.txt | 17 +++++++++++++++++ .../datasource/undo/AbstractUndoLogManager.java | 6 ++++++ .../undo/mysql/MySQLUndoLogManager.java | 6 ++---- .../java/org/apache/seata/server/Server.java | 1 + .../seata/server/session/GlobalSession.java | 2 +- .../seata/server/session/SessionHelper.java | 2 +- server/src/test/java/ServerTest.java | 2 +- .../seata/server/UUIDGeneratorOverflowTest.java | 1 + .../seata/server/lock/LockManagerTest.java | 2 +- .../lock/file/FileLockManagerImplTest.java | 2 +- .../seata/server/session/BranchSessionTest.java | 2 +- .../session/db/DataBaseSessionManagerTest.java | 2 +- .../session/redis/RedisSessionManagerTest.java | 2 +- .../file/FileTransactionStoreManagerTest.java | 2 +- .../seata/mockserver/MockCoordinator.java | 2 +- .../org/apache/seata/mockserver/MockServer.java | 2 +- .../seata/at/mysql/MysqlUpdateJoinTest.java | 2 +- .../seata/core/rpc/netty/TmNettyClientTest.java | 2 +- .../saga/engine/db/AbstractServerTest.java | 2 +- .../mock/MockSagaTransactionTemplate.java | 2 +- 21 files changed, 45 insertions(+), 23 deletions(-) rename {server/src/main/java/org/apache/seata/server => common/src/main/java/org/apache/seata/common/util}/UUIDGenerator.java (94%) diff --git a/server/src/main/java/org/apache/seata/server/UUIDGenerator.java b/common/src/main/java/org/apache/seata/common/util/UUIDGenerator.java similarity index 94% rename from server/src/main/java/org/apache/seata/server/UUIDGenerator.java rename to common/src/main/java/org/apache/seata/common/util/UUIDGenerator.java index 0cd316bbff3..542de3ed1eb 100644 --- a/server/src/main/java/org/apache/seata/server/UUIDGenerator.java +++ b/common/src/main/java/org/apache/seata/common/util/UUIDGenerator.java @@ -14,13 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.seata.server; - -import org.apache.seata.common.util.IdWorker; +package org.apache.seata.common.util; /** * The type Uuid generator. - * */ public class UUIDGenerator { @@ -28,6 +25,7 @@ public class UUIDGenerator { /** * generate UUID using snowflake algorithm + * * @return UUID */ public static long generateUUID() { @@ -43,6 +41,7 @@ public static long generateUUID() { /** * init IdWorker + * * @param serverNode the server node id, consider as machine id in snowflake */ public static void init(Long serverNode) { diff --git a/common/src/test/resources/io/TestFile.txt b/common/src/test/resources/io/TestFile.txt index 2944f981947..6b3c4db9b5c 100644 --- a/common/src/test/resources/io/TestFile.txt +++ b/common/src/test/resources/io/TestFile.txt @@ -1,3 +1,20 @@ +==== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==== + /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with 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 de98c89bd33..d9ba6bb3f3d 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 @@ -22,6 +22,7 @@ import java.sql.SQLException; import java.sql.SQLIntegrityConstraintViolationException; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -514,6 +515,11 @@ protected byte[] getRollbackInfo(ResultSet rs) throws SQLException { return CompressorFactory.getCompressor(compressorType.getCode()).decompress(rollbackInfo); } + @Override + public int deleteUndoLogByLogCreated(Date logCreated, int limitRows, Connection conn) throws SQLException { + return 0; + } + /** * get sub rollback info * @param conn the database connection diff --git a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java index 299cd67eebe..bc299af723d 100644 --- a/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java +++ b/rm-datasource/src/main/java/org/apache/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java @@ -31,7 +31,7 @@ import org.apache.seata.common.loader.LoadLevel; import org.apache.seata.common.util.CollectionUtils; import org.apache.seata.common.util.IOUtil; -import org.apache.seata.common.util.IdWorker; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.core.compressor.CompressorType; import org.apache.seata.core.constants.ClientTableColumnsName; import org.apache.seata.core.rpc.processor.Pair; @@ -62,8 +62,6 @@ public class MySQLUndoLogManager extends AbstractUndoLogManager { private static final String DELETE_UNDO_LOG_BY_CREATE_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME + " WHERE " + ClientTableColumnsName.UNDO_LOG_LOG_CREATED + " <= ? LIMIT ?"; - private static final IdWorker ID_WORKER = new IdWorker(null); - @Override public int deleteUndoLogByLogCreated(Date logCreated, int limitRows, Connection conn) throws SQLException { try (PreparedStatement deletePST = conn.prepareStatement(DELETE_UNDO_LOG_BY_CREATE_SQL)) { @@ -153,7 +151,7 @@ protected void insertUndoLogWithNormal(String xid, long branchId, String rollbac } else { byte[] bytes = new byte[Math.min(undoLogContent.length - pos, limit)]; System.arraycopy(undoLogContent, pos, bytes, 0, bytes.length); - long subId = ID_WORKER.nextId(); + long subId = UUIDGenerator.generateUUID(); subIdBuilder.append(subId).append(UndoLogConstants.SUB_SPLIT_KEY); insertUndoLog(xid, subId, subRollbackCtx, bytes, State.Normal, conn); pos += bytes.length; diff --git a/server/src/main/java/org/apache/seata/server/Server.java b/server/src/main/java/org/apache/seata/server/Server.java index 1ebd10a5b82..150c5eb070a 100644 --- a/server/src/main/java/org/apache/seata/server/Server.java +++ b/server/src/main/java/org/apache/seata/server/Server.java @@ -24,6 +24,7 @@ import org.apache.seata.common.thread.NamedThreadFactory; import org.apache.seata.common.util.NetUtil; import org.apache.seata.common.util.StringUtils; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.config.ConfigurationFactory; import org.apache.seata.core.rpc.netty.NettyRemotingServer; import org.apache.seata.core.rpc.netty.NettyServerConfig; diff --git a/server/src/main/java/org/apache/seata/server/session/GlobalSession.java b/server/src/main/java/org/apache/seata/server/session/GlobalSession.java index 941c5babfed..0da8f0ff6e6 100644 --- a/server/src/main/java/org/apache/seata/server/session/GlobalSession.java +++ b/server/src/main/java/org/apache/seata/server/session/GlobalSession.java @@ -41,7 +41,7 @@ import org.apache.seata.core.model.BranchType; import org.apache.seata.core.model.GlobalStatus; import org.apache.seata.core.model.LockStatus; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.cluster.raft.RaftServerManager; import org.apache.seata.server.lock.LockerManagerFactory; import org.apache.seata.server.store.SessionStorable; diff --git a/server/src/main/java/org/apache/seata/server/session/SessionHelper.java b/server/src/main/java/org/apache/seata/server/session/SessionHelper.java index 2ac9d523056..7ffab5f14be 100644 --- a/server/src/main/java/org/apache/seata/server/session/SessionHelper.java +++ b/server/src/main/java/org/apache/seata/server/session/SessionHelper.java @@ -37,7 +37,7 @@ import org.apache.seata.core.model.BranchType; import org.apache.seata.core.model.GlobalStatus; import org.apache.seata.metrics.IdConstants; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.cluster.raft.context.SeataClusterContext; import org.apache.seata.server.coordinator.DefaultCoordinator; import org.apache.seata.server.metrics.MetricsPublisher; diff --git a/server/src/test/java/ServerTest.java b/server/src/test/java/ServerTest.java index 57cc1de3105..32624e3ae1a 100644 --- a/server/src/test/java/ServerTest.java +++ b/server/src/test/java/ServerTest.java @@ -17,7 +17,7 @@ import org.apache.seata.common.XID; import org.apache.seata.common.util.NetUtil; import org.apache.seata.core.rpc.netty.NettyRemotingServer; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.coordinator.DefaultCoordinator; import java.util.concurrent.LinkedBlockingQueue; diff --git a/server/src/test/java/org/apache/seata/server/UUIDGeneratorOverflowTest.java b/server/src/test/java/org/apache/seata/server/UUIDGeneratorOverflowTest.java index ca40dfc78d7..65ca16f3880 100644 --- a/server/src/test/java/org/apache/seata/server/UUIDGeneratorOverflowTest.java +++ b/server/src/test/java/org/apache/seata/server/UUIDGeneratorOverflowTest.java @@ -16,6 +16,7 @@ */ package org.apache.seata.server; +import org.apache.seata.common.util.UUIDGenerator; import org.junit.jupiter.api.Test; /** diff --git a/server/src/test/java/org/apache/seata/server/lock/LockManagerTest.java b/server/src/test/java/org/apache/seata/server/lock/LockManagerTest.java index ec7af1b3264..6d6889c8045 100644 --- a/server/src/test/java/org/apache/seata/server/lock/LockManagerTest.java +++ b/server/src/test/java/org/apache/seata/server/lock/LockManagerTest.java @@ -30,7 +30,7 @@ import org.apache.seata.common.result.PageResult; import org.apache.seata.core.exception.TransactionException; import org.apache.seata.core.model.BranchType; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.console.param.GlobalLockParam; import org.apache.seata.server.console.service.GlobalLockService; import org.apache.seata.server.console.vo.GlobalLockVO; diff --git a/server/src/test/java/org/apache/seata/server/lock/file/FileLockManagerImplTest.java b/server/src/test/java/org/apache/seata/server/lock/file/FileLockManagerImplTest.java index 9cfaded45ab..21e1f9042bb 100644 --- a/server/src/test/java/org/apache/seata/server/lock/file/FileLockManagerImplTest.java +++ b/server/src/test/java/org/apache/seata/server/lock/file/FileLockManagerImplTest.java @@ -20,7 +20,7 @@ import org.apache.seata.common.XID; import org.apache.seata.core.model.BranchType; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.lock.LockManager; import org.apache.seata.server.session.BranchSession; import org.junit.jupiter.api.Assertions; diff --git a/server/src/test/java/org/apache/seata/server/session/BranchSessionTest.java b/server/src/test/java/org/apache/seata/server/session/BranchSessionTest.java index aeb0c9c66ee..87bb61f2d05 100644 --- a/server/src/test/java/org/apache/seata/server/session/BranchSessionTest.java +++ b/server/src/test/java/org/apache/seata/server/session/BranchSessionTest.java @@ -19,7 +19,7 @@ import java.util.stream.Stream; import org.apache.seata.core.model.BranchType; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; diff --git a/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java b/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java index 718dcfeb65b..f4b45f4346a 100644 --- a/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java +++ b/server/src/test/java/org/apache/seata/server/session/db/DataBaseSessionManagerTest.java @@ -29,7 +29,7 @@ import org.apache.seata.core.model.BranchStatus; import org.apache.seata.core.model.BranchType; import org.apache.seata.core.model.GlobalStatus; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.session.BranchSession; import org.apache.seata.server.session.GlobalSession; import org.apache.seata.server.session.SessionCondition; diff --git a/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java b/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java index 7a75f60a772..e343114e993 100644 --- a/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java +++ b/server/src/test/java/org/apache/seata/server/session/redis/RedisSessionManagerTest.java @@ -27,7 +27,7 @@ import org.apache.seata.core.model.BranchStatus; import org.apache.seata.core.model.BranchType; import org.apache.seata.core.model.GlobalStatus; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.session.BranchSession; import org.apache.seata.server.session.GlobalSession; import org.apache.seata.server.session.SessionCondition; diff --git a/server/src/test/java/org/apache/seata/server/store/file/FileTransactionStoreManagerTest.java b/server/src/test/java/org/apache/seata/server/store/file/FileTransactionStoreManagerTest.java index a2747354d66..d9c8ec08310 100644 --- a/server/src/test/java/org/apache/seata/server/store/file/FileTransactionStoreManagerTest.java +++ b/server/src/test/java/org/apache/seata/server/store/file/FileTransactionStoreManagerTest.java @@ -33,7 +33,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.apache.seata.common.util.BufferUtils; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.session.BranchSession; import org.apache.seata.server.session.GlobalSession; import org.apache.seata.server.session.SessionManager; diff --git a/test-mock-server/src/main/java/org/apache/seata/mockserver/MockCoordinator.java b/test-mock-server/src/main/java/org/apache/seata/mockserver/MockCoordinator.java index eba654fa48a..ac5d17fea82 100644 --- a/test-mock-server/src/main/java/org/apache/seata/mockserver/MockCoordinator.java +++ b/test-mock-server/src/main/java/org/apache/seata/mockserver/MockCoordinator.java @@ -53,7 +53,7 @@ import org.apache.seata.core.rpc.TransactionMessageHandler; import org.apache.seata.mockserver.call.CallRm; import org.apache.seata.server.AbstractTCInboundHandler; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.session.BranchSession; import org.apache.seata.server.session.GlobalSession; import org.slf4j.Logger; diff --git a/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java b/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java index 5f57b669858..535d6d3dd06 100644 --- a/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java +++ b/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java @@ -25,7 +25,7 @@ import org.apache.seata.common.thread.NamedThreadFactory; import org.apache.seata.common.util.NetUtil; import org.apache.seata.server.ParameterParser; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; diff --git a/test/src/test/java/org/apache/seata/at/mysql/MysqlUpdateJoinTest.java b/test/src/test/java/org/apache/seata/at/mysql/MysqlUpdateJoinTest.java index ecd8bc336de..65686885a71 100644 --- a/test/src/test/java/org/apache/seata/at/mysql/MysqlUpdateJoinTest.java +++ b/test/src/test/java/org/apache/seata/at/mysql/MysqlUpdateJoinTest.java @@ -33,7 +33,7 @@ import org.apache.seata.rm.datasource.DataSourceProxy; import org.apache.seata.rm.datasource.sql.struct.TableMetaCacheFactory; import org.apache.seata.rm.datasource.sql.struct.TableRecords; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.sqlparser.struct.TableMeta; import org.apache.seata.sqlparser.util.JdbcConstants; import org.junit.jupiter.api.Assertions; diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/TmNettyClientTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/TmNettyClientTest.java index 9701862d7bb..ae723d23800 100644 --- a/test/src/test/java/org/apache/seata/core/rpc/netty/TmNettyClientTest.java +++ b/test/src/test/java/org/apache/seata/core/rpc/netty/TmNettyClientTest.java @@ -26,7 +26,7 @@ import org.apache.seata.core.protocol.transaction.BranchRegisterResponse; import org.apache.seata.mockserver.MockServer; import org.apache.seata.saga.engine.db.AbstractServerTest; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.coordinator.DefaultCoordinator; import org.apache.seata.server.session.SessionHolder; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java index 670261d7415..75b4ce873b8 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java +++ b/test/src/test/java/org/apache/seata/saga/engine/db/AbstractServerTest.java @@ -27,7 +27,7 @@ import org.apache.seata.core.rpc.netty.NettyRemotingServer; import org.apache.seata.core.rpc.netty.NettyServerConfig; import org.apache.seata.server.ParameterParser; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.server.coordinator.DefaultCoordinator; import org.apache.seata.server.metrics.MetricsManager; import org.apache.seata.server.session.SessionHolder; diff --git a/test/src/test/java/org/apache/seata/saga/engine/mock/MockSagaTransactionTemplate.java b/test/src/test/java/org/apache/seata/saga/engine/mock/MockSagaTransactionTemplate.java index 4a92fe39c5f..1b0c68845d1 100644 --- a/test/src/test/java/org/apache/seata/saga/engine/mock/MockSagaTransactionTemplate.java +++ b/test/src/test/java/org/apache/seata/saga/engine/mock/MockSagaTransactionTemplate.java @@ -20,7 +20,7 @@ import org.apache.seata.core.model.BranchStatus; import org.apache.seata.core.model.GlobalStatus; import org.apache.seata.saga.engine.tm.SagaTransactionalTemplate; -import org.apache.seata.server.UUIDGenerator; +import org.apache.seata.common.util.UUIDGenerator; import org.apache.seata.tm.api.GlobalTransaction; import org.apache.seata.tm.api.TransactionalExecutor.ExecutionException; import org.apache.seata.tm.api.transaction.TransactionInfo;