fix coverage

Author: antonybi

README.md

@@ -36,7 +36,7 @@
 <dependency>
     <groupId>io.github.antonybi</groupId>
     <artifactId>timechannel</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 </dependency>
 ```
 
@@ -146,13 +146,16 @@ public class DemoService {
 # 查看channel的总数
 zcard space:0:expiryTime:channel
 
+# 查看channel的租约过期时间
+zscore space:0:expiryTime:channel 0
+
 # 查看目前可用的channel总数，时间戳换成当前时间
 zcount space:0:expiryTime:channel 0 1661079389000
 
 # 查看正在被占用的channel
 zrangebyscore space:0:expiryTime:channel 1661079389000 9999999999999 WITHSCORES
 
-# 根据上条命令查到的频道号查看最后一次申请日志
+# 根据上条命令查到的channel查看最后一次申请日志
 get space:0:channel:0:log
 ```
 

src/main/java/timechannel/core/Allocator.java

@@ -10,6 +10,7 @@
 import timechannel.exception.TimeChannelInternalException;
 
 import javax.annotation.PostConstruct;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -60,13 +61,10 @@ public void init() {
 
     private byte[] readFile(String filePath) {
         InputStream inputStream = this.getClass().getResourceAsStream("/" + filePath);
-        if (inputStream == null) {
-            log.error("cannot find lua script");
-            System.exit(0);
-        }
+        Assert.notNull(inputStream, "cannot find lua script");
         try {
             return IOUtils.toByteArray(inputStream);
-        } catch (Exception e) {
+        } catch (IOException e) {
             log.error("cannot read " + filePath, e);
             System.exit(0);
             return new byte[0];
@@ -101,7 +99,11 @@ private Lease doGrant(int channelQuantity, Duration ttl, String appName) {
             throw new TimeChannelInternalException("no idle channel: " + Arrays.toString(response.toArray()));
         }
 
-        return new Lease(response.get(1), response.get(2), response.get(3));
+        Lease lease = new Lease();
+        lease.setChannel(response.get(1));
+        lease.setEffectiveTime(response.get(2));
+        lease.setExpiryTime(response.get(3));
+        return lease;
     }
 
     /**

src/main/java/timechannel/core/Generator.java

@@ -244,7 +244,7 @@ private long getLocalServerTime() {
 
     public LocalDateTime parseDateTime(long guid) {
         return LocalDateTime.ofInstant(
-                Instant.ofEpochMilli(guid >> (channelBits + sequenceBits)),
+                Instant.ofEpochMilli(guid >> (groupId + channelBits + sequenceBits)),
                 TimeZone.getDefault().toZoneId());
     }
 

src/main/java/timechannel/core/Lease.java

@@ -46,12 +46,6 @@ void setExpiryTime(long expiryTime) {
         this.expiryTime = expiryTime;
     }
 
-    Lease(long channel, long effectiveTime, long expiryTime) {
-        this.channel = channel;
-        this.effectiveTime = effectiveTime;
-        this.expiryTime = expiryTime;
-    }
-
     @Override
     public String toString() {
         return "Lease{" +

src/main/java/timechannel/exception/TimeChannelInternalException.java

@@ -9,16 +9,8 @@
  **/
 public class TimeChannelInternalException extends RuntimeException {
 
-    private final String message;
-
     public TimeChannelInternalException(String message) {
         super(message);
-        this.message = message;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
     }
 
 }

src/test/java/timechannel/GuidTest.java

@@ -35,20 +35,19 @@ class GuidTest {
     @Resource
     private Guid guid;
 
-    @Disabled("very slow")
+    @Disabled("调整sequence的配置，12bit可达到50w/s")
     @Test
     void benchmarkNextId() throws InterruptedException {
-        Set<Long> rst = Collections.synchronizedSet(new HashSet<>());
         CountDownLatch c = new CountDownLatch(3);
 
         Thread t1 = new Thread(() -> {
-            consumeGuid(rst, c);
+            consumeGuid(c);
         });
         Thread t2 = new Thread(() -> {
-            consumeGuid(rst, c);
+            consumeGuid(c);
         });
         Thread t3 = new Thread(() -> {
-            consumeGuid(rst, c);
+            consumeGuid(c);
         });
         t1.start();
         t2.start();
@@ -58,19 +57,26 @@ void benchmarkNextId() throws InterruptedException {
         log.info("done!");
     }
 
-    private void consumeGuid(Set<Long> rst, CountDownLatch c) {
+    private void consumeGuid(CountDownLatch c) {
         for (int i = 0; i < 10000000; i++) {
-            long id = guid.nextId();
-            assertFalse(rst.contains(id));
-            rst.add(id);
+            assertDoesNotThrow(() -> guid.nextId());
         }
         c.countDown();
     }
 
     @Test
     void nextId() {
-        assertTrue(guid.nextId() > 0);
-        assertTrue(guid.nextId() > 0);
+        Set<Long> rst = Collections.synchronizedSet(new HashSet<>());
+        long last = 0;
+
+        for (int i = 0; i < 100; i++) {
+            // 加速消耗直到一个时间片內序号都耗尽
+            long id = guid.nextId();
+            assertTrue(id > last);
+            assertFalse(rst.contains(id));
+            rst.add(id);
+            last = id;
+        }
     }
 
     @Test
@@ -80,7 +86,7 @@ void nextId2() {
 
     @Test
     void parseDateTime() {
-        assertEquals(LocalDateTime.parse("2075-04-23T11:50:00.727"), guid.parseDateTime(3484645589754769408L));
+        assertEquals(LocalDateTime.parse("2022-08-28T00:22:33.251"), guid.parseDateTime(13611969357836288L));
     }
 
 }

src/test/java/timechannel/core/AllocatorTest.java

@@ -0,0 +1,44 @@
+package timechannel.core;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import timechannel.Guid;
+import timechannel.TestConfig;
+import timechannel.exception.TimeChannelInternalException;
+
+import javax.annotation.Resource;
+
+import java.time.Duration;
+import java.time.temporal.TemporalUnit;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author antonybi
+ * @since 2022/08/28
+ */
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(classes = {Guid.class})
+@ContextConfiguration(classes = {TestConfig.class})
+@ActiveProfiles("test")
+class AllocatorTest {
+
+    @Resource
+    private Allocator allocator;
+
+    @Test
+    void grant() {
+        for (int i = 0; i < 256 - 1; i++) {
+            // 本应用启动已经占用一个
+            allocator.grant(256, Duration.ofSeconds(15), "junit");
+        }
+        assertThrowsExactly(TimeChannelInternalException.class,
+                () -> allocator.grant(256, Duration.ofSeconds(15), "junit"));
+    }
+
+}

src/test/resources/application-test.yml

@@ -10,7 +10,7 @@ guid:
   bits:
     group: 1 # 频道分组bit位数，默认0
     channel: 8 # 频道bit位数，默认11位共2048个
-    sequence: 12 # 序列号bit位数，默认10位即1024/ms
+    sequence: 4 # 序列号bit位数，默认10位即1024/ms
   redis:
     host: 127.0.0.1
     port: 6379