You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by aa...@apache.org on 2022/07/13 02:52:30 UTC
[rocketmq-clients] branch java_dev updated (0c74109 -> d3efddc)
This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a change to branch java_dev
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
omit 0c74109 Java: refactor MessageMeter
add 890dcb4 Java: refactor MessageMeter (#42)
new de82889 Set grpc log level to error
new d3efddc Adapt to the status code
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0c74109)
\
N -- N -- N refs/heads/java_dev (d3efddc)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/client-shade/src/main/resources/rocketmq.logback.xml | 3 +--
.../apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java | 9 ++++-----
.../rocketmq/client/java/impl/consumer/ReceiveMessageResult.java | 1 +
.../rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java | 1 +
.../rocketmq/client/java/impl/producer/SendReceiptImpl.java | 1 +
java/client/src/main/resources/logback.xml | 3 +--
6 files changed, 9 insertions(+), 9 deletions(-)
[rocketmq-clients] 02/02: Adapt to the status code
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch java_dev
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
commit d3efddca4e6d670f5daaf5ea95df422bd80cc6bd
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Wed Jul 13 10:51:47 2022 +0800
Adapt to the status code
---
.../apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java | 9 ++++-----
.../rocketmq/client/java/impl/consumer/ReceiveMessageResult.java | 1 +
.../rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java | 1 +
.../rocketmq/client/java/impl/producer/SendReceiptImpl.java | 1 +
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java
index a8b04ec..74206b3 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ConsumerImpl.java
@@ -75,7 +75,6 @@ abstract class ConsumerImpl extends ClientImpl {
protected ListenableFuture<ReceiveMessageResult> receiveMessage(ReceiveMessageRequest request,
MessageQueueImpl mq, Duration timeout) {
List<MessageViewImpl> messages = new ArrayList<>();
- final SettableFuture<ReceiveMessageResult> future0 = SettableFuture.create();
try {
Metadata metadata = sign();
final Endpoints endpoints = mq.getBroker().getEndpoints();
@@ -84,8 +83,9 @@ abstract class ConsumerImpl extends ClientImpl {
metadata, request, timeout);
return Futures.transform(future, context -> {
final Iterator<ReceiveMessageResponse> it = context.getResp();
- // Null here means status not set yet.
- Status status = null;
+ Status status = Status.newBuilder().setCode(Code.INTERNAL_SERVER_ERROR)
+ .setMessage("status was not set by server")
+ .build();
Timestamp deliveryTimestampFromRemote = null;
List<Message> messageList = new ArrayList<>();
while (it.hasNext()) {
@@ -112,8 +112,7 @@ abstract class ConsumerImpl extends ClientImpl {
return new ReceiveMessageResult(endpoints, context.getRpcContext().getRequestId(), status, messages);
}, MoreExecutors.directExecutor());
} catch (Throwable t) {
- future0.setException(t);
- return future0;
+ return Futures.immediateFailedFuture(t);
}
}
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ReceiveMessageResult.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ReceiveMessageResult.java
index b107d78..58c2206 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ReceiveMessageResult.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/ReceiveMessageResult.java
@@ -54,6 +54,7 @@ public class ReceiveMessageResult {
case ILLEGAL_TOPIC:
case ILLEGAL_CONSUMER_GROUP:
case ILLEGAL_FILTER_EXPRESSION:
+ case ILLEGAL_INVISIBLE_TIME:
case CLIENT_ID_REQUIRED:
this.exception = new BadRequestException(code.getNumber(), status.getMessage());
break;
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java
index 77750e1..f5029f1 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/consumer/SimpleConsumerImpl.java
@@ -316,6 +316,7 @@ class SimpleConsumerImpl extends ConsumerImpl implements SimpleConsumer {
case BAD_REQUEST:
case ILLEGAL_TOPIC:
case ILLEGAL_CONSUMER_GROUP:
+ case ILLEGAL_INVISIBLE_TIME:
case INVALID_RECEIPT_HANDLE:
case CLIENT_ID_REQUIRED:
throw new BadRequestException(code.getNumber(), status.getMessage());
diff --git a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/SendReceiptImpl.java b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/SendReceiptImpl.java
index 74a6f10..400b2bc 100644
--- a/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/SendReceiptImpl.java
+++ b/java/client/src/main/java/org/apache/rocketmq/client/java/impl/producer/SendReceiptImpl.java
@@ -98,6 +98,7 @@ public class SendReceiptImpl implements SendReceipt {
case ILLEGAL_MESSAGE_GROUP:
case ILLEGAL_MESSAGE_PROPERTY_KEY:
case ILLEGAL_MESSAGE_ID:
+ case ILLEGAL_DELIVERY_TIME:
case MESSAGE_PROPERTY_CONFLICT_WITH_TYPE:
case MESSAGE_CORRUPTED:
case CLIENT_ID_REQUIRED:
[rocketmq-clients] 01/02: Set grpc log level to error
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aaronai pushed a commit to branch java_dev
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
commit de82889067279874cc59489446591109d51c9b3b
Author: Aaron Ai <ya...@gmail.com>
AuthorDate: Wed Jul 13 10:33:24 2022 +0800
Set grpc log level to error
---
java/client-shade/src/main/resources/rocketmq.logback.xml | 3 +--
java/client/src/main/resources/logback.xml | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/client-shade/src/main/resources/rocketmq.logback.xml b/java/client-shade/src/main/resources/rocketmq.logback.xml
index b7f694b..344b29f 100644
--- a/java/client-shade/src/main/resources/rocketmq.logback.xml
+++ b/java/client-shade/src/main/resources/rocketmq.logback.xml
@@ -33,6 +33,5 @@
<appender-ref ref="DefaultAppender" additivity="false"/>
</root>
<!-- ref: https://github.com/grpc/grpc-java/issues/3033 -->
- <logger name="io.grpc" level="error"/>
- <logger name="org.apache.rocketmq.shaded.io.grpc" level="error"/>
+ <logger name="org.apache.rocketmq.shaded.io.grpc" level="${rocketmq.grpc.log.level:-error}"/>
</configuration>
\ No newline at end of file
diff --git a/java/client/src/main/resources/logback.xml b/java/client/src/main/resources/logback.xml
index 5e85f1e..5e5aabe 100644
--- a/java/client/src/main/resources/logback.xml
+++ b/java/client/src/main/resources/logback.xml
@@ -33,6 +33,5 @@
<appender-ref ref="DefaultAppender" additivity="false"/>
</root>
<!-- ref: https://github.com/grpc/grpc-java/issues/3033 -->
- <logger name="io.grpc" level="error"/>
- <logger name="org.apache.rocketmq.shaded.io.grpc" level="error"/>
+ <logger name="io.grpc" level="${rocketmq.grpc.log.level:-error}"/>
</configuration>
\ No newline at end of file