This is an automated email from the ASF dual-hosted git repository. gosonzhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new d339ed7dab [INLONG-11457][SDK] Optimize SequentialID class implementation (#11458) d339ed7dab is described below commit d339ed7dab4ba03d4aba2f98157aca9ee26ce41a Author: Goson Zhang <4675...@qq.com> AuthorDate: Tue Nov 5 15:35:06 2024 +0800 [INLONG-11457][SDK] Optimize SequentialID class implementation (#11458) Co-authored-by: gosonzhang <gosonzh...@tencent.com> --- .../inlong/sdk/dataproxy/network/SequentialID.java | 26 +++++++++------------- .../sdk/dataproxy/pb/network/TcpChannel.java | 2 +- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/SequentialID.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/SequentialID.java index cf12778fe0..a577f0038c 100644 --- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/SequentialID.java +++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/network/SequentialID.java @@ -17,32 +17,26 @@ package org.apache.inlong.sdk.dataproxy.network; -import java.util.concurrent.atomic.AtomicLong; +import java.security.SecureRandom; +import java.util.concurrent.atomic.AtomicInteger; public class SequentialID { - private static final long maxId = 2000000000; - private String ip = null; - private AtomicLong id = new AtomicLong(0); + private static final SecureRandom sRandom = new SecureRandom( + Long.toString(System.nanoTime()).getBytes()); + private final String ip; + private final AtomicInteger id = new AtomicInteger(sRandom.nextInt()); public SequentialID(String theIp) { ip = theIp; } - public synchronized String getNextId() { - if (id.get() > maxId) { - id.set(0); - } - id.incrementAndGet(); - return ip + "#" + id.toString() + "#" + System.currentTimeMillis(); + public String getNextId() { + return ip + "#" + id.incrementAndGet() + "#" + System.currentTimeMillis(); } - public synchronized long getNextInt() { - if (id.get() > maxId) { - id.set(0); - } - id.incrementAndGet(); - return id.get(); + public int getNextInt() { + return id.incrementAndGet(); } } diff --git a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/pb/network/TcpChannel.java b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/pb/network/TcpChannel.java index 84f26cd2b2..f5b79df71f 100644 --- a/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/pb/network/TcpChannel.java +++ b/inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/pb/network/TcpChannel.java @@ -159,7 +159,7 @@ public class TcpChannel { * acquireUninterruptibly */ public void acquireUninterruptibly() { - packToken.acquireUninterruptibly();; + packToken.acquireUninterruptibly(); } /**