This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new f28c2fec72 Fix alibaba Rpc compact (#12581)
f28c2fec72 is described below
commit f28c2fec72c16c6b77be1b6ad7615562f5a5eecc
Author: Albumen Kevin <[email protected]>
AuthorDate: Thu Jun 22 08:49:23 2023 +0800
Fix alibaba Rpc compact (#12581)
* Fix alibaba Rpc compact
* Fix alibaba Rpc compact
* Fix alibaba Rpc compact
* Fix alibaba Rpc compact
---
.../java/com/alibaba/dubbo/common/Constants.java | 541 ++++++++++++++++++++-
.../java/com/alibaba/dubbo/rpc/RpcContext.java | 20 +
.../java/com/alibaba/dubbo/rpc/RpcException.java | 6 +-
3 files changed, 551 insertions(+), 16 deletions(-)
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
index f62a9bd177..4ed46e5e23 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/common/Constants.java
@@ -23,21 +23,532 @@ import org.apache.dubbo.common.constants.QosConstants;
import org.apache.dubbo.common.constants.RegistryConstants;
import org.apache.dubbo.common.constants.RemotingConstants;
+import java.util.concurrent.ExecutorService;
+import java.util.regex.Pattern;
+
@Deprecated
public class Constants implements CommonConstants,
- QosConstants,
- FilterConstants,
- RegistryConstants,
- RemotingConstants,
- org.apache.dubbo.config.Constants,
- org.apache.dubbo.remoting.Constants,
- org.apache.dubbo.rpc.cluster.Constants,
- org.apache.dubbo.monitor.Constants,
- org.apache.dubbo.rpc.Constants,
- org.apache.dubbo.rpc.protocol.dubbo.Constants,
- org.apache.dubbo.common.serialize.Constants,
- org.apache.dubbo.common.config.configcenter.Constants,
- org.apache.dubbo.metadata.report.support.Constants ,
- org.apache.dubbo.rpc.protocol.rest.Constants,
- org.apache.dubbo.registry.Constants {
+ QosConstants,
+ FilterConstants,
+ RegistryConstants,
+ RemotingConstants,
+ org.apache.dubbo.config.Constants,
+ org.apache.dubbo.remoting.Constants,
+ org.apache.dubbo.rpc.cluster.Constants,
+ org.apache.dubbo.monitor.Constants,
+ org.apache.dubbo.rpc.Constants,
+ org.apache.dubbo.rpc.protocol.dubbo.Constants,
+ org.apache.dubbo.common.serialize.Constants,
+ org.apache.dubbo.common.config.configcenter.Constants,
+ org.apache.dubbo.metadata.report.support.Constants,
+ org.apache.dubbo.rpc.protocol.rest.Constants,
+ org.apache.dubbo.registry.Constants {
+ public static final String PROVIDER = "provider";
+
+ public static final String CONSUMER = "consumer";
+
+ public static final String REGISTER = "register";
+
+ public static final String UNREGISTER = "unregister";
+
+ public static final String SUBSCRIBE = "subscribe";
+
+ public static final String UNSUBSCRIBE = "unsubscribe";
+
+ public static final String CATEGORY_KEY = "category";
+
+ public static final String PROVIDERS_CATEGORY = "providers";
+
+ public static final String CONSUMERS_CATEGORY = "consumers";
+
+ public static final String ROUTERS_CATEGORY = "routers";
+
+ public static final String CONFIGURATORS_CATEGORY = "configurators";
+
+ public static final String DEFAULT_CATEGORY = PROVIDERS_CATEGORY;
+
+ public static final String ENABLED_KEY = "enabled";
+
+ public static final String DISABLED_KEY = "disabled";
+
+ public static final String VALIDATION_KEY = "validation";
+
+ public static final String CACHE_KEY = "cache";
+
+ public static final String DYNAMIC_KEY = "dynamic";
+
+ public static final String DUBBO_PROPERTIES_KEY = "dubbo.properties.file";
+
+ public static final String DEFAULT_DUBBO_PROPERTIES = "dubbo.properties";
+
+ public static final String SENT_KEY = "sent";
+
+ public static final boolean DEFAULT_SENT = false;
+
+ public static final String REGISTRY_PROTOCOL = "registry";
+
+ public static final String $INVOKE = "$invoke";
+
+ public static final String $ECHO = "$echo";
+
+ public static final int DEFAULT_IO_THREADS = Runtime.getRuntime()
+ .availableProcessors() + 1;
+
+ public static final String DEFAULT_PROXY = "javassist";
+
+ public static final int DEFAULT_PAYLOAD = 8 * 1024 * 1024;
+
+ public static final String DEFAULT_CLUSTER = "failover";
+
+ public static final String DEFAULT_DIRECTORY = "dubbo";
+
+ public static final String DEFAULT_LOADBALANCE = "random";
+
+ public static final String DEFAULT_PROTOCOL = "dubbo";
+
+ public static final String DEFAULT_EXCHANGER = "header";
+
+ public static final String DEFAULT_TRANSPORTER = "netty";
+
+ public static final String DEFAULT_REMOTING_SERVER = "netty";
+
+ public static final String DEFAULT_REMOTING_CLIENT = "netty";
+
+ public static final String DEFAULT_REMOTING_CODEC = "dubbo";
+
+ public static final String DEFAULT_REMOTING_SERIALIZATION = "hessian2";
+
+ public static final String DEFAULT_HTTP_SERVER = "servlet";
+
+ public static final String DEFAULT_HTTP_CLIENT = "jdk";
+
+ public static final String DEFAULT_HTTP_SERIALIZATION = "json";
+
+ public static final String DEFAULT_CHARSET = "UTF-8";
+
+ public static final int DEFAULT_WEIGHT = 100;
+
+ public static final int DEFAULT_FORKS = 2;
+
+ public static final String DEFAULT_THREAD_NAME = "Dubbo";
+
+ public static final int DEFAULT_CORE_THREADS = 0;
+
+ public static final int DEFAULT_THREADS = 200;
+
+ public static final int DEFAULT_QUEUES = 0;
+
+ public static final int DEFAULT_ALIVE = 60 * 1000;
+
+ public static final int DEFAULT_CONNECTIONS = 0;
+
+ public static final int DEFAULT_ACCEPTS = 0;
+
+ public static final int DEFAULT_IDLE_TIMEOUT = 600 * 1000;
+
+ public static final int DEFAULT_HEARTBEAT = 60 * 1000;
+
+ public static final int DEFAULT_TIMEOUT = 1000;
+
+ public static final int DEFAULT_CONNECT_TIMEOUT = 3000;
+
+ public static final int DEFAULT_RETRIES = 2;
+
+ public static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
+
+ public static final int MAX_BUFFER_SIZE = 16 * 1024;
+
+ public static final int MIN_BUFFER_SIZE = 1 * 1024;
+
+ public static final String REMOVE_VALUE_PREFIX = "-";
+
+ public static final String HIDE_KEY_PREFIX = ".";
+
+ public static final String DEFAULT_KEY_PREFIX = "default.";
+
+ public static final String DEFAULT_KEY = "default";
+
+ public static final String LOADBALANCE_KEY = "loadbalance";
+
+ public static final String ROUTER_KEY = "router";
+
+ public static final String CLUSTER_KEY = "cluster";
+
+ public static final String REGISTRY_KEY = "registry";
+
+ public static final String MONITOR_KEY = "monitor";
+
+ public static final String SIDE_KEY = "side";
+
+ public static final String PROVIDER_SIDE = "provider";
+
+ public static final String CONSUMER_SIDE = "consumer";
+
+ public static final String DEFAULT_REGISTRY = "dubbo";
+
+ public static final String BACKUP_KEY = "backup";
+
+ public static final String DIRECTORY_KEY = "directory";
+
+ public static final String DEPRECATED_KEY = "deprecated";
+
+ public static final String ANYHOST_KEY = "anyhost";
+
+ public static final String ANYHOST_VALUE = "0.0.0.0";
+
+ public static final String LOCALHOST_KEY = "localhost";
+
+ public static final String LOCALHOST_VALUE = "127.0.0.1";
+
+ public static final String APPLICATION_KEY = "application";
+
+ public static final String LOCAL_KEY = "local";
+
+ public static final String STUB_KEY = "stub";
+
+ public static final String MOCK_KEY = "mock";
+
+ public static final String PROTOCOL_KEY = "protocol";
+
+ public static final String PROXY_KEY = "proxy";
+
+ public static final String WEIGHT_KEY = "weight";
+
+ public static final String FORKS_KEY = "forks";
+
+ public static final String DEFAULT_THREADPOOL = "limited";
+
+ public static final String DEFAULT_CLIENT_THREADPOOL = "cached";
+
+ public static final String THREADPOOL_KEY = "threadpool";
+
+ public static final String THREAD_NAME_KEY = "threadname";
+
+ public static final String IO_THREADS_KEY = "iothreads";
+
+ public static final String CORE_THREADS_KEY = "corethreads";
+
+ public static final String THREADS_KEY = "threads";
+
+ public static final String QUEUES_KEY = "queues";
+
+ public static final String ALIVE_KEY = "alive";
+
+ public static final String EXECUTES_KEY = "executes";
+
+ public static final String BUFFER_KEY = "buffer";
+
+ public static final String PAYLOAD_KEY = "payload";
+
+ public static final String REFERENCE_FILTER_KEY = "reference.filter";
+
+ public static final String INVOKER_LISTENER_KEY = "invoker.listener";
+
+ public static final String SERVICE_FILTER_KEY = "service.filter";
+
+ public static final String EXPORTER_LISTENER_KEY = "exporter.listener";
+
+ public static final String ACCESS_LOG_KEY = "accesslog";
+
+ public static final String ACTIVES_KEY = "actives";
+
+ public static final String CONNECTIONS_KEY = "connections";
+
+ public static final String ACCEPTS_KEY = "accepts";
+
+ public static final String IDLE_TIMEOUT_KEY = "idle.timeout";
+
+ public static final String HEARTBEAT_KEY = "heartbeat";
+
+ public static final String HEARTBEAT_TIMEOUT_KEY = "heartbeat.timeout";
+
+ public static final String CONNECT_TIMEOUT_KEY = "connect.timeout";
+
+ public static final String TIMEOUT_KEY = "timeout";
+
+ public static final String RETRIES_KEY = "retries";
+
+ public static final String PROMPT_KEY = "prompt";
+
+ public static final String DEFAULT_PROMPT = "dubbo>";
+
+ public static final String CODEC_KEY = "codec";
+
+ public static final String SERIALIZATION_KEY = "serialization";
+
+ public static final String EXCHANGER_KEY = "exchanger";
+
+ public static final String TRANSPORTER_KEY = "transporter";
+
+ public static final String SERVER_KEY = "server";
+
+ public static final String CLIENT_KEY = "client";
+
+ public static final String ID_KEY = "id";
+
+ public static final String ASYNC_KEY = "async";
+
+ public static final String RETURN_KEY = "return";
+
+ public static final String TOKEN_KEY = "token";
+
+ public static final String METHOD_KEY = "method";
+
+ public static final String METHODS_KEY = "methods";
+
+ public static final String CHARSET_KEY = "charset";
+
+ public static final String RECONNECT_KEY = "reconnect";
+
+ public static final String SEND_RECONNECT_KEY = "send.reconnect";
+
+ public static final int DEFAULT_RECONNECT_PERIOD = 2000;
+
+ public static final String SHUTDOWN_TIMEOUT_KEY = "shutdown.timeout";
+
+ public static final int DEFAULT_SHUTDOWN_TIMEOUT = 1000 * 60 * 15;
+
+ public static final String PID_KEY = "pid";
+
+ public static final String TIMESTAMP_KEY = "timestamp";
+
+ public static final String WARMUP_KEY = "warmup";
+
+ public static final int DEFAULT_WARMUP = 10 * 60 * 1000;
+
+ public static final String CHECK_KEY = "check";
+
+ public static final String REGISTER_KEY = "register";
+
+ public static final String SUBSCRIBE_KEY = "subscribe";
+
+ public static final String GROUP_KEY = "group";
+
+ public static final String PATH_KEY = "path";
+
+ public static final String INTERFACE_KEY = "interface";
+
+ public static final String GENERIC_KEY = "generic";
+
+ public static final String FILE_KEY = "file";
+
+ public static final String WAIT_KEY = "wait";
+
+ public static final String CLASSIFIER_KEY = "classifier";
+
+ public static final String VERSION_KEY = "version";
+
+ public static final String REVISION_KEY = "revision";
+
+ public static final String DUBBO_VERSION_KEY = "dubbo";
+
+ public static final String HESSIAN_VERSION_KEY = "hessian.version";
+
+ public static final String DISPATCHER_KEY = "dispatcher";
+
+ public static final String CHANNEL_HANDLER_KEY = "channel.handler";
+
+ public static final String DEFAULT_CHANNEL_HANDLER = "default";
+
+ public static final String ANY_VALUE = "*";
+
+ public static final String COMMA_SEPARATOR = ",";
+
+ public static final Pattern COMMA_SPLIT_PATTERN = Pattern
+ .compile("\\s*[,]+\\s*");
+
+ public final static String PATH_SEPARATOR = "/";
+
+ public static final String REGISTRY_SEPARATOR = "|";
+
+ public static final Pattern REGISTRY_SPLIT_PATTERN = Pattern
+ .compile("\\s*[|;]+\\s*");
+
+ public static final String SEMICOLON_SEPARATOR = ";";
+
+ public static final Pattern SEMICOLON_SPLIT_PATTERN = Pattern
+ .compile("\\s*[;]+\\s*");
+
+ public static final String CONNECT_QUEUE_CAPACITY =
"connect.queue.capacity";
+
+ public static final String CONNECT_QUEUE_WARNING_SIZE =
"connect.queue.warning.size";
+
+ public static final int DEFAULT_CONNECT_QUEUE_WARNING_SIZE = 1000;
+
+ public static final String CHANNEL_ATTRIBUTE_READONLY_KEY =
"channel.readonly";
+
+ public static final String CHANNEL_READONLYEVENT_SENT_KEY =
"channel.readonly.sent";
+
+ public static final String CHANNEL_SEND_READONLYEVENT_KEY =
"channel.readonly.send";
+
+ public static final String COUNT_PROTOCOL = "count";
+
+ public static final String TRACE_PROTOCOL = "trace";
+
+ public static final String EMPTY_PROTOCOL = "empty";
+
+ public static final String ADMIN_PROTOCOL = "admin";
+
+ public static final String PROVIDER_PROTOCOL = "provider";
+
+ public static final String CONSUMER_PROTOCOL = "consumer";
+
+ public static final String ROUTE_PROTOCOL = "route";
+
+ public static final String SCRIPT_PROTOCOL = "script";
+
+ public static final String CONDITION_PROTOCOL = "condition";
+
+ public static final String MOCK_PROTOCOL = "mock";
+
+ public static final String RETURN_PREFIX = "return ";
+
+ public static final String THROW_PREFIX = "throw";
+
+ public static final String FAIL_PREFIX = "fail:";
+
+ public static final String FORCE_PREFIX = "force:";
+
+ public static final String FORCE_KEY = "force";
+
+ public static final String MERGER_KEY = "merger";
+
+ public static final String CLUSTER_AVAILABLE_CHECK_KEY =
"cluster.availablecheck";
+
+ public static final boolean DEFAULT_CLUSTER_AVAILABLE_CHECK = true;
+
+ public static final String CLUSTER_STICKY_KEY = "sticky";
+
+ public static final boolean DEFAULT_CLUSTER_STICKY = false;
+
+ public static final String LAZY_CONNECT_KEY = "lazy";
+
+ public static final String LAZY_CONNECT_INITIAL_STATE_KEY =
"connect.lazy.initial.state";
+
+ public static final boolean DEFAULT_LAZY_CONNECT_INITIAL_STATE = true;
+
+ public static final String REGISTRY_FILESAVE_SYNC_KEY = "save.file";
+
+ public static final String REGISTRY_RETRY_PERIOD_KEY = "retry.period";
+
+ public static final int DEFAULT_REGISTRY_RETRY_PERIOD = 5 * 1000;
+
+ public static final String REGISTRY_RECONNECT_PERIOD_KEY =
"reconnect.period";
+
+ public static final int DEFAULT_REGISTRY_RECONNECT_PERIOD = 3 * 1000;
+
+ public static final String SESSION_TIMEOUT_KEY = "session";
+
+ public static final int DEFAULT_SESSION_TIMEOUT = 60 * 1000;
+
+ public static final String EXPORT_KEY = "export";
+
+ public static final String REFER_KEY = "refer";
+
+ public static final String CALLBACK_SERVICE_KEY =
"callback.service.instid";
+
+ public static final String CALLBACK_INSTANCES_LIMIT_KEY = "callbacks";
+
+ public static final int DEFAULT_CALLBACK_INSTANCES = 1;
+
+ public static final String CALLBACK_SERVICE_PROXY_KEY =
"callback.service.proxy";
+
+ public static final String IS_CALLBACK_SERVICE = "is_callback_service";
+
+ public static final String CHANNEL_CALLBACK_KEY =
"channel.callback.invokers.key";
+
+ @Deprecated
+ public static final String SHUTDOWN_WAIT_SECONDS_KEY =
"dubbo.service.shutdown.wait.seconds";
+
+ public static final String SHUTDOWN_WAIT_KEY =
"dubbo.service.shutdown.wait";
+
+ public static final String IS_SERVER_KEY = "isserver";
+
+ public static final int DEFAULT_SERVER_SHUTDOWN_TIMEOUT = 10000;
+
+ public static final String ON_CONNECT_KEY = "onconnect";
+
+ public static final String ON_DISCONNECT_KEY = "ondisconnect";
+
+ public static final String ON_INVOKE_METHOD_KEY = "oninvoke.method";
+
+ public static final String ON_RETURN_METHOD_KEY = "onreturn.method";
+
+ public static final String ON_THROW_METHOD_KEY = "onthrow.method";
+
+ public static final String ON_INVOKE_INSTANCE_KEY = "oninvoke.instance";
+
+ public static final String ON_RETURN_INSTANCE_KEY = "onreturn.instance";
+
+ public static final String ON_THROW_INSTANCE_KEY = "onthrow.instance";
+
+ public static final String OVERRIDE_PROTOCOL = "override";
+
+ public static final String PRIORITY_KEY = "priority";
+
+ public static final String RULE_KEY = "rule";
+
+ public static final String TYPE_KEY = "type";
+
+ public static final String RUNTIME_KEY = "runtime";
+
+ public static final String ROUTER_TYPE_CLEAR = "clean";
+
+ public static final String DEFAULT_SCRIPT_TYPE_KEY = "javascript";
+
+ public static final String STUB_EVENT_KEY = "dubbo.stub.event";
+
+ public static final boolean DEFAULT_STUB_EVENT = false;
+
+ public static final String STUB_EVENT_METHODS_KEY =
"dubbo.stub.event.methods";
+
+ public static final String INVOCATION_NEED_MOCK = "invocation.need.mock";
+
+ public static final String LOCAL_PROTOCOL = "injvm";
+
+ public static final String AUTO_ATTACH_INVOCATIONID_KEY =
"invocationid.autoattach";
+
+ public static final String SCOPE_KEY = "scope";
+
+ public static final String SCOPE_LOCAL = "local";
+
+ public static final String SCOPE_REMOTE = "remote";
+
+ public static final String SCOPE_NONE = "none";
+
+ public static final String RELIABLE_PROTOCOL = "napoli";
+
+ public static final String TPS_LIMIT_RATE_KEY = "tps";
+
+ public static final String TPS_LIMIT_INTERVAL_KEY = "tps.interval";
+
+ public static final long DEFAULT_TPS_LIMIT_INTERVAL = 60 * 1000;
+
+ public static final String DECODE_IN_IO_THREAD_KEY = "decode.in.io";
+
+ public static final boolean DEFAULT_DECODE_IN_IO_THREAD = true;
+
+ public static final String INPUT_KEY = "input";
+
+ public static final String OUTPUT_KEY = "output";
+
+ public static final String EXECUTOR_SERVICE_COMPONENT_KEY =
ExecutorService.class.getName();
+
+ public static final String GENERIC_SERIALIZATION_NATIVE_JAVA =
"nativejava";
+
+ public static final String GENERIC_SERIALIZATION_DEFAULT = "true";
+
+ public static final String INVOKER_CONNECTED_KEY = "connected";
+
+ public static final String INVOKER_INSIDE_INVOKERS_KEY = "inside.invokers";
+
+ public static final String INVOKER_INSIDE_INVOKER_COUNT_KEY =
"inside.invoker.count";
+
+ public static final String CLUSTER_SWITCH_FACTOR = "cluster.switch.factor";
+
+ public static final String CLUSTER_SWITCH_LOG_ERROR =
"cluster.switch.log.error";
+
+ public static final double DEFAULT_CLUSTER_SWITCH_FACTOR = 2;
+
+ public static final String DISPATHER_KEY = "dispather";
}
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java
index 4c49bc1793..cfc5fb4b8b 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java
@@ -37,6 +37,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
@Deprecated
public class RpcContext {
@@ -320,6 +321,25 @@ public class RpcContext {
return isConsumerSide();
}
+ @Deprecated
+ public Invoker<?> getInvoker() {
+ org.apache.dubbo.rpc.Invoker<?> invoker = newRpcContext.getInvoker();
+ if (invoker == null) {
+ return null;
+ }
+ return new Invoker.CompatibleInvoker<>(invoker);
+ }
+
+ @Deprecated
+ public List<Invoker<?>> getInvokers() {
+ List<org.apache.dubbo.rpc.Invoker<?>> invokers =
newRpcContext.getInvokers();
+ if (CollectionUtils.isEmpty(invokers)) {
+ return Collections.emptyList();
+ }
+ return invokers.stream()
+ .map(Invoker.CompatibleInvoker::new)
+ .collect(Collectors.toList());
+ }
/**
* Async invocation. Timeout will be handled even if
<code>Future.get()</code> is not called.
*
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcException.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcException.java
index 07923c6ee5..1e994019ac 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcException.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcException.java
@@ -19,7 +19,7 @@ package com.alibaba.dubbo.rpc;
@Deprecated
public class RpcException extends org.apache.dubbo.rpc.RpcException {
-
+
public RpcException() {
super();
}
@@ -51,4 +51,8 @@ public class RpcException extends
org.apache.dubbo.rpc.RpcException {
public RpcException(int code, Throwable cause) {
super(code, cause);
}
+
+ public boolean isForbidded() {
+ return isForbidden();
+ }
}
