Merge branch 5.0.0-preview into pop_consumer

This commit is contained in:
duhenglucky
2021-06-29 13:39:20 +08:00
88 changed files with 1194 additions and 431 deletions
+1 -1
View File
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-all</artifactId>
<version>4.8.1-SNAPSHOT</version>
<version>4.9.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@ package org.apache.rocketmq.common;
public class MQVersion {
public static final int CURRENT_VERSION = Version.V4_8_0.ordinal();
public static final int CURRENT_VERSION = Version.V4_9_0.ordinal();
public static String getVersionDesc(int value) {
int length = Version.values().length;
@@ -20,10 +20,10 @@ public class PermName {
public static final int PERM_PRIORITY = 0x1 << 3;
public static final int PERM_READ = 0x1 << 2;
public static final int PERM_WRITE = 0x1 << 1;
public static final int PERM_INHERIT = 0x1 << 0;
public static final int PERM_INHERIT = 0x1;
public static String perm2String(final int perm) {
final StringBuffer sb = new StringBuffer("---");
final StringBuilder sb = new StringBuilder("---");
if (isReadable(perm)) {
sb.replace(0, 1, "R");
}
@@ -20,7 +20,7 @@ package org.apache.rocketmq.common.hook;
import java.nio.ByteBuffer;
public interface FilterCheckHook {
public String hookName();
String hookName();
public boolean isFilterMatched(final boolean isUnitMode, final ByteBuffer byteBuffer);
boolean isFilterMatched(final boolean isUnitMode, final ByteBuffer byteBuffer);
}