Merge pull request #142 from qq254963746/develop

Fix PreLoader BUG

lts-queue/lts-queue-api/src/main/java/com/lts/queue/AbstractPreLoader.java

@@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public abstract class AbstractPreLoader implements PreLoader {
 
-    protected int loadSize;
+    private int loadSize;
     // 预取阀值
     private double factor;
 
@@ -110,7 +110,7 @@ public abstract class AbstractPreLoader implements PreLoader {
     /**
      * 加载任务
      */
-    protected abstract List<JobPo> load(String loadTaskTrackerNodeGroup, int offset);
+    protected abstract List<JobPo> load(String loadTaskTrackerNodeGroup, int loadSize);
 
     private JobPo get(String taskTrackerNodeGroup) {
         JobPriorityBlockingQueue queue = JOB_MAP.get(taskTrackerNodeGroup);

lts-queue/lts-queue-mongo/src/main/java/com/lts/queue/mongo/MongoPreLoader.java

@@ -45,13 +45,13 @@ public class MongoPreLoader extends AbstractPreLoader {
         return updateResult.getUpdatedCount() == 1;
     }
 
-    protected List<JobPo> load(String loadTaskTrackerNodeGroup, int offset) {
+    protected List<JobPo> load(String loadTaskTrackerNodeGroup, int loadSize) {
         // load
         String tableName = JobQueueUtils.getExecutableQueueName(loadTaskTrackerNodeGroup);
         Query<JobPo> query = template.createQuery(tableName, JobPo.class);
         query.field("isRunning").equal(false)
                 .filter("triggerTime < ", SystemClock.now())
-                .order(" triggerTime, priority , gmtCreated").offset(offset).limit(loadSize);
+                .order(" triggerTime, priority , gmtCreated").offset(0).limit(loadSize);
         return query.asList();
     }
 

lts-queue/lts-queue-mysql/src/main/java/com/lts/queue/mysql/MysqlPreLoader.java

@@ -57,12 +57,12 @@ public class MysqlPreLoader extends AbstractPreLoader {
             " LIMIT ?, ?";
 
     @Override
-    protected List<JobPo> load(String loadTaskTrackerNodeGroup, int offset) {
+    protected List<JobPo> load(String loadTaskTrackerNodeGroup, int loadSize) {
         try {
             Long now = SystemClock.now();
             return sqlTemplate.query(getRealSql(takeSelectSQL, loadTaskTrackerNodeGroup),
                     ResultSetHandlerHolder.JOB_PO_LIST_RESULT_SET_HANDLER,
-                    false, now, offset, loadSize);
+                    false, now, 0, loadSize);
         } catch (SQLException e) {
             return null;
         }