Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.0-Triple]Fix compressor flag = 1 when compressor is none #9018

Merged
merged 1 commit into from
Oct 11, 2021
Merged

[3.0-Triple]Fix compressor flag = 1 when compressor is none #9018

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@
public class TripleUtil {

public static final AttributeKey<AbstractServerStream> SERVER_STREAM_KEY = AttributeKey.newInstance(
"tri_server_stream");
"tri_server_stream");
public static final AttributeKey<AbstractClientStream> CLIENT_STREAM_KEY = AttributeKey.newInstance(
"tri_client_stream");
"tri_client_stream");
public static final AttributeKey<Compressor> COMPRESSOR_KEY = AttributeKey.newInstance(
"tri_compressor");

"tri_compressor");
public static final String LANGUAGE = "java";
// Some exceptions are not very useful and add too much noise to the log
private static final Set<String> QUIET_EXCEPTIONS = new HashSet<>();
private static final Set<Class<?>> QUIET_EXCEPTIONS_CLASS = new HashSet<>();
private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder().withoutPadding();

static {
QUIET_EXCEPTIONS.add("NativeIoException");
Expand All @@ -83,12 +85,6 @@ public static boolean isQuiteException(Throwable t) {
return false;
}


public static final String LANGUAGE = "java";

private static final Base64.Decoder BASE64_DECODER = Base64.getDecoder();
private static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder().withoutPadding();

public static AbstractServerStream getServerStream(ChannelHandlerContext ctx) {
return ctx.channel().attr(TripleUtil.SERVER_STREAM_KEY).get();
}
Expand All @@ -103,7 +99,10 @@ public static Compressor getCompressor(ChannelHandlerContext ctx) {

public static int calcCompressFlag(ChannelHandlerContext ctx) {
Compressor compressor = getCompressor(ctx);
return null == compressor ? 0 : 1;
if (null == compressor || IdentityCompressor.NONE.equals(compressor)) {
return 0;
}
return 1;
}

/**
Expand Down Expand Up @@ -176,7 +175,7 @@ public static Object[] unwrapReq(URL url, TripleWrapper.TripleRequestWrapper wra
for (int i = 0; i < arguments.length; i++) {
final ByteArrayInputStream bais = new ByteArrayInputStream(wrap.getArgs(i).toByteArray());
Object obj = multipleSerialization.deserialize(url,
serializeType, wrap.getArgTypes(i), bais);
serializeType, wrap.getArgTypes(i), bais);
arguments[i] = obj;
}
return arguments;
Expand All @@ -190,8 +189,8 @@ public static TripleWrapper.TripleResponseWrapper wrapResp(URL url, String seria
MultipleSerialization multipleSerialization) {
try {
final TripleWrapper.TripleResponseWrapper.Builder builder = TripleWrapper.TripleResponseWrapper.newBuilder()
.setType(desc.getReturnClass().getName())
.setSerializeType(convertHessianToWrapper(serializeType));
.setType(desc.getReturnClass().getName())
.setSerializeType(convertHessianToWrapper(serializeType));
ByteArrayOutputStream bos = new ByteArrayOutputStream();
multipleSerialization.serialize(url, serializeType, desc.getReturnClass().getName(), resp, bos);
builder.setData(ByteString.copyFrom(bos.toByteArray()));
Expand All @@ -207,9 +206,9 @@ public static TripleWrapper.TripleExceptionWrapper wrapException(URL url, Throwa
MultipleSerialization serialization) {
try {
final TripleWrapper.TripleExceptionWrapper.Builder builder = TripleWrapper.TripleExceptionWrapper.newBuilder()
.setLanguage(LANGUAGE)
.setClassName(throwable.getClass().getName())
.setSerialization(serializeType);
.setLanguage(LANGUAGE)
.setClassName(throwable.getClass().getName())
.setSerialization(serializeType);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
serialization.serialize(url, serializeType, builder.getClassName(), throwable, bos);
builder.setData(ByteString.copyFrom(bos.toByteArray()));
Expand Down Expand Up @@ -246,8 +245,8 @@ public static TripleWrapper.TripleRequestWrapper wrapReq(URL url, String seriali
MultipleSerialization multipleSerialization) {
try {
final TripleWrapper.TripleRequestWrapper.Builder builder = TripleWrapper.TripleRequestWrapper.newBuilder()
.addArgTypes(type)
.setSerializeType(convertHessianToWrapper(serializeType));
.addArgTypes(type)
.setSerializeType(convertHessianToWrapper(serializeType));
ByteArrayOutputStream bos = new ByteArrayOutputStream();
multipleSerialization.serialize(url, serializeType, type, req, bos);
builder.addArgs(ByteString.copyFrom(bos.toByteArray()));
Expand All @@ -263,7 +262,7 @@ public static TripleWrapper.TripleRequestWrapper wrapReq(URL url, RpcInvocation
try {
String serializationName = (String) invocation.getObjectAttachment(Constants.SERIALIZATION_KEY);
final TripleWrapper.TripleRequestWrapper.Builder builder = TripleWrapper.TripleRequestWrapper.newBuilder()
.setSerializeType(convertHessianToWrapper(serializationName));
.setSerializeType(convertHessianToWrapper(serializationName));
for (int i = 0; i < invocation.getArguments().length; i++) {
final String clz = invocation.getParameterTypes()[i].getName();
builder.addArgTypes(clz);
Expand Down Expand Up @@ -314,14 +313,14 @@ public static byte[] pack(Object obj) {
}

public static String encodeWrapper(URL url, Object obj, String serializeType, MultipleSerialization serialization)
throws IOException {
throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
serialization.serialize(url, serializeType, obj.getClass().getName(), obj, bos);
final TripleWrapper.TripleRequestWrapper wrap = TripleWrapper.TripleRequestWrapper.newBuilder()
.setSerializeType(convertHessianToWrapper(serializeType))
.addArgTypes(obj.getClass().getName())
.addArgs(ByteString.copyFrom(bos.toByteArray()))
.build();
.setSerializeType(convertHessianToWrapper(serializeType))
.addArgTypes(obj.getClass().getName())
.addArgs(ByteString.copyFrom(bos.toByteArray()))
.build();
return encodeBase64ASCII(wrap.toByteArray());
}

Expand All @@ -335,7 +334,7 @@ public static byte[] encodeBase64(byte[] in) {
}

public static Object decodeObjFromHeader(URL url, CharSequence value, MultipleSerialization serialization)
throws InvalidProtocolBufferException {
throws InvalidProtocolBufferException {
final byte[] decode = decodeASCIIByte(value);
final TripleWrapper.TripleRequestWrapper wrapper = TripleWrapper.TripleRequestWrapper.parseFrom(decode);
final Object[] objects = TripleUtil.unwrapReq(url, wrapper, serialization);
Expand Down