Merge pull request #306 from yingyueshi/master

retryCount字段由short改为int
jd-opensource · Sep 15, 2020 · 0331c9e · 0331c9e
2 parents f0b8c62 + eb11910
commit 0331c9e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/joyqueue-common/joyqueue-model/src/main/java/org/joyqueue/domain/ConsumeRetry.java b/joyqueue-common/joyqueue-model/src/main/java/org/joyqueue/domain/ConsumeRetry.java
@@ -38,7 +38,7 @@ public class ConsumeRetry {
     // 重试时间
     private long retryTime;
     // 重试次数
-    private short retryCount;
+    private int retryCount;
     // 消息体
     private byte[] data;
     // 异常
@@ -118,11 +118,11 @@ public void setRetryTime(long retryTime) {
         this.retryTime = retryTime;
     }
 
-    public short getRetryCount() {
+    public int getRetryCount() {
         return retryCount;
     }
 
-    public void setRetryCount(short retryCount) {
+    public void setRetryCount(int retryCount) {
         this.retryCount = retryCount;
     }
 

diff --git a/...ue-web-handler/src/main/java/org/joyqueue/handler/routing/command/retry/RetryCommand.java b/...ue-web-handler/src/main/java/org/joyqueue/handler/routing/command/retry/RetryCommand.java
@@ -114,7 +114,7 @@ public Response recovery(@QueryParam(Constants.ID) Long id, @QueryParam(Constant
                 retry.getStatus() == Retry.StatusEnum.RETRY_SUCCESS.getValue()) {
             retry.setExpireTime(RetryUtils.getExpireTime().getTime());
             retry.setRetryTime(RetryUtils.getNextRetryTime(new Date(), 0).getTime());
-            retry.setRetryCount((short) 0);
+            retry.setRetryCount(0);
             retry.setUpdateTime(SystemClock.now());
             retryService.recover(retry);
             return  Responses.success("恢复成功");

diff --git a/...try-db-console/src/main/java/org/joyqueue/server/retry/console/DbConsoleMessageRetry.java b/...try-db-console/src/main/java/org/joyqueue/server/retry/console/DbConsoleMessageRetry.java
@@ -107,7 +107,7 @@ public ConsumeRetry map(final ResultSet rs) throws Exception {
                     message.setSendTime(rs.getTimestamp(6).getTime());
                     message.setExpireTime(rs.getTimestamp(7).getTime());
                     message.setRetryTime(rs.getTimestamp(8).getTime());
-                    message.setRetryCount(rs.getShort(9));
+                    message.setRetryCount(rs.getInt(9));
                     message.setData(rs.getBytes(10));
                     message.setException(rs.getBytes(11));
                     message.setCreateTime(rs.getTimestamp(12).getTime());
@@ -157,7 +157,7 @@ public ConsumeRetry map(ResultSet rs) throws Exception {
                     message.setSendTime(rs.getTimestamp(6).getTime());
                     message.setExpireTime(rs.getTimestamp(7).getTime());
                     message.setRetryTime(rs.getTimestamp(8).getTime());
-                    message.setRetryCount(rs.getShort(9));
+                    message.setRetryCount(rs.getInt(9));
                     message.setData(rs.getBytes(10));
                     message.setException(rs.getBytes(11));
                     message.setCreateTime(rs.getTimestamp(12).getTime());

diff --git a/...ue-retry/joyqueue-retry-db/src/main/java/org/joyqueue/server/retry/db/DBMessageRetry.java b/...ue-retry/joyqueue-retry-db/src/main/java/org/joyqueue/server/retry/db/DBMessageRetry.java
@@ -164,7 +164,7 @@ public List<ConsumeRetry> generateConsumeRetry(List<RetryMessageModel> retryMess
 
             consumeRetry.setExpireTime(getExpireTime(retryPolicy, SystemClock.now()));
             consumeRetry.setRetryTime(getRetryTime(retryPolicy, SystemClock.now(), 1));
-            consumeRetry.setRetryCount((short) 0);
+            consumeRetry.setRetryCount(0);
             consumeRetry.setData(retryMessageModel.getBrokerMessage());
             consumeRetry.setException(retryMessageModel.getException());
             consumeRetry.setCreateTime(SystemClock.now());

diff --git a/...ue-retry/joyqueue-retry-h2/src/main/java/org/joyqueue/server/retry/h2/H2MessageRetry.java b/...ue-retry/joyqueue-retry-h2/src/main/java/org/joyqueue/server/retry/h2/H2MessageRetry.java
@@ -145,7 +145,7 @@ public List<ConsumeRetry> generateConsumeRetry(List<RetryMessageModel> retryMess
 
             consumeRetry.setExpireTime(getExpireTime(retryPolicy, SystemClock.now()));
             consumeRetry.setRetryTime(getRetryTime(retryPolicy, SystemClock.now(), 1));
-            consumeRetry.setRetryCount((short) 0);
+            consumeRetry.setRetryCount(0);
             consumeRetry.setData(retryMessageModel.getBrokerMessage());
             consumeRetry.setException(retryMessageModel.getException());
             consumeRetry.setCreateTime(SystemClock.now());