default id gen

Author: ujued

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/config/TxManagerConfig.java

@@ -91,9 +91,9 @@ public TxManagerConfig(ServerProperties serverProperties) {
     private String exUrl;
 
     /**
-     * 机器ID长度
+     * ID序列长度
      */
-    private int machineIdLen = 10;
+    private int seqLen = 12;
 
     public long getDtxLockTime() {
         return dtxLockTime == -1 ? dtxTime : dtxLockTime;

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/core/storage/FastStorage.java

@@ -200,5 +200,5 @@ public interface FastStorage {
      * @return
      * @throws FastStorageException
      */
-    int acquireOrRefreshMachineId(int machineId, int machineMaxSize, long timeout) throws FastStorageException;
+    int acquireOrRefreshMachineId(int machineId, long machineMaxSize, long timeout) throws FastStorageException;
 }

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/core/storage/redis/RedisStorage.java

@@ -242,7 +242,7 @@ private void releaseGlobalXLock() {
     }
 
     @Override
-    public int acquireOrRefreshMachineId(int machineId, int machineMaxSize, long timeout) throws FastStorageException {
+    public int acquireOrRefreshMachineId(int machineId, long machineMaxSize, long timeout) throws FastStorageException {
         try {
             acquireGlobalXLock();
             if (machineId < 0) {

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/support/service/impl/ManagerServiceImpl.java

@@ -17,22 +17,18 @@
 
 import com.codingapi.txlcn.common.exception.FastStorageException;
 import com.codingapi.txlcn.common.exception.TxManagerException;
-import com.codingapi.txlcn.common.lock.DTXLocks;
 import com.codingapi.txlcn.tm.config.TxManagerConfig;
 import com.codingapi.txlcn.tm.core.storage.FastStorage;
-import com.codingapi.txlcn.tm.core.storage.LockValue;
 import com.codingapi.txlcn.txmsg.params.NotifyConnectParams;
 import com.codingapi.txlcn.tm.support.service.ManagerService;
 import com.codingapi.txlcn.tm.txmsg.MessageCreator;
 import com.codingapi.txlcn.txmsg.RpcClient;
 import com.codingapi.txlcn.txmsg.exception.RpcException;
-import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Set;
 
 /**
  * Description:
@@ -72,7 +68,7 @@ public boolean refresh(NotifyConnectParams notifyConnectParams) throws RpcExcept
 
     @Override
     public int machineIdSync() throws TxManagerException {
-        int machineMaxSize = (int) Math.pow(2, managerConfig.getMachineIdLen()) - 1;
+        long machineMaxSize = ~(-1L << (64 - 1 - managerConfig.getSeqLen())) - 1;
         long timeout = managerConfig.getHeartTime() + 2000;
         int id = 0;
         try {
@@ -87,7 +83,7 @@ public int machineIdSync() throws TxManagerException {
     @Override
     public void refreshMachineId(int machineId) throws TxManagerException {
         try {
-            int machineMaxSize = (int) Math.pow(2, managerConfig.getMachineIdLen()) - 1;
+            long machineMaxSize = ~(-1L << (64 - 1 - managerConfig.getSeqLen())) - 1;
             long timeout = managerConfig.getHeartTime() + 2000;
             fastStorage.acquireOrRefreshMachineId(machineId, machineMaxSize, timeout);
         } catch (FastStorageException e) {

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/txmsg/EnsureIdGenEngine.java

@@ -55,7 +55,7 @@ public void disconnect(String remoteKey, String appName) {
 
     @Override
     public void init() throws Exception {
-        IdGenInit.applyDefaultIdGen(managerConfig.getMachineIdLen(), managerService.machineIdSync());
+        IdGenInit.applyDefaultIdGen(managerConfig.getSeqLen(), managerService.machineIdSync());
 
         Transactions.setApplicationIdWhenRunning(ApplicationInformation.modId(environment, serverProperties));
     }

txlcn-tm/src/main/java/com/codingapi/txlcn/tm/txmsg/transaction/InitClientService.java

@@ -74,7 +74,7 @@ public Serializable execute(TransactionCmd transactionCmd) throws TxManagerExcep
         InitClientParams initClientParams = transactionCmd.getMsg().loadBean(InitClientParams.class);
         rpcClient.bindAppName(transactionCmd.getRemoteKey(), initClientParams.getAppName());
         // Machine len and id
-        initClientParams.setMachineLen(txManagerConfig.getMachineIdLen());
+        initClientParams.setMachineLen(txManagerConfig.getSeqLen());
         initClientParams.setMachineId(managerService.machineIdSync());
         // DTX Time and TM timeout.
         initClientParams.setDtxTime(txManagerConfig.getDtxTime());