1.2.2 snapshot

cooperlyt · cooperlyt · commit de31f59539ec · 2023-09-24T21:13:14.000+08:00
fix cached uid block error!
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/example/pom.xml b/example/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.cooperlyt</groupId>
         <artifactId>uid-reactive-generator-spring</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-snapshot</version>
     </parent>
 
     <artifactId>example</artifactId>
@@ -82,7 +82,7 @@
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
             <artifactId>uid-reactive-generator-db-spring-boot-starter</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-snapshot</version>
         </dependency>
 
         <!-- jdbc -->
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.cooperlyt</groupId>
     <artifactId>uid-reactive-generator-spring</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-snapshot</version>
     <packaging>pom</packaging>
 
     <name>uid-reactive-generator-spring</name>
@@ -65,7 +65,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.0.3</version>
+                <version>3.1.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/uid-reactive-generator-api/pom.xml b/uid-reactive-generator-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.cooperlyt</groupId>
         <artifactId>uid-reactive-generator-spring</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-snapshot</version>
     </parent>
 
     <artifactId>uid-reactive-generator-api</artifactId>
diff --git a/uid-reactive-generator-db-spring-boot-starter/pom.xml b/uid-reactive-generator-db-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.cooperlyt</groupId>
         <artifactId>uid-reactive-generator-spring</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-snapshot</version>
     </parent>
 
     <artifactId>uid-reactive-generator-db-spring-boot-starter</artifactId>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
             <artifactId>uid-reactive-generator-spring-boot-starter</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-snapshot</version>
         </dependency>
 
         <dependency>
diff --git a/uid-reactive-generator-db-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/R2DBCWorkerIdAssigner.java b/uid-reactive-generator-db-spring-boot-starter/src/main/java/io/github/cooperlyt/cloud/uid/worker/jpa/R2DBCWorkerIdAssigner.java
@@ -24,7 +24,7 @@ public R2DBCWorkerIdAssigner(WorkerNodeIdent workerNodeIdent,
 
   @Transactional(rollbackFor = Exception.class)
   @Override
-  protected Mono<Long> assignWorkerId(WorkerNodeIdent workerNodeIdent) {
+  public Mono<Long> assignWorkerId(WorkerNodeIdent workerNodeIdent) {
     return workerNodeRepository
         .getWorkerNodeByHostAndPort(workerNodeIdent.getHost(),workerNodeIdent.getPort())
         .map(Optional::of)
diff --git a/uid-reactive-generator-spring-boot-starter/pom.xml b/uid-reactive-generator-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.cooperlyt</groupId>
         <artifactId>uid-reactive-generator-spring</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-snapshot</version>
     </parent>
 
     <artifactId>uid-reactive-generator-spring-boot-starter</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
             <artifactId>uid-reactive-generator</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-snapshot</version>
         </dependency>
 
 
diff --git a/uid-reactive-generator-spring-cloud-starter-discovery/pom.xml b/uid-reactive-generator-spring-cloud-starter-discovery/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.cooperlyt</groupId>
         <artifactId>uid-reactive-generator-spring</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-snapshot</version>
     </parent>
 
     <artifactId>uid-reactive-generator-spring-cloud-starter-discovery</artifactId>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
             <artifactId>uid-reactive-generator-spring-boot-starter</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-snapshot</version>
         </dependency>
 
         <dependency>
diff --git a/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/DiscoveryWorkerIdAssigner.java b/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/DiscoveryWorkerIdAssigner.java
@@ -51,6 +51,7 @@ public void onRegisteredEvent(InstanceRegisteredEvent<?> event){
     sink.tryEmitValue(event).orThrow();
   }
 
+
   @EventListener
   public void onPreRegisteredEvent(InstancePreRegisteredEvent event) {
 
@@ -59,6 +60,7 @@ public void onPreRegisteredEvent(InstancePreRegisteredEvent event) {
     prepareWorkerId = discoveryClientAdapter.getInstances(serverId)
         .filter(instance -> !instance.getInstanceId().equals(instanceId))
         .map(this::getOrder)
+
         .reduce(0L,(max,order) -> (order > max) ? order : max)
         .blockOptional().orElse(0L) + 1L;
 
diff --git a/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/WorkerIdAssignerAutoConfigure.java b/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/WorkerIdAssignerAutoConfigure.java
@@ -2,6 +2,7 @@
 
 import io.github.cooperlyt.cloud.uid.worker.client.DiscoveryClientAdapter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,6 +15,7 @@ public class WorkerIdAssignerAutoConfigure {
   @Bean
   @Lazy
   @ConditionalOnMissingBean
+  // @ConditionalOnProperty(prefix = "spring.cloud.service-registry.auto-registration", name = "enabled")
   public WorkerIdAssigner workerIdAssigner(DiscoveryClientAdapter discoveryClientAdapter){
     return new DiscoveryWorkerIdAssigner(discoveryClientAdapter);
   }
diff --git a/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/client/BlockingDiscoveryClientAdapter.java b/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/client/BlockingDiscoveryClientAdapter.java
@@ -1,15 +1,18 @@
 package io.github.cooperlyt.cloud.uid.worker.client;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import reactor.core.publisher.Flux;
 
+@Slf4j
 public class BlockingDiscoveryClientAdapter implements DiscoveryClientAdapter {
 
   private final DiscoveryClient discoveryClient;
 
   public BlockingDiscoveryClientAdapter(DiscoveryClient discoveryClient) {
     this.discoveryClient = discoveryClient;
+    log.info("init by DiscoveryClient");
   }
 
   @Override
diff --git a/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/client/ReactiveDiscoveryClientAdapter.java b/uid-reactive-generator-spring-cloud-starter-discovery/src/main/java/io/github/cooperlyt/cloud/uid/worker/client/ReactiveDiscoveryClientAdapter.java
@@ -1,15 +1,18 @@
 package io.github.cooperlyt.cloud.uid.worker.client;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
 import reactor.core.publisher.Flux;
 
+@Slf4j
 public class ReactiveDiscoveryClientAdapter implements DiscoveryClientAdapter {
 
   private final ReactiveDiscoveryClient discoveryClient;
 
   public ReactiveDiscoveryClientAdapter(ReactiveDiscoveryClient discoveryClient) {
     this.discoveryClient = discoveryClient;
+    log.info("init by ReactiveDiscoveryClient");
   }
 
   @Override
diff --git a/uid-reactive-generator/pom.xml b/uid-reactive-generator/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.cooperlyt</groupId>
         <artifactId>uid-reactive-generator-spring</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2-snapshot</version>
     </parent>
 
     <artifactId>uid-reactive-generator</artifactId>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>io.github.cooperlyt</groupId>
             <artifactId>uid-reactive-generator-api</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2-snapshot</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
diff --git a/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/buffer/BufferPaddingExecutor.java b/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/buffer/BufferPaddingExecutor.java
@@ -17,6 +17,7 @@
 
 import io.github.cooperlyt.cloud.uid.utils.NamingThreadFactory;
 import io.github.cooperlyt.cloud.uid.utils.PaddedAtomicLong;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
@@ -93,13 +94,16 @@ public BufferPaddingExecutor(RingBuffer ringBuffer, BufferedUidProvider uidProvi
         }
     }
 
+    private long workerId;
     /**
      * Start executors such as schedule
      */
-    public void start() {
+    public void start(long workerId) {
+        this.workerId = workerId;
         if (bufferPadSchedule != null) {
             bufferPadSchedule.scheduleWithFixedDelay(this::asyncPadding, scheduleInterval, scheduleInterval, TimeUnit.SECONDS);
         }
+        paddingFuture = CompletableFuture.runAsync(this::paddingBuffer,bufferPadExecutors);
     }
 
     /**
@@ -109,7 +113,6 @@ public void shutdown() {
         if (!bufferPadExecutors.isShutdown()) {
             bufferPadExecutors.shutdownNow();
         }
-
         if (bufferPadSchedule != null && !bufferPadSchedule.isShutdown()) {
             bufferPadSchedule.shutdownNow();
         }
@@ -125,26 +128,38 @@ public boolean isRunning() {
     }
 
 
-    private Mono<Void> paddingFuture = Mono.empty();
+    //@Getter
+    //private Mono<Void> paddingFuture = Mono.empty();
+
+    private CompletableFuture<Void> paddingFuture = null;
 
-    public Mono<Void> getPaddingFuture() {
-        return paddingFuture;
+    public Mono<Void> requestPadding(long workerId){
+        this.workerId = workerId;
+        if (paddingFuture != null && isRunning() && !paddingFuture.isDone()){
+            return Mono.fromFuture(paddingFuture);
+        }else
+            return Mono.fromFuture(CompletableFuture.runAsync(this::paddingBuffer,bufferPadExecutors));
     }
 
+    public void asyncPadding(long workerId) {
+        this.workerId = workerId;
+        asyncPadding();
+    }
     /**
      * Padding buffer in the thread pool
      */
-    public void asyncPadding() {
-//        Mono.fromFuture(CompletableFuture.runAsync(this::paddingBuffer,bufferPadExecutors)).
-        paddingFuture = Mono.fromFuture(CompletableFuture.runAsync(this::paddingBuffer,bufferPadExecutors)).cache();
+    private void asyncPadding() {
+//        paddingFuture = Mono.fromFuture(CompletableFuture.runAsync(this::paddingBuffer,bufferPadExecutors)).cache();
 //        t.isDone()
-//        bufferPadExecutors.submit(this::paddingBuffer).;
+        paddingFuture = CompletableFuture.runAsync(this::paddingBuffer,bufferPadExecutors);
+        //bufferPadExecutors.submit(this::paddingBuffer);
+
     }
 
     /**
      * Padding buffer fill the slots until to catch the cursor
      */
-    public void paddingBuffer() {
+    private void paddingBuffer() {
 
         log.info("Ready to padding buffer lastSecond:{}. {}", lastSecond.get(), ringBuffer);
 
@@ -162,7 +177,7 @@ public void paddingBuffer() {
             if (providerTime > currentTime){
                 timeIsFutureHandler.timeIsFuture(providerTime,currentTime);
             }
-            List<Long> uidList = uidProvider.provide(providerTime);
+            List<Long> uidList = uidProvider.provide(workerId,providerTime);
             for (Long uid : uidList) {
                 isFullRingBuffer = !ringBuffer.put(uid);
                 if (isFullRingBuffer) {
diff --git a/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/buffer/BufferedUidProvider.java b/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/buffer/BufferedUidProvider.java
@@ -15,6 +15,8 @@
  */
 package io.github.cooperlyt.cloud.uid.buffer;
 
+import reactor.core.publisher.Mono;
+
 import java.util.List;
 
 /**
@@ -31,5 +33,5 @@ public interface BufferedUidProvider {
      * @param momentInSecond
      * @return
      */
-    List<Long> provide(long momentInSecond);
+    List<Long> provide(long workerId, long momentInSecond);
 }
diff --git a/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/buffer/RingBuffer.java b/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/buffer/RingBuffer.java
@@ -16,6 +16,7 @@
 package io.github.cooperlyt.cloud.uid.buffer;
 
 import io.github.cooperlyt.cloud.uid.utils.PaddedAtomicLong;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Mono;
 
@@ -44,6 +45,7 @@ public class RingBuffer {
     public static final int DEFAULT_PADDING_PERCENT = 50;
 
     /** The size of RingBuffer's slots, each slot hold a UID */
+    @Getter
     private final int bufferSize;
     private final long indexMask;
     private final long[] slots;
@@ -147,7 +149,7 @@ public synchronized boolean put(long uid) {
      * @return UID
      * @throws IllegalStateException if the cursor moved back
      */
-    public Mono<Long> take() {
+    public Mono<Long> take(long workerId) {
         // spin get next available cursor
         long currentCursor = cursor.get();
         long nextCursor = cursor.updateAndGet(old -> old == tail.get() ? old : old + 1);
@@ -161,13 +163,13 @@ public Mono<Long> take() {
 
             log.info("Reach the padding threshold:{}. tail:{}, cursor:{}, rest:{}", paddingThreshold, currentTail,
                     nextCursor, currentTail - nextCursor);
-            bufferPaddingExecutor.asyncPadding();
+            bufferPaddingExecutor.asyncPadding(workerId);
         }
 
         // cursor catch the tail, means that there is no more available UID to take
         if (nextCursor == currentCursor) {
             log.info("Buffer empty waiting put");
-            return bufferPaddingExecutor.getPaddingFuture().map(v -> -1L).switchIfEmpty(take());
+            return bufferPaddingExecutor.requestPadding(workerId).then(take(workerId));
             //rejectedTakeHandler.rejectTakeBuffer(this);
         }
 
@@ -225,10 +227,6 @@ public long getCursor() {
         return cursor.get();
     }
 
-    public int getBufferSize() {
-        return bufferSize;
-    }
-
     /**
      * Setters
      */
@@ -242,13 +240,10 @@ public void setRejectedPutHandler(RejectedPutBufferHandler rejectedPutHandler) {
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("RingBuffer [bufferSize=").append(bufferSize)
-               .append(", tail=").append(tail)
-               .append(", cursor=").append(cursor)
-               .append(", paddingThreshold=").append(paddingThreshold).append("]");
-        
-        return builder.toString();
+      return "RingBuffer [bufferSize=" + bufferSize +
+            ", tail=" + tail +
+            ", cursor=" + cursor +
+            ", paddingThreshold=" + paddingThreshold + "]";
     }
 
 }
diff --git a/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/impl/CachedUidGenerator.java b/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/impl/CachedUidGenerator.java
diff --git a/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/impl/DefaultUidGenerator.java b/uid-reactive-generator/src/main/java/io/github/cooperlyt/cloud/uid/impl/DefaultUidGenerator.java
