From eb1191064f4de0e0326f7053fb1a324900b851d4 Mon Sep 17 00:00:00 2001 From: chenyanying3 Date: Tue, 15 Sep 2020 05:55:25 +0800 Subject: [PATCH] =?UTF-8?q?=20=E9=87=8D=E8=AF=95retryCount=E7=94=B1short?= =?UTF-8?q?=E6=94=B9=E4=B8=BAint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/joyqueue/domain/ConsumeRetry.java | 6 +++--- .../handler/routing/command/retry/RetryCommand.java | 2 +- .../server/retry/console/DbConsoleMessageRetry.java | 4 ++-- .../java/org/joyqueue/server/retry/db/DBMessageRetry.java | 2 +- .../java/org/joyqueue/server/retry/h2/H2MessageRetry.java | 2 +- 5 files changed, 8 insertions(+), 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 index 8b7d8013e..8eecbdd01 100644 --- 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/joyqueue-console/joyqueue-web/joyqueue-web-handler/src/main/java/org/joyqueue/handler/routing/command/retry/RetryCommand.java b/joyqueue-console/joyqueue-web/joyqueue-web-handler/src/main/java/org/joyqueue/handler/routing/command/retry/RetryCommand.java index b9a8ffa6a..bf07ebd5f 100644 --- a/joyqueue-console/joyqueue-web/joyqueue-web-handler/src/main/java/org/joyqueue/handler/routing/command/retry/RetryCommand.java +++ b/joyqueue-console/joyqueue-web/joyqueue-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/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/src/main/java/org/joyqueue/server/retry/console/DbConsoleMessageRetry.java b/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/src/main/java/org/joyqueue/server/retry/console/DbConsoleMessageRetry.java index ce166dbf0..55ffda678 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-db-console/src/main/java/org/joyqueue/server/retry/console/DbConsoleMessageRetry.java +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-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/joyqueue-server/joyqueue-retry/joyqueue-retry-db/src/main/java/org/joyqueue/server/retry/db/DBMessageRetry.java b/joyqueue-server/joyqueue-retry/joyqueue-retry-db/src/main/java/org/joyqueue/server/retry/db/DBMessageRetry.java index a4927e1d3..05d559b26 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-db/src/main/java/org/joyqueue/server/retry/db/DBMessageRetry.java +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-db/src/main/java/org/joyqueue/server/retry/db/DBMessageRetry.java @@ -164,7 +164,7 @@ public List generateConsumeRetry(List 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/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/src/main/java/org/joyqueue/server/retry/h2/H2MessageRetry.java b/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/src/main/java/org/joyqueue/server/retry/h2/H2MessageRetry.java index 1f8488de0..831d63432 100644 --- a/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/src/main/java/org/joyqueue/server/retry/h2/H2MessageRetry.java +++ b/joyqueue-server/joyqueue-retry/joyqueue-retry-h2/src/main/java/org/joyqueue/server/retry/h2/H2MessageRetry.java @@ -145,7 +145,7 @@ public List generateConsumeRetry(List 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());