Merge pull request #132 from qq254963746/develop

1.6.1
ltsopensource · Oct 20, 2015 · 3e09e8d · 3e09e8d
2 parents 9b3dc6b + cb40182
commit 3e09e8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lts-queue/lts-queue-mongo/src/main/java/com/lts/queue/mongo/MongoPreLoader.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/queue/mongo/MongoPreLoader.java
@@ -50,7 +50,7 @@ protected List<JobPo> load(String loadTaskTrackerNodeGroup, int offset) {
         Query<JobPo> query = template.createQuery(tableName, JobPo.class);
         query.field("isRunning").equal(false)
                 .filter("triggerTime < ", SystemClock.now())
-                .order(" triggerTime, priority , gmtCreated").offset(offset).limit(step);
+                .order(" triggerTime, priority , gmtCreated").offset(offset).limit(loadSize);
         return query.asList();
     }
 

diff --git a/lts-queue/lts-queue-mysql/src/main/java/com/lts/queue/mysql/MysqlPreLoader.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/queue/mysql/MysqlPreLoader.java
@@ -59,7 +59,7 @@ protected List<JobPo> load(String loadTaskTrackerNodeGroup, int offset) {
             Long now = SystemClock.now();
             return sqlTemplate.query(getRealSql(takeSelectSQL, loadTaskTrackerNodeGroup),
                     ResultSetHandlerHolder.JOB_PO_LIST_RESULT_SET_HANDLER,
-                    false, now, offset, step);
+                    false, now, offset, loadSize);
         } catch (SQLException e) {
             return null;
         }