You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2021/07/23 05:32:48 UTC
[rocketmq] branch develop updated: Upgrade netty-all dependency
version to 4.1.65.Final
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 361eb8d Upgrade netty-all dependency version to 4.1.65.Final
new 9a9039e Merge pull request #3032 from messense/upgrade-netty-all
361eb8d is described below
commit 361eb8d286c3bdc19260d4315a87fa8427673fa5
Author: messense <me...@icloud.com>
AuthorDate: Tue Jun 22 22:34:55 2021 +0800
Upgrade netty-all dependency version to 4.1.65.Final
---
.../broker/pagecache/ManyMessageTransfer.java | 27 +++++++++++++
.../broker/pagecache/OneMessageTransfer.java | 27 +++++++++++++
.../broker/pagecache/QueryMessageTransfer.java | 27 +++++++++++++
pom.xml | 2 +-
.../rocketmq/remoting/netty/NettyLogger.java | 46 ++++++++++++++++++++++
5 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransfer.java b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransfer.java
index 968bcfb..373a0a4 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransfer.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/ManyMessageTransfer.java
@@ -54,6 +54,11 @@ public class ManyMessageTransfer extends AbstractReferenceCounted implements Fil
}
@Override
+ public long transferred() {
+ return transferred;
+ }
+
+ @Override
public long count() {
return byteBufferHeader.limit() + this.getMessageResult.getBufferTotalSize();
}
@@ -76,6 +81,28 @@ public class ManyMessageTransfer extends AbstractReferenceCounted implements Fil
return 0;
}
+ @Override
+ public FileRegion retain() {
+ super.retain();
+ return this;
+ }
+
+ @Override
+ public FileRegion retain(int increment) {
+ super.retain(increment);
+ return this;
+ }
+
+ @Override
+ public FileRegion touch() {
+ return this;
+ }
+
+ @Override
+ public FileRegion touch(Object hint) {
+ return this;
+ }
+
public void close() {
this.deallocate();
}
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/OneMessageTransfer.java b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/OneMessageTransfer.java
index b795d2d..558f091 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/OneMessageTransfer.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/OneMessageTransfer.java
@@ -48,6 +48,11 @@ public class OneMessageTransfer extends AbstractReferenceCounted implements File
}
@Override
+ public long transferred() {
+ return transferred;
+ }
+
+ @Override
public long count() {
return this.byteBufferHeader.limit() + this.selectMappedBufferResult.getSize();
}
@@ -65,6 +70,28 @@ public class OneMessageTransfer extends AbstractReferenceCounted implements File
return 0;
}
+ @Override
+ public FileRegion retain() {
+ super.retain();
+ return this;
+ }
+
+ @Override
+ public FileRegion retain(int increment) {
+ super.retain(increment);
+ return this;
+ }
+
+ @Override
+ public FileRegion touch() {
+ return this;
+ }
+
+ @Override
+ public FileRegion touch(Object hint) {
+ return this;
+ }
+
public void close() {
this.deallocate();
}
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/QueryMessageTransfer.java b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/QueryMessageTransfer.java
index e8f3099..db47b9e 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/pagecache/QueryMessageTransfer.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/pagecache/QueryMessageTransfer.java
@@ -54,6 +54,11 @@ public class QueryMessageTransfer extends AbstractReferenceCounted implements Fi
}
@Override
+ public long transferred() {
+ return transferred;
+ }
+
+ @Override
public long count() {
return byteBufferHeader.limit() + this.queryMessageResult.getBufferTotalSize();
}
@@ -76,6 +81,28 @@ public class QueryMessageTransfer extends AbstractReferenceCounted implements Fi
return 0;
}
+ @Override
+ public FileRegion retain() {
+ super.retain();
+ return this;
+ }
+
+ @Override
+ public FileRegion retain(int increment) {
+ super.retain(increment);
+ return this;
+ }
+
+ @Override
+ public FileRegion touch() {
+ return this;
+ }
+
+ @Override
+ public FileRegion touch(Object hint) {
+ return this;
+ }
+
public void close() {
this.deallocate();
}
diff --git a/pom.xml b/pom.xml
index b6f1770..59fe5c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,7 +537,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.42.Final</version>
+ <version>4.1.65.Final</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyLogger.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyLogger.java
index 4b4e86e..1a0c9b5 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyLogger.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyLogger.java
@@ -52,6 +52,8 @@ public class NettyLogger {
private InternalLogger logger = null;
+ private static final String EXCEPTION_MESSAGE = "Unexpected exception:";
+
public NettyBridgeLogger(String name) {
logger = InternalLoggerFactory.getLogger(name);
}
@@ -162,6 +164,25 @@ public class NettyLogger {
}
@Override
+ public void log(InternalLogLevel internalLogLevel, Throwable throwable) {
+ if (internalLogLevel.equals(InternalLogLevel.DEBUG)) {
+ logger.debug(EXCEPTION_MESSAGE, throwable);
+ }
+ if (internalLogLevel.equals(InternalLogLevel.TRACE)) {
+ logger.info(EXCEPTION_MESSAGE, throwable);
+ }
+ if (internalLogLevel.equals(InternalLogLevel.INFO)) {
+ logger.info(EXCEPTION_MESSAGE, throwable);
+ }
+ if (internalLogLevel.equals(InternalLogLevel.WARN)) {
+ logger.warn(EXCEPTION_MESSAGE, throwable);
+ }
+ if (internalLogLevel.equals(InternalLogLevel.ERROR)) {
+ logger.error(EXCEPTION_MESSAGE, throwable);
+ }
+ }
+
+ @Override
public boolean isTraceEnabled() {
return isEnabled(InternalLogLevel.TRACE);
}
@@ -192,6 +213,11 @@ public class NettyLogger {
}
@Override
+ public void trace(Throwable var1) {
+ logger.info(EXCEPTION_MESSAGE, var1);
+ }
+
+ @Override
public boolean isDebugEnabled() {
return isEnabled(InternalLogLevel.DEBUG);
}
@@ -222,6 +248,11 @@ public class NettyLogger {
}
@Override
+ public void debug(Throwable var1) {
+ logger.debug(EXCEPTION_MESSAGE, var1);
+ }
+
+ @Override
public boolean isInfoEnabled() {
return isEnabled(InternalLogLevel.INFO);
}
@@ -252,6 +283,11 @@ public class NettyLogger {
}
@Override
+ public void info(Throwable var1) {
+ logger.info(EXCEPTION_MESSAGE, var1);
+ }
+
+ @Override
public boolean isWarnEnabled() {
return isEnabled(InternalLogLevel.WARN);
}
@@ -282,6 +318,11 @@ public class NettyLogger {
}
@Override
+ public void warn(Throwable var1) {
+ logger.warn(EXCEPTION_MESSAGE, var1);
+ }
+
+ @Override
public boolean isErrorEnabled() {
return isEnabled(InternalLogLevel.ERROR);
}
@@ -310,6 +351,11 @@ public class NettyLogger {
public void error(String var1, Throwable var2) {
logger.error(var1, var2);
}
+
+ @Override
+ public void error(Throwable var1) {
+ logger.error(EXCEPTION_MESSAGE, var1);
+ }
}
}