add leaf 1.1.5

Author: xlorne

springboot-starter-leaf/src/main/java/com/sankuai/inf/leaf/segment/dao/impl/DbHelper.java

@@ -2,7 +2,6 @@
 
 import com.sankuai.inf.leaf.exception.DbException;
 import org.apache.commons.dbutils.QueryRunner;
-import org.apache.commons.dbutils.ResultSetHandler;
 import org.h2.jdbcx.JdbcDataSource;
 
 import java.sql.Connection;
@@ -12,7 +11,6 @@ public class DbHelper<T> {
 
     private final JdbcDataSource dataSource;
     private final QueryRunner queryRunner;
-    private final ResultSetHandler<T> handler;
 
 
     interface IExecute{
@@ -31,13 +29,10 @@ interface IQuery<T>{
         default T query(Connection connection,QueryRunner queryRunner) throws SQLException{return null;}
     }
 
-    public DbHelper(ResultSetHandler<T> handler,String jdbcUrl) {
+    public DbHelper(String jdbcUrl) {
         this.dataSource = new JdbcDataSource();
         this.queryRunner = new QueryRunner();
-        this.handler = handler;
-
-        dataSource.setURL(jdbcUrl);
-
+        this.dataSource.setURL(jdbcUrl);
     }
 
 

springboot-starter-leaf/src/main/java/com/sankuai/inf/leaf/segment/dao/impl/IDAllocDaoImpl.java

@@ -30,7 +30,7 @@ public IDAllocDaoImpl(String jdbcUrl) {
             }
             return list;
         };
-        this.dbHelper = new DbHelper<>(handler,jdbcUrl);
+        this.dbHelper = new DbHelper<>(jdbcUrl);
         this.init();
     }
 
@@ -79,11 +79,12 @@ public boolean save(LeafAlloc leafAlloc){
         return dbHelper.update(new DbHelper.IUpdate() {
             @Override
             public int update(Connection connection, QueryRunner queryRunner) throws SQLException {
-                String sql = "INSERT INTO LEAF_ALLOC (MAX_ID, STEP, UPDATE_TIME, TAG) VALUES (?, ?, ?, ?)";
                 List<LeafAlloc> list =  queryRunner.query(connection,"SELECT * FROM LEAF_ALLOC WHERE TAG = ?",handler,leafAlloc.getKey());
                 if(list!=null&&list.size()>0){
                     return 0;
                 }
+
+                String sql = "INSERT INTO LEAF_ALLOC (MAX_ID, STEP, UPDATE_TIME, TAG) VALUES (?, ?, ?, ?)";
                 return queryRunner.update(connection,sql,leafAlloc.getMaxId(),leafAlloc.getStep(),leafAlloc.getUpdateTime(),leafAlloc.getKey());
             }
         })>0;

springboot-starter-leaf/src/test/java/com/sankuai/inf/leaf/IDGenTest.java

@@ -5,23 +5,30 @@
 import com.sankuai.inf.leaf.segment.dao.IDAllocDao;
 import com.sankuai.inf.leaf.segment.dao.impl.IDAllocDaoImpl;
 import com.sankuai.inf.leaf.segment.model.LeafAlloc;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+@Slf4j
 class IDGenTest {
 
-
     private IDAllocDao allocDao;
     private IDGen idGen;
 
-    public IDGenTest() {
+    @BeforeEach
+    public void beforeInitIdGen() {
+        //setting jdbc url to h2 memory
         allocDao = new IDAllocDaoImpl("jdbc:h2:mem:leaf;DB_CLOSE_DELAY=-1");
+
+        //add leaf-segment-test key
         LeafAlloc alloc = new LeafAlloc();
-        alloc.setMaxId(1);
-        alloc.setStep(1000);
+        alloc.setMaxId(0);
+        alloc.setStep(100);
         alloc.setKey("leaf-segment-test");
 
+        //init id gen
         allocDao.save(alloc);
         idGen = new SegmentIDGenImpl();
         ((SegmentIDGenImpl) idGen).setDao(allocDao);
@@ -31,11 +38,10 @@ public IDGenTest() {
 
     @Test
     public void testGetId() {
-
-        for (int i = 0; i < 100; ++i) {
+        for (int i = 0; i < 1000; ++i) {
             Result r = idGen.get("leaf-segment-test");
-            System.out.println(r);
-            assertEquals(r.getId(), (i+1), "id gen value error.");
+            assertEquals(r.getId(), (i), "id gen value error.");
+            log.info("res:{}",r);
         }
     }