You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/08/15 04:08:36 UTC
[incubator-linkis] branch revert-2768-merge-1.3.0 created (now f25ab5283)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch revert-2768-merge-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
at f25ab5283 Revert "fix: fix conflict when merge dev-1.3.0 to dev-1.3.1"
This branch includes the following new commits:
new f25ab5283 Revert "fix: fix conflict when merge dev-1.3.0 to dev-1.3.1"
The 1 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/01: Revert "fix: fix conflict when merge dev-1.3.0 to dev-1.3.1"
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch revert-2768-merge-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit f25ab5283d3c4fdb3bbd041a750f2e80639e869c
Author: peacewong <pe...@apache.org>
AuthorDate: Mon Aug 15 12:08:32 2022 +0800
Revert "fix: fix conflict when merge dev-1.3.0 to dev-1.3.1"
---
.github/workflows/auto-comment.yml | 2 +-
.github/workflows/publish-docker.yaml | 85 -
.gitignore | 3 +-
.scalafmt.conf | 43 -
CONTRIBUTING.md | 10 +-
CONTRIBUTING_CN.md | 76 +-
README.md | 133 +-
README_CN.md | 207 +-
docs/index.md | 7 -
tool/license-header => license-header | 1 -
linkis-commons/linkis-common/pom.xml | 321 +--
.../linkis/common/errorcode/ErrorCodeUtils.java | 12 +-
.../errorcode/LinkisCommonsErrorCodeSummary.java | 86 +-
...inkisComputationGovernanceErrorCodeSummary.java | 101 +-
.../LinkisEngineConnErrorCodeSummary.java | 89 +-
.../common/errorcode/LinkisErrorCodeSummary.java | 108 +-
.../errorcode/LinkisExtensionErrorCodeSummary.java | 81 +-
.../errorcode/LinkisFrameErrorCodeSummary.java | 80 +-
.../LinkisPublicEnhancementErrorCodeSummary.java | 82 +-
.../LinkisSpringCloudServiceErrorCodeSummary.java | 80 +-
.../linkis/common/exception/ErrorException.java | 22 +-
.../linkis/common/exception/ExceptionLevel.java | 66 +-
.../linkis/common/exception/ExceptionManager.java | 90 +-
.../linkis/common/exception/FatalException.java | 22 +-
.../exception/LinkisCommonErrorException.java | 14 +-
.../linkis/common/exception/LinkisException.java | 244 +-
.../common/exception/LinkisRetryException.java | 20 +-
.../common/exception/LinkisRuntimeException.java | 201 +-
.../VariableOperationFailedException.java | 14 +-
.../linkis/common/exception/WarnException.java | 22 +-
.../main/java/org/apache/linkis/common/io/Fs.java | 30 +-
.../java/org/apache/linkis/common/io/FsPath.java | 594 ++---
.../apache/linkis/common/utils/ByteTimeUtils.java | 650 ++---
.../org/apache/linkis/common/utils/DESUtil.java | 208 +-
.../common/utils/VariableOperationUtils.java | 325 +--
.../org/apache/linkis/common/ServiceInstance.scala | 33 +-
.../linkis/common/collection/LoopArray.scala | 72 +-
.../linkis/common/conf/BDPConfiguration.scala | 76 +-
.../org/apache/linkis/common/conf/ByteType.scala | 11 +-
.../org/apache/linkis/common/conf/CommonVars.scala | 21 +-
.../apache/linkis/common/conf/Configuration.scala | 25 +-
.../linkis/common/conf/DWCArgumentsParser.scala | 56 +-
.../org/apache/linkis/common/conf/TimeType.scala | 15 +-
.../common/errorcode/CommonErrorConstants.scala | 10 +-
.../org/apache/linkis/common/io/FsReader.scala | 27 +-
.../org/apache/linkis/common/io/FsWriter.scala | 14 +-
.../org/apache/linkis/common/io/MetaData.scala | 9 +-
.../scala/org/apache/linkis/common/io/Record.scala | 9 +-
.../common/io/resultset/ResultDeserializer.scala | 12 +-
.../common/io/resultset/ResultSerializer.scala | 11 +-
.../linkis/common/io/resultset/ResultSet.scala | 73 +-
.../common/io/resultset/ResultSetReader.scala | 23 +-
.../common/io/resultset/ResultSetWriter.scala | 19 +-
.../org/apache/linkis/common/listener/Event.scala | 11 +-
.../linkis/common/listener/EventListener.scala | 11 +-
.../linkis/common/listener/ListenerEventBus.scala | 203 +-
.../common/listener/SingleThreadListenerBus.scala | 14 +-
.../org/apache/linkis/common/log/LogUtils.scala | 12 +-
.../apache/linkis/common/utils/ArrayUtils.scala | 22 +-
.../apache/linkis/common/utils/ClassUtils.scala | 32 +-
.../linkis/common/utils/CodeAndRunTypeUtils.scala | 30 +-
.../apache/linkis/common/utils/FileService.scala | 19 +-
.../org/apache/linkis/common/utils/JavaLog.scala | 33 +-
.../org/apache/linkis/common/utils/JsonUtils.scala | 12 +-
.../org/apache/linkis/common/utils/LDAPUtils.scala | 23 +-
.../org/apache/linkis/common/utils/Logging.scala | 15 +-
.../apache/linkis/common/utils/OverloadUtils.scala | 14 +-
.../org/apache/linkis/common/utils/RSAUtils.scala | 25 +-
.../apache/linkis/common/utils/RefreshUtils.scala | 46 +-
.../apache/linkis/common/utils/RetryHandler.scala | 20 +-
.../apache/linkis/common/utils/ShutdownUtils.scala | 39 +-
.../org/apache/linkis/common/utils/Utils.scala | 156 +-
.../apache/linkis/common/utils/VariableUtils.scala | 290 +--
.../org/apache/linkis/common/utils/ZipUtils.scala | 229 +-
.../linkis/common/variable/CustomDateType.scala | 30 +-
.../linkis/common/variable/DateTypeUtils.scala | 22 +-
.../linkis/common/variable/VariableType.scala | 62 +-
.../common/errorcode/ErrorCodeUtilsTest.java | 20 +-
.../LinkisCommonsErrorCodeSummaryTest.java | 132 +-
...sComputationGovernanceErrorCodeSummaryTest.java | 128 +-
.../errorcode/LinkisErrorCodeSummaryTest.java | 110 +-
.../errorcode/LinkisFrameErrorCodeSummaryTest.java | 96 +-
.../common/exception/ErrorExceptionTest.java | 36 +-
.../common/exception/ExceptionLevelTest.java | 70 +-
.../common/exception/ExceptionManagerTest.java | 166 +-
.../common/exception/FatalExceptionTest.java | 36 +-
.../exception/LinkisCommonErrorExceptionTest.java | 14 +-
.../common/exception/LinkisExceptionTest.java | 196 +-
.../common/exception/LinkisRetryExceptionTest.java | 10 +-
.../exception/LinkisRuntimeExceptionTest.java | 196 +-
.../linkis/common/exception/WarnExceptionTest.java | 35 +-
.../common/variable/VariableOperationTest.java | 131 +-
.../linkis/common/collection/LoopArrayTest.scala | 7 +-
.../linkis/common/utils/ArrayUtilsTest.scala | 3 +-
.../linkis/common/utils/ClassUtilsTest.scala | 32 +-
.../common/utils/CodeAndRunTypeUtilsTest.scala | 21 +-
.../linkis/common/utils/OverloadUtilsTest.scala | 6 +-
.../linkis/common/utils/VariableUtilsTest.scala | 9 +-
.../linkis/common/variable/DateTypeUtilsTest.scala | 6 +-
.../linkis/common/variable/VariableTypeTest.scala | 9 +-
linkis-commons/linkis-hadoop-common/pom.xml | 149 +-
.../linkis/hadoop/common/utils/KerberosUtils.java | 159 +-
.../linkis/hadoop/common/conf/HadoopConf.scala | 24 +-
.../common/entity/HDFSFileSystemContainer.scala | 16 +-
.../linkis/hadoop/common/utils/HDFSUtils.scala | 159 +-
linkis-commons/linkis-httpclient/pom.xml | 145 +-
.../linkis/httpclient/AbstractHttpClient.scala | 340 +--
.../org/apache/linkis/httpclient/Client.scala | 13 +-
.../linkis/httpclient/GenericHttpClient.scala | 31 +-
.../apache/linkis/httpclient/ResultListener.scala | 9 +-
.../AbstractAuthenticationStrategy.scala | 63 +-
.../httpclient/authentication/Authentication.scala | 9 +-
.../authentication/AuthenticationAction.scala | 11 +-
.../authentication/AuthenticationStrategy.scala | 11 +-
.../authentication/HttpAuthentication.scala | 11 +-
.../linkis/httpclient/config/ClientConfig.scala | 44 +-
.../httpclient/config/ClientConfigBuilder.scala | 32 +-
.../httpclient/config/HttpClientConstant.scala | 2 +-
.../httpclient/discovery/AbstractDiscovery.scala | 118 +-
.../linkis/httpclient/discovery/Discovery.scala | 11 +-
.../httpclient/discovery/DiscoveryListener.scala | 9 +-
.../httpclient/discovery/HeartbeatAction.scala | 9 +-
.../httpclient/exception/DiscoveryException.scala | 9 +-
.../exception/HttpClientResultException.scala | 11 +-
.../exception/HttpClientRetryException.scala | 2 +-
.../exception/HttpMessageParseException.scala | 11 +-
.../loadbalancer/AbstractLoadBalancer.scala | 20 +-
.../loadbalancer/DefaultLoadbalancerStrategy.scala | 11 +-
.../httpclient/loadbalancer/LoadBalancer.scala | 11 +-
.../loadbalancer/LoadBalancerStrategy.scala | 9 +-
.../apache/linkis/httpclient/request/Action.scala | 11 +-
.../linkis/httpclient/request/DownloadAction.scala | 13 +-
.../linkis/httpclient/request/GetAction.scala | 22 +-
.../linkis/httpclient/request/HttpAction.scala | 12 +-
.../linkis/httpclient/request/POSTAction.scala | 19 +-
.../linkis/httpclient/request/PutAction.scala | 11 +-
.../httpclient/request/ServerUrlAction.scala | 9 +-
.../linkis/httpclient/request/UploadAction.scala | 52 +-
.../linkis/httpclient/request/UserAction.scala | 9 +-
.../linkis/httpclient/request/UserPwdAction.scala | 11 +-
.../httpclient/response/HashMapHttpResult.scala | 23 +-
.../linkis/httpclient/response/HttpResult.scala | 11 +-
.../linkis/httpclient/response/ListResult.scala | 9 +-
.../linkis/httpclient/response/MetricResult.scala | 20 +-
.../apache/linkis/httpclient/response/Result.scala | 18 +-
.../response/impl/DefaultHttpResult.scala | 15 +-
linkis-commons/linkis-module/pom.xml | 805 +++----
.../apache/linkis/DataWorkCloudApplication.java | 321 +--
.../org/apache/linkis/LinkisBaseServerApp.java | 44 +-
.../org/apache/linkis/proxy/ProxyUserEntity.java | 84 +-
.../org/apache/linkis/proxy/ProxyUserService.java | 2 +-
.../apache/linkis/server/utils/AopTargetUtils.java | 74 +-
.../linkis/server/utils/ModuleUserUtils.java | 115 +-
.../linkis/server/BDPJettyServerHelper.scala | 109 +-
.../org/apache/linkis/server/Knife4jConfig.scala | 40 +-
.../scala/org/apache/linkis/server/Message.scala | 80 +-
.../conf/DataWorkCloudCustomExcludeFilter.scala | 34 +-
.../linkis/server/conf/ServerConfiguration.scala | 182 +-
.../server/exception/BDPServerException.scala | 18 +-
.../exception/FetchMapCacheFailedException.scala | 15 +-
.../exception/IllegalUserTicketException.scala | 11 +-
.../server/exception/LoginExpireException.scala | 11 +-
.../exception/NoApplicationExistsException.scala | 11 +-
.../server/exception/NonLoginException.scala | 11 +-
.../scala/org/apache/linkis/server/package.scala | 128 +-
.../server/restful/SpringRestfulCatchAOP.scala | 24 +-
.../linkis/server/security/ProxyUserSSOUtils.scala | 49 +-
.../apache/linkis/server/security/SSOUtils.scala | 162 +-
.../linkis/server/security/SecurityFilter.scala | 143 +-
.../linkis/server/socket/ControllerServer.scala | 79 +-
.../apache/linkis/server/socket/ServerSocket.scala | 55 +-
.../linkis/server/socket/SocketListener.scala | 9 +-
.../server/socket/controller/ServerEvent.scala | 26 +-
.../socket/controller/ServerEventService.scala | 21 +-
.../socket/controller/ServerListenerEventBus.scala | 55 +-
.../linkis/server/utils/LinkisMainHelper.scala | 28 +-
linkis-commons/linkis-mybatis/pom.xml | 165 +-
.../apache/linkis/mybatis/DataSourceConfig.java | 12 +-
.../org/apache/linkis/mybatis/DataSourceUtils.java | 123 +-
.../linkis/mybatis/MyBatisMapperScannerConfig.java | 20 +-
.../mybatis/MybatisConfigurationFactory.java | 183 +-
.../linkis/mybatis/conf/MybatisConfiguration.java | 93 +-
linkis-commons/linkis-protocol/pom.xml | 79 +-
.../linkis/protocol/AbstractRetryableProtocol.java | 32 +-
.../linkis/protocol/constants/TaskConstant.java | 88 +-
.../apache/linkis/protocol/engine/EngineInfo.java | 38 +-
.../apache/linkis/protocol/engine/EngineState.java | 56 +-
.../protocol/label/InsLabelAttachRequest.java | 42 +-
.../protocol/label/InsLabelQueryRequest.java | 24 +-
.../protocol/label/InsLabelQueryResponse.java | 24 +-
.../protocol/label/InsLabelRefreshRequest.java | 42 +-
.../protocol/label/InsLabelRemoveRequest.java | 22 +-
.../protocol/label/LabelInsQueryRequest.java | 22 +-
.../protocol/label/LabelInsQueryResponse.java | 24 +-
.../linkis/protocol/label/NodeLabelAddRequest.java | 38 +-
.../protocol/label/NodeLabelRemoveRequest.java | 38 +-
.../linkis/protocol/message/RequestMethod.java | 6 +-
.../protocol/query/cache/CacheTaskResult.java | 14 +-
.../protocol/query/cache/FailedToDeleteCache.java | 14 +-
.../protocol/query/cache/FailedToWriteCache.java | 14 +-
.../protocol/query/cache/RequestDeleteCache.java | 42 +-
.../protocol/query/cache/RequestReadCache.java | 56 +-
.../protocol/query/cache/RequestWriteCache.java | 76 +-
.../linkis/protocol/usercontrol/RequestLogin.java | 32 +-
.../protocol/usercontrol/RequestRegister.java | 18 +-
.../usercontrol/RequestUserListFromWorkspace.java | 20 +-
.../protocol/usercontrol/RequestUserWorkspace.java | 20 +-
.../linkis/protocol/usercontrol/ResponseLogin.java | 72 +-
.../protocol/usercontrol/ResponseRegister.java | 72 +-
.../usercontrol/ResponseUserWorkspace.java | 20 +-
.../usercontrol/ResponseWorkspaceUserList.java | 20 +-
.../apache/linkis/protocol/util/ImmutablePair.java | 64 +-
.../apache/linkis/protocol/BroadcastProtocol.scala | 11 +-
.../apache/linkis/protocol/CacheableProtocol.scala | 9 +-
.../apache/linkis/protocol/IRCommonProtocol.scala | 9 +-
.../org/apache/linkis/protocol/IRProtocol.scala | 11 +-
.../linkis/protocol/IRServiceGroupProtocol.scala | 12 +-
.../apache/linkis/protocol/InstanceProtocol.scala | 11 +-
.../org/apache/linkis/protocol/Protocol.scala | 11 +-
.../apache/linkis/protocol/RetryableProtocol.scala | 12 +-
.../linkis/protocol/SingleInstanceProtocol.scala | 11 +-
.../protocol/callback/LogCallbackProtocol.scala | 12 +-
.../linkis/protocol/engine/EngineCallback.scala | 20 +-
.../engine/EngineStateTransitionRequest.scala | 17 +-
.../linkis/protocol/engine/JobProgressInfo.scala | 10 +-
.../protocol/engine/RequestEngineStatus.scala | 12 +-
.../protocol/engine/RequestUserEngineKill.scala | 21 +-
.../apache/linkis/protocol/mdq/MDQProtocol.scala | 37 +-
.../org/apache/linkis/protocol/task/Task.scala | 11 +-
.../linkis/protocol/utils/ProtocolUtils.scala | 20 +-
.../apache/linkis/protocol/utils/TaskUtils.scala | 49 +-
.../linkis/protocol/utils/ZuulEntranceUtils.scala | 100 +-
.../variable/RequestQueryGlobalVariable.scala | 19 +-
.../protocol/variable/ResponseQueryVariable.scala | 9 +-
linkis-commons/linkis-rpc/pom.xml | 220 +-
.../linkis/rpc/message/annotation/Chain.java | 2 +-
.../linkis/rpc/message/annotation/Method.java | 2 +-
.../linkis/rpc/message/annotation/Order.java | 2 +-
.../message/exception/MessageErrorException.java | 14 +-
.../message/exception/MessageWarnException.java | 14 +-
.../linkis/rpc/message/method/MessageExecutor.java | 121 +-
.../rpc/message/method/MethodExecuteWrapper.java | 64 +-
.../rpc/message/method/ReceiverMethodSearcher.java | 97 +-
.../rpc/message/parser/DefaultServiceParser.java | 118 +-
.../linkis/rpc/message/parser/ServiceMethod.java | 126 +-
.../linkis/rpc/message/parser/ServiceParser.java | 2 +-
.../message/registry/AbstractServiceRegistry.java | 106 +-
.../rpc/message/registry/ServiceRegistry.java | 2 +-
.../message/registry/SpringServiceRegistry.java | 17 +-
.../message/utils/LoadBalancerOptionsUtils.java | 34 +-
.../linkis/rpc/message/utils/MessageUtils.java | 160 +-
.../apache/linkis/rpc/serializer/NoneDelegate.java | 55 +-
.../rpc/serializer/ProtostuffSerializeUtil.java | 147 +-
.../org/apache/linkis/rpc/AsynRPCMessageBus.scala | 46 +-
.../org/apache/linkis/rpc/BaseRPCSender.scala | 74 +-
.../org/apache/linkis/rpc/BroadcastListener.scala | 9 +-
.../org/apache/linkis/rpc/MessageReceiver.scala | 10 +-
.../apache/linkis/rpc/MessageReceiverChooser.scala | 4 +-
.../scala/org/apache/linkis/rpc/RPCMapCache.scala | 22 +-
.../org/apache/linkis/rpc/RPCReceiveRemote.scala | 12 +-
.../org/apache/linkis/rpc/RPCReceiveRestful.scala | 106 +-
.../org/apache/linkis/rpc/RPCSpringBeanCache.scala | 55 +-
.../scala/org/apache/linkis/rpc/Receiver.scala | 11 +-
.../org/apache/linkis/rpc/ReceiverChooser.scala | 26 +-
.../apache/linkis/rpc/ReceiverSenderBuilder.scala | 16 +-
.../main/scala/org/apache/linkis/rpc/Sender.scala | 99 +-
.../org/apache/linkis/rpc/SenderFactory.scala | 17 +-
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 104 +-
.../linkis/rpc/conf/RPCSpringConfiguration.scala | 37 +-
.../linkis/rpc/errorcode/RPCErrorConstants.scala | 14 +-
.../rpc/exception/DWCRPCRetryException.scala | 11 +-
.../linkis/rpc/exception/DWCURIException.scala | 11 +-
.../rpc/exception/NoInstanceExistsException.scala | 12 +-
.../rpc/exception/RPCInitFailedException.scala | 12 +-
.../linkis/rpc/interceptor/RPCInterceptor.scala | 9 +-
.../rpc/interceptor/RPCInterceptorChain.scala | 45 +-
.../rpc/interceptor/RPCInterceptorExchange.scala | 14 +-
.../linkis/rpc/interceptor/RPCLoadBalancer.scala | 18 +-
.../linkis/rpc/interceptor/RPCServerLoader.scala | 85 +-
.../common/BroadcastRPCInterceptor.scala | 83 +-
.../common/BroadcastSenderBuilder.scala | 9 +-
.../common/CacheableRPCInterceptor.scala | 98 +-
.../interceptor/common/CommonRPCInterceptor.scala | 22 +-
.../common/InstanceRPCLoadBalancer.scala | 20 +-
.../common/RetryableRPCInterceptor.scala | 52 +-
.../common/SingleInstanceRPCLoadBalancer.scala | 27 +-
.../rpc/sender/FeignClientRequestInterceptor.scala | 17 +-
.../linkis/rpc/sender/LocalMessageSender.scala | 13 +-
.../SpringCloudFeignConfigurationCache.scala | 50 +-
.../linkis/rpc/sender/SpringMVCRPCSender.scala | 171 +-
.../org/apache/linkis/rpc/sender/UnionSender.scala | 39 +-
.../sender/eureka/EurekaClientRefreshUtils.scala | 27 +-
.../rpc/sender/eureka/EurekaRPCServerLoader.scala | 21 +-
.../rpc/transform/JavaCollectionSerializer.scala | 47 +-
.../apache/linkis/rpc/transform/RPCConsumer.scala | 33 +-
.../apache/linkis/rpc/transform/RPCFormats.scala | 9 +-
.../apache/linkis/rpc/transform/RPCProduct.scala | 58 +-
.../org/apache/linkis/rpc/utils/RPCUtils.scala | 64 +-
.../org/apache/linkis/rpc/RPCFormatsTest.scala | 47 +-
linkis-commons/linkis-scheduler/pom.xml | 91 +-
.../linkis/scheduler/AbstractScheduler.scala | 33 +-
.../org/apache/linkis/scheduler/Scheduler.scala | 20 +-
.../apache/linkis/scheduler/SchedulerContext.scala | 16 +-
.../scheduler/conf/SchedulerConfiguration.scala | 21 +-
.../apache/linkis/scheduler/event/LogEvent.scala | 13 +-
.../linkis/scheduler/event/ScheduleEvent.scala | 11 +-
.../scheduler/event/SchedulerEventListener.scala | 11 +-
.../exception/LinkisJobRetryException.scala | 12 +-
.../exception/SchedulerErrorException.scala | 13 +-
.../WaitForNextAskExecutorException.scala | 11 +-
.../scheduler/executer/AbstractExecutor.scala | 23 +-
.../executer/ConcurrentTaskInfoSupport.scala | 11 +-
.../executer/ConcurrentTaskOperateSupport.scala | 9 +-
.../linkis/scheduler/executer/ExecuteRequest.scala | 18 +-
.../scheduler/executer/ExecuteResponse.scala | 14 +-
.../linkis/scheduler/executer/Executor.scala | 12 +-
.../linkis/scheduler/executer/ExecutorInfo.scala | 11 +-
.../scheduler/executer/ExecutorManager.scala | 11 +-
.../scheduler/executer/SingleTaskInfoSupport.scala | 11 +-
.../executer/SingleTaskOperateSupport.scala | 11 +-
.../apache/linkis/scheduler/future/BDPFuture.scala | 11 +-
.../linkis/scheduler/future/BDPFutureTask.scala | 14 +-
.../scheduler/listener/ConsumerListener.scala | 11 +-
.../scheduler/listener/ExecutorListener.scala | 18 +-
.../linkis/scheduler/listener/JobListener.scala | 11 +-
.../linkis/scheduler/listener/LogListener.scala | 11 +-
.../scheduler/listener/ProgressListener.scala | 11 +-
.../scheduler/listener/SchedulerListener.scala | 9 +-
.../linkis/scheduler/queue/AbstractGroup.scala | 17 +-
.../linkis/scheduler/queue/ConsumeQueue.scala | 70 +-
.../apache/linkis/scheduler/queue/Consumer.scala | 18 +-
.../linkis/scheduler/queue/ConsumerManager.scala | 17 +-
.../org/apache/linkis/scheduler/queue/Group.scala | 25 +-
.../linkis/scheduler/queue/GroupFactory.scala | 9 +-
.../org/apache/linkis/scheduler/queue/Job.scala | 265 +--
.../apache/linkis/scheduler/queue/JobInfo.scala | 34 +-
.../apache/linkis/scheduler/queue/LockJob.scala | 11 +-
.../linkis/scheduler/queue/LoopArrayQueue.scala | 114 +-
.../linkis/scheduler/queue/SchedulerEvent.scala | 32 +-
.../scheduler/queue/SchedulerEventState.scala | 16 +-
.../apache/linkis/scheduler/queue/UserJob.scala | 13 +-
.../queue/fifoqueue/FIFOConsumerManager.scala | 33 +-
.../scheduler/queue/fifoqueue/FIFOGroup.scala | 55 +-
.../queue/fifoqueue/FIFOGroupFactory.scala | 37 +-
.../scheduler/queue/fifoqueue/FIFOScheduler.scala | 12 +-
.../queue/fifoqueue/FIFOSchedulerContextImpl.scala | 32 +-
.../queue/fifoqueue/FIFOUserConsumer.scala | 136 +-
.../parallelqueue/ParallelConsumerManager.scala | 96 +-
.../queue/parallelqueue/ParallelGroup.scala | 26 +-
.../queue/parallelqueue/ParallelGroupFactory.scala | 13 +-
.../queue/parallelqueue/ParallelScheduler.scala | 13 +-
.../ParallelSchedulerContextImpl.scala | 15 +-
.../linkis/scheduler/AbstractSchedulerTest.scala | 15 +-
.../linkis/scheduler/SchedulerContextTest.scala | 5 +-
.../conf/SchedulerConfigurationTest.scala | 26 +-
.../linkis/scheduler/event/LogEventTest.scala | 7 +-
.../exception/LinkisJobRetryExceptionTest.scala | 4 +-
.../exception/SchedulerErrorExceptionTest.scala | 3 +-
.../WaitForNextAskExecutorExceptionTest.scala | 3 +-
.../scheduler/future/BDPFutureTaskTest.scala | 12 +-
.../scheduler/queue/SchedulerEventStateTest.scala | 5 +-
.../queue/fifoqueue/FIFOConsumerManagerTest.scala | 44 +-
.../queue/fifoqueue/FIFOGroupFactoryTest.scala | 5 +-
.../scheduler/queue/fifoqueue/FIFOGroupTest.scala | 9 +-
.../fifoqueue/FIFOSchedulerContextImplTest.scala | 6 +-
.../queue/fifoqueue/FIFOSchedulerTest.scala | 15 +-
.../queue/fifoqueue/FIFOUserConsumerTest.scala | 5 +-
.../ParallelConsumerManagerTest.scala | 6 +-
.../parallelqueue/ParallelGroupFactoryTest.scala | 6 +-
.../queue/parallelqueue/ParallelGroupTest.scala | 6 +-
.../ParallelSchedulerContextImplTest.scala | 6 +-
.../parallelqueue/ParallelSchedulerTest.scala | 14 +-
linkis-commons/linkis-storage/pom.xml | 144 +-
.../linkis/storage/domain/FsPathListWithError.java | 38 +-
.../linkis/storage/excel/ExcelStorageReader.java | 60 +-
.../org/apache/linkis/storage/excel/XlsUtils.java | 88 +-
.../org/apache/linkis/storage/excel/XlsxUtils.java | 90 +-
.../storage/exception/FSNotInitException.java | 12 +-
.../linkis/storage/exception/StorageErrorCode.java | 40 +-
.../storage/exception/StorageErrorException.java | 21 +-
.../storage/exception/StorageFatalException.java | 21 +-
.../storage/exception/StorageWarnException.java | 20 +-
.../linkis/storage/factory/BuildFactory.java | 6 +-
.../storage/factory/impl/BuildHDFSFileSystem.java | 67 +-
.../storage/factory/impl/BuildLocalFileSystem.java | 62 +-
.../org/apache/linkis/storage/fs/FileSystem.java | 112 +-
.../linkis/storage/fs/impl/HDFSFileSystem.java | 816 +++----
.../linkis/storage/fs/impl/LocalFileSystem.java | 763 +++---
.../linkis/storage/pipeline/PipelineReader.java | 18 +-
.../linkis/storage/pipeline/PipelineWriter.java | 2 +-
.../org/apache/linkis/storage/FSFactory.scala | 64 +-
.../org/apache/linkis/storage/LineMetaData.scala | 12 +-
.../org/apache/linkis/storage/LineRecord.scala | 12 +-
.../linkis/storage/conf/LinkisStorageConf.scala | 18 +-
.../apache/linkis/storage/csv/CSVFsReader.scala | 12 +-
.../apache/linkis/storage/csv/CSVFsWriter.scala | 21 +-
.../linkis/storage/csv/StorageCSVReader.scala | 13 +-
.../linkis/storage/csv/StorageCSVWriter.scala | 22 +-
.../apache/linkis/storage/domain/DataType.scala | 46 +-
.../org/apache/linkis/storage/domain/Dolphin.scala | 52 +-
.../linkis/storage/domain/MethodEntity.scala | 101 +-
.../linkis/storage/excel/ExcelFsReader.scala | 12 +-
.../linkis/storage/excel/ExcelFsWriter.scala | 28 +-
.../linkis/storage/excel/StorageExcelReader.scala | 13 +-
.../linkis/storage/excel/StorageExcelWriter.scala | 33 +-
.../storage/excel/StorageMultiExcelWriter.scala | 36 +-
.../org/apache/linkis/storage/io/IOClient.scala | 53 +-
.../storage/io/IOMethodInterceptorCreator.scala | 30 +-
.../resultset/DefaultResultSetFactory.scala | 72 +-
.../linkis/storage/resultset/ResultMetaData.scala | 13 +-
.../linkis/storage/resultset/ResultRecord.scala | 13 +-
.../storage/resultset/ResultSetFactory.scala | 45 +-
.../linkis/storage/resultset/ResultSetReader.scala | 38 +-
.../linkis/storage/resultset/ResultSetWriter.scala | 44 +-
.../storage/resultset/StorageResultSet.scala | 24 +-
.../storage/resultset/StorageResultSetReader.scala | 55 +-
.../storage/resultset/StorageResultSetWriter.scala | 58 +-
.../storage/resultset/html/HtmlResultSet.scala | 19 +-
.../linkis/storage/resultset/io/IOMetaData.scala | 9 +-
.../linkis/storage/resultset/io/IORecord.scala | 11 +-
.../resultset/io/IOResultDeserializer.scala | 12 +-
.../storage/resultset/io/IOResultSerializer.scala | 15 +-
.../linkis/storage/resultset/io/IOResultSet.scala | 15 +-
.../resultset/picture/PictureResultSet.scala | 17 +-
.../storage/resultset/table/TableMetaData.scala | 12 +-
.../storage/resultset/table/TableRecord.scala | 13 +-
.../resultset/table/TableResultDeserializer.scala | 39 +-
.../resultset/table/TableResultSerializer.scala | 66 +-
.../storage/resultset/table/TableResultSet.scala | 15 +-
.../resultset/txt/TextResultDeserializer.scala | 13 +-
.../resultset/txt/TextResultSerializer.scala | 16 +-
.../storage/resultset/txt/TextResultSet.scala | 17 +-
.../linkis/storage/script/ScriptFsReader.scala | 17 +-
.../linkis/storage/script/ScriptFsWriter.scala | 51 +-
.../linkis/storage/script/VariableParser.scala | 55 +-
.../script/compaction/CommonScriptCompaction.scala | 14 +-
.../script/compaction/PYScriptCompaction.scala | 12 +-
.../script/compaction/QLScriptCompaction.scala | 17 +-
.../script/compaction/ScalaScriptCompaction.scala | 17 +-
.../script/compaction/ShellScriptCompaction.scala | 18 +-
.../storage/script/parser/CommonScriptParser.scala | 26 +-
.../storage/script/parser/PYScriptParser.scala | 11 +-
.../storage/script/parser/QLScriptParser.scala | 12 +-
.../storage/script/parser/ScalaScriptParser.scala | 14 +-
.../storage/script/parser/ShellScriptParser.scala | 6 +-
.../script/reader/StorageScriptFsReader.scala | 51 +-
.../script/writer/StorageScriptFsWriter.scala | 51 +-
.../linkis/storage/source/AbstractFileSource.scala | 26 +-
.../apache/linkis/storage/source/FileSource.scala | 41 +-
.../apache/linkis/storage/source/FileSplit.scala | 46 +-
.../storage/source/ResultsetFileSource.scala | 22 +-
.../linkis/storage/source/TextFileSource.scala | 14 +-
.../linkis/storage/utils/FileSystemUtils.scala | 41 +-
.../storage/utils/StorageConfiguration.scala | 39 +-
.../linkis/storage/utils/StorageHelper.scala | 27 +-
.../apache/linkis/storage/utils/StorageUtils.scala | 129 +-
linkis-commons/pom.xml | 45 +-
.../linkis-cli/linkis-cli-application/pom.xml | 137 +-
.../cli/application/LinkisClientApplication.java | 482 ++--
.../cli/application/constants/AppConstants.java | 27 +-
.../linkis/cli/application/constants/AppKeys.java | 248 +-
.../cli/application/constants/LinkisConstants.java | 4 +-
.../cli/application/constants/LinkisKeys.java | 52 +-
.../linkis/cli/application/data/FinishedData.java | 36 +-
.../linkis/cli/application/data/PreparedData.java | 14 +-
.../linkis/cli/application/data/ProcessedData.java | 56 +-
.../interactor/command/LinkisCmdType.java | 64 +-
.../command/template/UniversalCmdTemplate.java | 636 ++---
.../cli/application/interactor/job/LinkisJob.java | 4 +-
.../interactor/job/LinkisJobStatus.java | 192 +-
.../interactor/job/LinkisManageJob.java | 894 +++----
.../application/interactor/job/LinkisOnceJob.java | 470 ++--
.../interactor/job/LinkisSubmitJob.java | 424 ++--
.../job/builder/LinkisManageJobBuilder.java | 181 +-
.../job/builder/LinkisOnceJobBuilder.java | 388 +--
.../job/builder/LinkisSubmitJobBuilder.java | 383 +--
.../interactor/job/builder/ProcessKeyUtils.java | 86 +-
.../interactor/job/data/LinkisJobData.java | 16 +-
.../interactor/job/data/LinkisJobDataImpl.java | 838 +++----
.../interactor/job/data/LinkisLogData.java | 32 +-
.../interactor/job/data/LinkisOnceJobData.java | 404 ++--
.../interactor/job/data/LinkisResultData.java | 12 +-
.../interactor/job/data/LinkisResultSet.java | 78 +-
.../interactor/job/data/SimpleOnceJobAdapter.java | 652 ++---
.../interactor/job/desc/LinkisJobManDesc.java | 42 +-
.../interactor/job/desc/LinkisOnceDesc.java | 218 +-
.../interactor/job/desc/LinkisSubmitDesc.java | 162 +-
.../interactor/job/subtype/LinkisManSubType.java | 28 +-
.../job/subtype/LinkisSubmitSubType.java | 18 +-
.../interactor/validate/LinkisManageValidator.java | 56 +-
.../validate/LinkisOnceSubmitValidator.java | 488 ++--
.../interactor/validate/LinkisSubmitValidator.java | 443 ++--
.../interactor/validate/UJESContextValidator.java | 90 +-
.../observer/event/LinkisClientEvent.java | 8 +-
.../observer/event/SingleObserverEvent.java | 34 +-
.../observer/listener/LinkisClientListener.java | 2 +-
.../observer/listener/TriggerEventListener.java | 16 +-
.../cli/application/operator/OperatorUtils.java | 86 +-
.../operator/once/LinkisNodeStatus.java | 18 +-
.../operator/once/OnceJobConstants.java | 6 +-
.../operator/ujes/LinkisJobOperator.java | 1358 +++++------
.../operator/ujes/LinkisOperResultAdapter.java | 56 +-
.../operator/ujes/LinkisOperatorBuilder.java | 26 +-
.../operator/ujes/UJESClientContext.java | 216 +-
.../operator/ujes/UJESClientFactory.java | 340 +--
.../application/operator/ujes/UJESConstants.java | 32 +-
.../operator/ujes/UJESResultAdapter.java | 1070 +++++----
.../operator/ujes/result/OpenLogResult2.java | 24 +-
.../operator/ujes/result/ResultSetResult2.java | 24 +-
.../application/present/LinkisLogPresenter.java | 58 +-
.../present/LinkisResultInfoPresenter.java | 157 +-
.../application/present/LinkisResultPresenter.java | 338 +--
.../present/model/LinkisJobInfoModel.java | 122 +-
.../present/model/LinkisJobKillModel.java | 58 +-
.../application/present/model/LinkisLogModel.java | 38 +-
.../present/model/LinkisResultInfoModel.java | 94 +-
.../present/model/LinkisResultModel.java | 56 +-
.../present/model/LinkisSubmitResultModel.java | 48 +-
.../cli/application/suite/ExecutionSuite.java | 68 +-
.../application/suite/ExecutionSuiteFactory.java | 314 +--
.../cli/application/utils/ExecutionUtils.java | 327 +--
.../apache/linkis/cli/application/utils/Utils.java | 42 +-
.../application/LinkisClientApplicationTest.java | 302 +--
.../cli/application/constants/TestConstants.java | 138 +-
.../command/template/ProcessInputUtil.java | 138 +-
.../interactor/command/template/TestCmdType.java | 68 +-
.../command/template/TestParamMapper.java | 54 +-
.../command/template/TestSparkCmdTemplate.java | 408 ++--
.../interactor/execution/LinkisExecutorTest.java | 172 +-
.../interactor/job/LinkisJobBuilderTest.java | 139 +-
.../linkis-cli/linkis-cli-common/pom.xml | 31 +-
.../cli/common/entity/command/CmdOption.java | 22 +-
.../cli/common/entity/command/CmdTemplate.java | 12 +-
.../linkis/cli/common/entity/command/CmdType.java | 6 +-
.../cli/common/entity/command/ParamItem.java | 86 +-
.../linkis/cli/common/entity/command/Params.java | 112 +-
.../cli/common/entity/execution/Execution.java | 16 +-
.../apache/linkis/cli/common/entity/job/Job.java | 58 +-
.../linkis/cli/common/entity/job/JobData.java | 14 +-
.../linkis/cli/common/entity/job/JobStatus.java | 14 +-
.../linkis/cli/common/entity/job/JobSubType.java | 2 +-
.../linkis/cli/common/entity/present/Model.java | 2 +-
.../cli/common/entity/present/Presenter.java | 2 +-
.../common/entity/properties/ClientProperties.java | 30 +-
.../cli/common/entity/result/ExecutionResult.java | 17 +-
.../cli/common/entity/result/ResultHandler.java | 2 +-
.../cli/common/entity/validate/Validator.java | 2 +-
.../linkis/cli/common/entity/var/VarAccess.java | 10 +-
.../common/exception/LinkisClientException.java | 2 +-
.../exception/LinkisClientRuntimeException.java | 170 +-
.../cli/common/exception/error/ErrorLevel.java | 68 +-
.../cli/common/exception/error/ErrorMsg.java | 4 +-
.../common/exception/handler/ExceptionHandler.java | 2 +-
.../linkis-cli/linkis-cli-core/pom.xml | 68 +-
.../linkis/cli/core/builder/AbstractBuilder.java | 56 +-
.../cli/core/builder/BuildableByVarAccess.java | 48 +-
.../apache/linkis/cli/core/builder/Builder.java | 2 +-
.../linkis/cli/core/constants/CommonConstants.java | 28 +-
.../cli/core/exception/BuilderException.java | 16 +-
.../cli/core/exception/CommandException.java | 72 +-
.../exception/LinkisClientExecutionException.java | 18 +-
.../cli/core/exception/PresenterException.java | 17 +-
.../linkis/cli/core/exception/PropsException.java | 16 +-
.../cli/core/exception/TransformerException.java | 18 +-
.../cli/core/exception/UnknownException.java | 16 +-
.../cli/core/exception/ValidateException.java | 16 +-
.../cli/core/exception/VarAccessException.java | 17 +-
.../cli/core/exception/error/CommonErrMsg.java | 124 +-
.../exception/handler/CommandExceptionHandler.java | 26 +-
.../exception/handler/DefaultExceptionHandler.java | 94 +-
.../interactor/command/CmdTemplateFactory.java | 64 +-
.../cli/core/interactor/command/SpecialMap.java | 8 +-
.../interactor/command/fitter/AbstractFitter.java | 372 +--
.../cli/core/interactor/command/fitter/Fitter.java | 2 +-
.../interactor/command/fitter/FitterResult.java | 38 +-
.../interactor/command/fitter/FitterUtils.java | 6 +-
.../interactor/command/fitter/SingleTplFitter.java | 37 +-
.../interactor/command/parser/AbstarctParser.java | 252 +-
.../cli/core/interactor/command/parser/Parser.java | 2 +-
.../interactor/command/parser/SingleCmdParser.java | 58 +-
.../command/parser/result/ParseResult.java | 54 +-
.../command/parser/transformer/ParamKeyMapper.java | 148 +-
.../command/template/AbstractCmdTemplate.java | 775 +++---
.../command/template/option/BaseOption.java | 209 +-
.../interactor/command/template/option/Flag.java | 68 +-
.../command/template/option/MapOption.java | 188 +-
.../command/template/option/Parameter.java | 122 +-
.../command/template/option/SpecialMapOption.java | 24 +-
.../command/template/option/StdOption.java | 88 +-
.../core/interactor/execution/AsyncSubmission.java | 118 +-
.../linkis/cli/core/interactor/execution/Help.java | 40 +-
.../core/interactor/execution/JobManagement.java | 104 +-
.../core/interactor/execution/SyncSubmission.java | 276 +--
.../cli/core/interactor/job/AbstractJob.java | 80 +-
.../cli/core/interactor/job/AsyncBackendJob.java | 8 +-
.../linkis/cli/core/interactor/job/JobBuilder.java | 32 +-
.../cli/core/interactor/job/LogAccessibleJob.java | 10 +-
.../core/interactor/job/ManagableBackendJob.java | 22 +-
.../core/interactor/job/ResultAccessibleJob.java | 10 +-
.../cli/core/interactor/job/SyncBackendJob.java | 2 +-
.../cli/core/interactor/job/TerminatableJob.java | 6 +-
.../cli/core/interactor/job/TerminateToken.java | 14 +-
.../interactor/properties/PropertiesLoader.java | 12 +-
.../interactor/properties/PropsFilesScanner.java | 97 +-
.../core/interactor/properties/StdPropsLoader.java | 106 +-
.../properties/reader/PropertiesReader.java | 12 +-
.../properties/reader/PropsFileReader.java | 116 +-
.../interactor/properties/reader/SysEnvReader.java | 64 +-
.../properties/reader/SysPropsReader.java | 72 +-
.../interactor/result/DefaultResultHandler.java | 18 +-
.../interactor/result/ExecutionResultImpl.java | 66 +-
.../interactor/result/ExecutionStatusEnum.java | 18 +-
.../interactor/result/PresentResultHandler.java | 77 +-
.../core/interactor/validate/ParamValidator.java | 10 +-
.../interactor/validate/ParsedTplValidator.java | 78 +-
.../core/interactor/validate/PropsValidator.java | 10 +-
.../cli/core/interactor/var/StdVarAccess.java | 494 ++--
.../cli/core/interactor/var/SysVarAccess.java | 142 +-
.../cli/core/operator/JobOperatorBuilder.java | 16 +-
.../cli/core/operator/JobOperatorFactory.java | 109 +-
.../cli/core/present/DefaultStdOutPresenter.java | 10 +-
.../linkis/cli/core/present/HelpInfoPresenter.java | 126 +-
.../linkis/cli/core/present/PresentMode.java | 2 +-
.../linkis/cli/core/present/PresentModeImpl.java | 24 +-
.../linkis/cli/core/present/PresentWayImpl.java | 42 +-
.../core/present/display/DisplayOperFactory.java | 34 +-
.../cli/core/present/display/DisplayOperator.java | 2 +-
.../core/present/display/PlainTextFileWriter.java | 150 +-
.../cli/core/present/display/StdOutWriter.java | 24 +-
.../core/present/display/data/FileDisplayData.java | 43 +-
.../present/display/data/StdoutDisplayData.java | 14 +-
.../cli/core/present/model/HelpInfoModel.java | 32 +-
.../apache/linkis/cli/core/utils/CommonUtils.java | 98 +-
.../org/apache/linkis/cli/core/utils/LogUtils.java | 16 +-
.../linkis/cli/core/utils/SchedulerUtils.java | 110 +-
.../linkis/cli/core/utils/converter/Converter.java | 2 +-
.../converter/PredefinedStringConverters.java | 285 +--
.../linkis/cli/core/constants/TestConstants.java | 134 +-
.../handler/CommandExceptionHandlerTest.java | 78 +-
.../cli/core/interactor/command/TestCmdType.java | 68 +-
.../command/fitter/SingleTplFitterTest.java | 173 +-
.../command/parser/SingleCmdParserTest.java | 274 +--
.../command/template/TestParamMapper.java | 18 +-
.../command/template/TestSparkCmdTemplate.java | 437 ++--
.../interactor/properties/StdPropsLoaderTest.java | 179 +-
.../cli/core/interactor/var/StdVarAccessTest.java | 495 ++--
.../apache/linkis/cli/core/utils/TestUtils.java | 64 +-
.../linkis-client/linkis-cli/pom.xml | 72 +-
.../linkis-computation-client/pom.xml | 171 +-
.../linkis/computation/client/JobListener.scala | 9 +-
.../linkis/computation/client/JobMetrics.scala | 30 +-
.../linkis/computation/client/LinkisJob.scala | 11 +-
.../computation/client/LinkisJobBuilder.scala | 70 +-
.../computation/client/LinkisJobClient.scala | 17 +-
.../computation/client/ResultSetIterator.scala | 77 +-
.../client/interactive/InteractiveJob.scala | 88 +-
.../client/interactive/InteractiveJobBuilder.scala | 29 +-
.../client/interactive/LogListener.scala | 9 +-
.../client/interactive/ProgressListener.scala | 10 +-
.../computation/client/job/AbstractLinkisJob.scala | 74 +-
.../client/job/AbstractSubmittableLinkisJob.scala | 9 +-
.../computation/client/job/StorableLinkisJob.scala | 43 +-
.../client/job/SubmittableLinkisJob.scala | 11 +-
.../client/once/LinkisManagerClient.scala | 58 +-
.../linkis/computation/client/once/OnceJob.scala | 76 +-
.../once/action/CreateEngineConnAction.scala | 17 +-
.../client/once/action/ECMOperateAction.scala | 8 +-
.../client/once/action/ECResourceInfoAction.scala | 7 +-
.../once/action/EngineConnOperateAction.scala | 2 +-
.../client/once/action/GetEngineConnAction.scala | 24 +-
.../client/once/action/KillEngineConnAction.scala | 17 +-
.../client/once/action/LinkisManagerAction.scala | 11 +-
.../once/action/ServiceInstanceBuilder.scala | 13 +-
.../once/result/CreateEngineConnResult.scala | 11 +-
.../client/once/result/ECMOperateResult.scala | 7 +-
.../client/once/result/ECResourceInfoResult.scala | 3 +-
.../once/result/EngineConnOperateResult.scala | 15 +-
.../client/once/result/GetEngineConnResult.scala | 11 +-
.../client/once/result/KillEngineConnResult.scala | 11 +-
.../client/once/result/LinkisManagerResult.scala | 9 +-
.../client/once/simple/SimpleOnceJob.scala | 71 +-
.../client/once/simple/SimpleOnceJobBuilder.scala | 59 +-
.../client/operator/OnceJobOperator.scala | 12 +-
.../computation/client/operator/Operator.scala | 11 +-
.../client/operator/OperatorFactory.scala | 27 +-
.../client/operator/StorableOperator.scala | 9 +-
.../impl/EngineConnApplicationInfoOperator.scala | 37 +-
.../operator/impl/EngineConnCommonOperator.scala | 14 +-
.../impl/EngineConnDiagnosisOperator.scala | 12 +-
.../operator/impl/EngineConnLogOperator.scala | 45 +-
.../operator/impl/EngineConnMetricsOperator.scala | 12 +-
.../operator/impl/EngineConnProgressOperator.scala | 27 +-
.../computation/client/utils/LabelKeyUtils.scala | 9 +-
.../org/apache/linkis/ujes/client/UJESClient.scala | 135 +-
.../apache/linkis/ujes/client/UJESClientImpl.scala | 20 +-
.../exception/UJESClientBuilderException.scala | 14 +-
.../ujes/client/request/GetColumnsAction.scala | 22 +-
.../linkis/ujes/client/request/GetDBSAction.scala | 21 +-
.../request/GetPartitionStatisticInfoAction.scala | 15 +-
.../client/request/GetTableBaseInfoAction.scala | 9 +-
.../request/GetTableStatisticInfoAction.scala | 11 +-
.../ujes/client/request/GetTablesAction.scala | 19 +-
.../ujes/client/request/JobExecIdAction.scala | 26 +-
.../ujes/client/request/JobExecuteAction.scala | 115 +-
.../linkis/ujes/client/request/JobInfoAction.scala | 23 +-
.../linkis/ujes/client/request/JobListAction.scala | 18 +-
.../linkis/ujes/client/request/JobLogAction.scala | 22 +-
.../ujes/client/request/JobSubmitAction.scala | 29 +-
.../linkis/ujes/client/request/OpenLogAction.scala | 12 +-
.../ujes/client/request/ResultSetAction.scala | 25 +-
.../ujes/client/request/ResultSetListAction.scala | 20 +-
.../linkis/ujes/client/request/UJESJobAction.scala | 8 +-
.../linkis/ujes/client/request/UserAction.scala | 8 +-
.../ujes/client/response/GetColumnsResult.scala | 12 +-
.../linkis/ujes/client/response/GetDBSResult.scala | 14 +-
.../response/GetPartitionStatisticInfoResult.scala | 4 +-
.../client/response/GetTableBaseInfoResult.scala | 3 +-
.../response/GetTableStatisticInfoResult.scala | 16 +-
.../ujes/client/response/GetTablesResult.scala | 12 +-
.../ujes/client/response/JobExecuteResult.scala | 8 +-
.../ujes/client/response/JobInfoResult.scala | 39 +-
.../ujes/client/response/JobKillResult.scala | 8 +-
.../ujes/client/response/JobListResult.scala | 14 +-
.../linkis/ujes/client/response/JobLogResult.scala | 12 +-
.../ujes/client/response/JobPauseResult.scala | 8 +-
.../ujes/client/response/JobProgressResult.scala | 18 +-
.../ujes/client/response/JobStatusResult.scala | 11 +-
.../ujes/client/response/JobSubmitResult.scala | 13 +-
.../ujes/client/response/OpenLogResult.scala | 14 +-
.../ujes/client/response/ResultSetListResult.scala | 17 +-
.../ujes/client/response/ResultSetResult.scala | 13 +-
.../ujes/client/response/UJESJobResult.scala | 8 +-
.../ujes/client/response/image/ShowImage.scala | 31 +-
.../linkis/ujes/client/utils/UJESClientUtils.scala | 21 +-
.../computation/client/FlinkOnceJobTest.java | 127 +-
.../computation/client/InteractiveJobTest.java | 50 +-
.../linkis/computation/client/TestLogListener.java | 12 +-
.../ujes/client/PythonImageJavaClientTest.java | 263 ++-
.../linkis/ujes/client/UJESClientImplTestJ.java | 99 +-
.../linkis-computation-governance-common/pom.xml | 106 +-
.../common/entity/ExecutionNodeStatus.java | 54 +-
.../governance/common/entity/NodeExistStatus.java | 6 +-
.../governance/common/entity/job/JobRequest.java | 374 +--
.../common/entity/job/JobRequestWithDetail.java | 64 +-
.../common/entity/job/QueryException.java | 12 +-
.../governance/common/entity/job/SubJobDetail.java | 182 +-
.../governance/common/entity/job/SubJobInfo.java | 92 +-
.../common/entity/task/RequestOneTask.java | 28 +-
.../common/entity/task/RequestPersistTask.java | 744 +++---
.../common/entity/task/RequestReadAllTask.java | 30 +-
.../common/entity/task/ResponsePersist.java | 120 +-
.../common/conf/GovernaceCommonConf.scala | 34 +-
.../common/constant/job/JobRequestConstants.scala | 11 +-
.../common/constant/job/TaskInfoConstants.scala | 2 +-
.../common/entity/job/OnceExecutorContent.scala | 3 +-
.../exception/GovernanceErrorException.scala | 11 +-
.../common/exception/LinkisJobRetryException.scala | 13 +-
.../governance/common/paser/CodeParser.scala | 87 +-
.../protocol/conf/RemoveCacheConfRequest.scala | 7 +-
.../protocol/conf/RequestQueryGlobalConfig.scala | 53 +-
.../common/protocol/conf/ResponseQueryConfig.scala | 12 +-
.../protocol/engineconn/RequestEngineStatus.scala | 19 +-
.../common/protocol/job/JobDetailReqProcotol.scala | 18 +-
.../common/protocol/job/JobReqProcotol.scala | 17 +-
.../common/protocol/job/JobRespProtocol.scala | 27 +-
.../common/protocol/task/RequestTask.scala | 44 +-
.../protocol/task/ResponseEngineConnPid.scala | 21 +-
.../common/protocol/task/ResponseTaskExecute.scala | 75 +-
.../governance/common/utils/ECPathUtils.scala | 21 +-
.../common/utils/EngineConnArguments.scala | 65 +-
.../common/utils/GovernanceConstant.scala | 8 +-
.../governance/common/utils/GovernanceUtils.scala | 23 +-
.../linkis/governance/common/utils/JobUtils.scala | 2 +-
.../common/utils/OnceExecutorContentUtils.scala | 29 +-
.../common/paser/SQLCodeParserTest.scala | 2 +-
.../governance/common/utils/JobUtilsTest.scala | 5 +-
.../linkis-engineconn-linux-launch/pom.xml | 95 +-
.../launch/LinuxProcessEngineConnLaunch.scala | 13 +-
.../linkis-engineconn-manager-core/pom.xml | 127 +-
.../apache/linkis/ecm/core/conf/ECMErrorCode.scala | 9 +-
.../apache/linkis/ecm/core/conf/ECPCoreConf.scala | 2 +-
.../linkis/ecm/core/engineconn/EngineConn.scala | 13 +-
.../ecm/core/engineconn/EngineConnInfo.scala | 9 +-
.../ecm/core/engineconn/YarnEngineConn.scala | 10 +-
.../ecm/core/exception/ECMCoreException.scala | 15 +-
.../ecm/core/launch/DiscoveryMsgGenerator.scala | 19 +-
.../linkis/ecm/core/launch/EngineConnLaunch.scala | 10 +-
.../ecm/core/launch/EngineConnLaunchRunner.scala | 14 +-
.../ecm/core/launch/EngineConnManagerEnv.scala | 9 +-
.../core/launch/ProcessEngineCommandBuilder.scala | 24 +-
.../ecm/core/launch/ProcessEngineCommandExec.scala | 25 +-
.../ecm/core/launch/ProcessEngineConnLaunch.scala | 176 +-
.../ecm/core/listener/ECMAsyncListenerBus.scala | 22 +-
.../ecm/core/listener/ECMEventListener.scala | 10 +-
.../ecm/core/listener/ECMSyncListenerBus.scala | 13 +-
.../linkis/ecm/core/metrics/ECMMetrics.scala | 10 +-
.../linkis/ecm/core/report/ECMHealthReport.scala | 9 +-
.../linkis/ecm/core/report/NodeHealthReport.scala | 9 +-
.../apache/linkis/ecm/core/utils/PortUtils.scala | 25 +-
.../linkis/ecm/core/utils/PortUtilsTest.scala | 2 +-
.../linkis-engineconn-manager-server/pom.xml | 268 +--
.../linkis/ecm/server/LinkisECMApplication.java | 130 +-
.../linkis/ecm/server/conf/ECMConfiguration.scala | 115 +-
.../ecm/server/context/DefaultECMContext.scala | 16 +-
.../linkis/ecm/server/context/ECMContext.scala | 13 +-
.../ecm/server/converter/ECMEngineConverter.scala | 14 +-
.../ecm/server/engineConn/DefaultEngineConn.scala | 27 +-
.../server/engineConn/DefaultYarnEngineConn.scala | 12 +-
.../ecm/server/errorcode/ECMErrorConstants.scala | 10 +-
.../ecm/server/exception/ECMErrorException.scala | 14 +-
.../apache/linkis/ecm/server/hook/ECMHook.scala | 10 +-
.../linkis/ecm/server/hook/JarUDFLoadECMHook.scala | 40 +-
.../linkis/ecm/server/listener/ECMReadyEvent.scala | 14 +-
.../ecm/server/metrics/DefaultECMMetrics.scala | 45 +-
.../server/operator/EngineConnLogOperator.scala | 133 +-
.../operator/EngineConnYarnLogOperator.scala | 66 +-
.../ecm/server/report/DefaultECMHealthReport.scala | 18 +-
.../ecm/server/service/ECMHealthService.scala | 17 +-
.../ecm/server/service/ECMMetricsService.scala | 13 +-
.../ecm/server/service/ECMRegisterService.scala | 9 +-
.../ecm/server/service/EngineConnKillService.scala | 9 +-
.../server/service/EngineConnLaunchService.scala | 29 +-
.../ecm/server/service/EngineConnListService.scala | 18 +-
.../service/EngineConnPidCallbackService.scala | 10 +-
.../service/EngineConnStatusCallbackService.scala | 9 +-
.../server/service/LocalDirsHandleService.scala | 9 +-
.../ecm/server/service/LogCallbackService.scala | 10 +-
.../linkis/ecm/server/service/OperateService.scala | 1 +
.../service/ResourceLocalizationService.scala | 14 +-
.../ecm/server/service/YarnCallbackService.scala | 9 +-
.../impl/AbstractEngineConnLaunchService.scala | 92 +-
.../impl/BmlResourceLocalizationService.scala | 106 +-
.../service/impl/DefaultECMHealthService.scala | 83 +-
.../service/impl/DefaultECMMetricsService.scala | 11 +-
.../service/impl/DefaultECMRegisterService.scala | 40 +-
.../impl/DefaultEngineConnListService.scala | 66 +-
.../impl/DefaultEngineConnPidCallbackService.scala | 20 +-
.../DefaultEngineConnStatusCallbackService.scala | 41 +-
.../impl/DefaultLocalDirsHandleService.scala | 25 +-
.../service/impl/DefaultOperateService.scala | 12 +-
.../service/impl/DefaultYarnCallbackService.scala | 20 +-
.../impl/LinuxProcessEngineConnLaunchService.scala | 26 +-
.../impl/ProcessEngineConnLaunchService.scala | 110 +-
.../ecm/server/spring/ECMSpringConfiguration.scala | 34 +-
.../apache/linkis/ecm/server/util/ECMUtils.scala | 27 +-
.../linkis/ecm/server/util/HardwareUtils.scala | 6 +-
.../impl/DefaultEngineConnKillServiceTest.java | 98 +-
.../linkis-engineconn-manager/pom.xml | 33 +-
.../linkis-once-engineconn/pom.xml | 174 +-
.../engineconn/once/executor/OnceExecutor.scala | 83 +-
.../executor/OnceExecutorExecutionContext.scala | 36 +-
.../once/executor/OperableOnceExecutor.scala | 1 +
.../executor/creation/OnceExecutorFactory.scala | 20 +-
.../executor/creation/OnceExecutorManager.scala | 38 +-
.../exception/OnceEngineConnErrorException.scala | 12 +-
.../execution/OnceEngineConnExecution.scala | 67 +-
.../once/executor/hook/OnceEngineConnHook.scala | 20 +-
.../operator/OperableOnceEngineConnOperator.scala | 26 +-
.../linkis-computation-engineconn/pom.xml | 273 +--
.../async/AsyncConcurrentComputationExecutor.scala | 115 +-
.../executor/async/AsyncEngineConnJob.scala | 30 +-
.../executor/async/AsyncExecuteContext.scala | 27 +-
.../executor/async/AsyncExecuteExecutor.scala | 19 +-
.../executor/async/AsyncExecuteRequest.scala | 7 +-
.../executor/async/AsyncExecutorManager.scala | 10 +-
.../executor/bml/BmlEnginePreExecuteHook.scala | 46 +-
.../executor/bml/BmlHookDownloadException.scala | 2 +-
.../executor/conf/ComputationExecutorConf.scala | 45 +-
...bstractComputationSingleExecutorECFactory.scala | 7 +-
.../creation/ComputationExecutorFactory.scala | 31 +-
.../creation/ComputationExecutorManager.scala | 48 +-
...omputationSingleExecutorEngineConnFactory.scala | 48 +-
.../executor/cs/CSEnginePreExecuteHook.scala | 34 +-
.../computation/executor/cs/CSResourceParser.scala | 28 +-
.../computation/executor/cs/CSTableRegister.scala | 71 +-
.../executor/cs/CSTableResultSetWriter.scala | 17 +-
.../executor/entity/CommonEngineConnTask.scala | 17 +-
.../executor/entity/EngineConnTask.scala | 12 +-
.../computation/executor/entity/TaskStatus.scala | 14 +-
.../execute/ComputationEngineConnExecution.scala | 52 +-
.../executor/execute/ComputationExecutor.scala | 207 +-
.../execute/ConcurrentComputationExecutor.scala | 33 +-
.../executor/execute/EngineExecutionContext.scala | 121 +-
.../executor/hook/ComputationEngineConnHook.scala | 29 +-
.../executor/hook/ComputationExecutorHook.scala | 33 +-
.../executor/hook/ExecutorLabelsRestHook.scala | 19 +-
.../computation/executor/hook/InitSQLHook.scala | 43 +-
.../executor/hook/UDFLoadEngineConnHook.scala | 102 +-
.../executor/hook/UseDatabaseEngineHook.scala | 35 +-
.../executor/hook/executor/ExecuteOnceHook.scala | 25 +-
.../hook/executor/FunctionExecutorHook.scala | 19 +-
.../executor/listener/ResultSetListener.scala | 15 +-
.../executor/listener/TaskProgressListener.scala | 9 +-
.../executor/listener/TaskStatusListener.scala | 14 +-
.../computation/executor/rs/RsOutputStream.scala | 35 +-
.../executor/service/TaskExecutionService.scala | 10 +-
.../service/TaskExecutionServiceImpl.scala | 343 +--
.../executor/upstream/ECTaskEntranceMonitor.scala | 40 +-
.../SingleThreadUpstreamConnectionMonitor.scala | 80 +-
.../upstream/UpstreamConnectionMonitor.scala | 8 +-
.../upstream/access/ConnectionInfoAccess.scala | 6 +-
.../access/ConnectionInfoAccessRequest.scala | 6 +-
.../upstream/access/ECTaskEntranceInfoAccess.scala | 60 +-
.../access/ECTaskEntranceInfoAccessRequest.scala | 8 +-
.../upstream/entity/ECTaskEntranceConnection.scala | 36 +-
.../upstream/entity/UpstreamConnection.scala | 7 +-
.../TaskStatusChangedForUpstreamMonitorEvent.scala | 11 +-
.../upstream/handler/ECTaskKillHandler.scala | 37 +-
.../handler/ECTaskKillHandlerRequest.scala | 9 +-
.../executor/upstream/handler/MonitorHandler.scala | 6 +-
.../upstream/handler/MonitorHandlerRequest.scala | 7 +-
...skStatusChangedForUpstreamMonitorListener.scala | 8 +-
.../service/ECTaskEntranceMonitorService.scala | 34 +-
.../upstream/wrapper/ConnectionInfoWrapper.scala | 2 +-
.../wrapper/ECTaskEntranceConnectionWrapper.scala | 35 +-
.../executor/utlis/ComputationEngineConstant.scala | 9 +-
.../executor/utlis/ComputationEngineUtils.scala | 11 +-
.../executor/utlis/ComputationErrorCode.scala | 11 +-
.../computation/executor/utlis/ProgressUtils.scala | 6 +-
.../access/ECTaskEntranceInfoAccessHelper.scala | 34 +-
.../linkis-engineconn-common/pom.xml | 130 +-
.../engineconn/common/conf/EngineConnConf.scala | 52 +-
.../common/conf/EngineConnConstant.scala | 9 +-
.../common/creation/EngineCreationContext.scala | 15 +-
.../engineconn/common/engineconn/EngineConn.scala | 36 +-
.../common/exception/EngineConnException.scala | 11 +-
.../common/execution/EngineConnExecution.scala | 17 +-
.../engineconn/common/hook/EngineConnHook.scala | 44 +-
.../linkis-engineconn-core/pom.xml | 116 +-
.../linkis/engineconn/core/EngineConnObject.scala | 20 +-
.../AbstractCodeLanguageLabelExecutorFactory.scala | 53 +-
.../core/creation/AbstractExecutorFactory.scala | 22 +-
.../core/engineconn/EngineConnManager.scala | 20 +-
.../core/exception/EngineConnErrorCode.scala | 9 +-
.../core/exception/EngineConnFatalException.scala | 14 +-
.../execution/AbstractEngineConnExecution.scala | 38 +-
.../core/execution/EngineConnExecution.scala | 21 +-
.../engineconn/core/executor/ExecutorManager.scala | 146 +-
.../linkis/engineconn/core/hook/ExecutorHook.scala | 15 +-
.../linkis/engineconn/core/hook/ShutdownHook.scala | 20 +-
.../engineconn/core/util/EngineConnUtils.scala | 8 +-
.../engineconn/launch/EngineConnServer.scala | 92 +-
.../accessible-executor/pom.xml | 139 +-
.../acessible/executor/log/AbstractLogCache.java | 22 +-
.../acessible/executor/log/LogCache.java | 42 +-
.../acessible/executor/log/MountLogCache.java | 160 +-
.../acessible/executor/log/SendAppender.java | 131 +-
.../acessible/executor/log/TimeLogCache.java | 28 +-
.../conf/AccessibleExecutorConfiguration.scala | 36 +-
.../AccessibleExecutorSpringConfiguration.scala | 30 +-
.../executor/entity/AccessibleExecutor.scala | 125 +-
.../executor/entity/ExecutorStatusInfo.scala | 8 +-
.../execution/AccessibleEngineConnExecution.scala | 175 +-
.../executor/info/NodeHealthyInfoManager.scala | 19 +-
.../executor/info/NodeHeartbeatMsgManager.scala | 8 +-
.../executor/info/NodeOverLoadInfoManager.scala | 11 +-
.../executor/listener/ExecutorLockListener.scala | 17 +-
.../executor/listener/ExecutorStatusListener.scala | 25 +-
.../acessible/executor/listener/LogListener.scala | 9 +-
.../executor/listener/NodeHealthyListener.scala | 15 +-
.../event/AccessibleExecutorConnAsyncEvent.scala | 31 +-
.../executor/listener/event/LogUpdateEvent.scala | 8 +-
.../executor/listener/event/TaskEvent.scala | 26 +-
.../executor/lock/EngineConnTimedLock.scala | 72 +-
.../acessible/executor/lock/TimedLock.scala | 8 +-
.../acessible/executor/log/LogHelper.scala | 81 +-
.../impl/EngineConnApplicationInfoOperator.scala | 18 +-
.../executor/service/AccessibleService.scala | 12 +-
.../service/DefaultAccessibleService.scala | 69 +-
.../service/DefaultExecutorHeartbeatService.scala | 77 +-
.../executor/service/DefaultManagerService.scala | 32 +-
.../executor/service/DefaultOperateService.scala | 29 +-
.../service/EngineConnTimedLockService.scala | 120 +-
.../service/ExecutorHeartbeatService.scala | 17 +-
.../acessible/executor/service/LockService.scala | 34 +-
.../acessible/executor/service/LogService.scala | 9 +-
.../executor/service/OperateService.scala | 13 +-
.../executor/utils/AccessableExecutorUtils.scala | 12 +-
.../callback/hook/CallbackEngineConnHook.scala | 82 +-
.../service/EngineConnAfterStartCallback.scala | 15 +-
.../callback/service/EngineConnCallback.scala | 19 +-
.../callback/service/EngineConnPidCallback.scala | 14 +-
.../callback/service/EngineConnTimedCallback.scala | 13 +-
.../executor-core/pom.xml | 127 +-
.../executor/ExecutorExecutionContext.scala | 52 +-
.../conf/EngineConnExecutorConfiguration.scala | 50 +-
.../executor/entity/ExecutableExecutor.scala | 11 +-
.../engineconn/executor/entity/Executor.scala | 14 +-
.../engineconn/executor/entity/LabelExecutor.scala | 12 +-
.../executor/entity/ResourceExecutor.scala | 9 +-
.../executor/entity/ResourceFetchExecutor.scala | 2 +-
.../executor/entity/SensibleExecutor.scala | 19 +-
.../engineconn/executor/entity/YarnExecutor.scala | 9 +-
.../listener/EngineConnAsyncListener.scala | 8 +-
.../listener/EngineConnAsyncListenerBus.scala | 37 +-
.../executor/listener/EngineConnSyncListener.scala | 8 +-
.../listener/EngineConnSyncListenerBus.scala | 26 +-
.../listener/ExecutorListenerBusContext.scala | 23 +-
.../listener/event/EngineConnAsyncEvent.scala | 13 +-
.../listener/event/EngineConnSyncEvent.scala | 12 +-
.../engineconn/executor/service/LabelService.scala | 16 +-
.../executor/service/ManagerService.scala | 20 +-
.../linkis-engineconn-plugin-core/pom.xml | 147 +-
.../engineplugin/common/EngineConnPlugin.scala | 15 +-
.../common/conf/EngineConnPluginConf.scala | 17 +-
.../common/conf/EnvConfiguration.scala | 65 +-
.../common/creation/EngineConnFactory.scala | 42 +-
.../common/creation/ExecutorFactory.scala | 17 +-
.../common/creation/LabelExecutorFactory.scala | 23 +-
.../exception/EngineConnBuildFailedException.scala | 12 +-
.../exception/EngineConnPluginErrorCode.scala | 9 +-
.../exception/EngineConnPluginErrorException.scala | 13 +-
.../exception/EngineConnPluginLoadException.scala | 6 +-
.../EngineConnPluginLoadResourceException.scala | 6 +-
.../EngineConnPluginNotFoundException.scala | 6 +-
.../common/launch/EngineConnLaunchBuilder.scala | 16 +-
.../launch/entity/EngineConnBuildRequest.scala | 29 +-
.../launch/entity/EngineConnCreationDesc.scala | 15 +-
.../launch/entity/EngineConnLaunchRequest.scala | 11 +-
.../process/EngineConnResourceGenerator.scala | 11 +-
.../common/launch/process/Environment.scala | 25 +-
.../JavaProcessEngineConnLaunchBuilder.scala | 114 +-
.../process/ProcessEngineConnLaunchBuilder.scala | 69 +-
.../process/ProcessEngineConnLaunchRequest.scala | 41 +-
.../common/loader/conf/PluginLoaderConstant.scala | 9 +-
.../loader/entity/EngineConnPluginInfo.scala | 26 +-
.../loader/entity/EngineConnPluginInstance.scala | 9 +-
.../exception/EngineConnPluginLoadException.scala | 5 +-
.../EngineConnPluginLoadResourceException.scala | 5 +-
.../EngineConnPluginNotFoundException.scala | 5 +-
.../resource/AbstractEngineResourceFactory.scala | 27 +-
.../common/resource/EngineResourceFactory.scala | 9 +-
.../common/resource/EngineResourceRequest.scala | 30 +-
.../resource/GenericEngineResourceFactory.scala | 28 +-
.../common/resource/UserNodeResource.scala | 15 +-
.../linkis-engineconn-plugin-server/pom.xml | 413 ++--
.../engineplugin/cache/EngineConnPluginCache.java | 62 +-
.../cache/GuavaEngineConnPluginCache.java | 241 +-
.../cache/config/EngineConnPluginCacheConfig.java | 13 +-
.../DefaultRefreshPluginCacheContainer.java | 365 +--
.../cache/refresh/PluginCacheRefresher.java | 4 +-
.../cache/refresh/RefreshPluginCacheContainer.java | 60 +-
.../cache/refresh/RefreshPluginCacheOperation.java | 86 +-
.../refresh/RefreshableEngineConnPluginCache.java | 58 +-
.../classloader/EngineConnPluginClassLoader.java | 198 +-
.../loaders/CacheablesEngineConnPluginLoader.java | 128 +-
.../loaders/DefaultEngineConnPluginLoader.java | 412 ++--
.../loader/loaders/EngineConnPluginsLoader.java | 28 +-
.../loaders/EngineConnPluginsResourceLoader.java | 14 +-
.../BmlEngineConnPluginResourceLoader.java | 401 ++--
.../LocalEngineConnPluginResourceLoader.java | 56 +-
.../loader/loaders/resource/PluginResource.java | 90 +-
.../loader/utils/EngineConnPluginUtils.java | 246 +-
.../engineplugin/loader/utils/ExceptionHelper.java | 12 +-
.../server/LinkisEngineConnPluginServer.java | 6 +-
.../conf/EngineConnPluginSpringConfiguration.java | 10 +-
.../server/dao/EngineConnBmlResourceDao.java | 10 +-
.../server/entity/EngineConnBmlResource.java | 180 +-
.../loader/EngineConnPluginLoaderConf.scala | 29 +-
.../conf/EngineConnPluginConfiguration.scala | 21 +-
.../interceptor/EngineConnLaunchInterceptor.scala | 23 +-
.../server/loader/EngineConnPluginsLoader.scala | 17 +-
.../AbstractEngineConnBmlResourceGenerator.scala | 59 +-
.../DefaultEngineConnBmlResourceGenerator.scala | 75 +-
.../localize/EngineConnBmlResourceGenerator.scala | 11 +-
.../service/DefaultEngineConnLaunchService.scala | 50 +-
.../DefaultEngineConnResourceFactoryService.scala | 26 +-
.../service/DefaultEngineConnResourceService.scala | 161 +-
.../server/service/EngineConnLaunchService.scala | 19 +-
.../service/EngineConnResourceFactoryService.scala | 14 +-
.../server/service/EngineConnResourceService.scala | 20 +-
.../loader/EngineConnPluginLoaderTest.java | 20 +-
.../linkis-engineconn/pom.xml | 44 +-
.../linkis-entrance/pom.xml | 291 +--
.../linkis/entrance/LinkisEntranceApplication.java | 6 +-
.../EntranceExecutorManagerBeanAnnotation.java | 38 +-
.../annotation/EntranceParserBeanAnnotation.java | 38 +-
.../annotation/EntranceServerBeanAnnotation.java | 38 +-
.../PersistenceEngineBeanAnnotation.java | 38 +-
.../entrance/conf/EntranceSpringConfiguration.java | 294 +--
.../entrance/constant/ServiceNameConsts.java | 8 +-
.../entrance/context/DefaultEntranceContext.java | 142 +-
.../entrance/exception/EntranceErrorCode.java | 51 +-
.../exception/EntranceIllegalParamException.java | 12 +-
.../entrance/exception/EntranceRPCException.java | 14 +-
.../entrance/exception/QueryFailedException.java | 14 +-
.../entrance/job/EntranceExecuteRequest.java | 136 +-
.../linkis/entrance/job/EntranceExecutionJob.java | 386 +--
.../entrance/parser/AbstractEntranceParser.java | 220 +-
.../apache/linkis/entrance/parser/ParserUtils.java | 108 +-
.../persistence/QueryPersistenceEngine.java | 288 +--
.../persistence/QueryPersistenceManager.java | 284 +--
.../entrance/server/DefaultEntranceServer.java | 99 +-
.../entrance/vo/YarnResourceWithStatusVo.java | 166 +-
.../apache/linkis/entrance/EntranceContext.scala | 19 +-
.../apache/linkis/entrance/EntranceParser.scala | 12 +-
.../apache/linkis/entrance/EntranceServer.scala | 159 +-
.../linkis/entrance/EntranceWebSocketService.scala | 476 ++--
.../cache/GlobalConfigurationKeyValueCache.scala | 26 +-
.../cli/heartbeat/CliHeartbeatMonitor.scala | 42 +-
.../cli/heartbeat/HeartbeatLossHandler.scala | 2 +-
.../entrance/cli/heartbeat/KillHandler.scala | 13 +-
.../entrance/conf/EntranceConfiguration.scala | 178 +-
.../linkis/entrance/cs/CSEntranceHelper.scala | 118 +-
.../errorcode/EntranceErrorConstants.scala | 122 +-
.../linkis/entrance/event/EntranceEvent.scala | 24 +-
.../entrance/event/EntranceEventListener.scala | 9 +-
.../entrance/event/EntranceEventListenerBus.scala | 24 +-
.../linkis/entrance/event/EntranceLogEvent.scala | 22 +-
.../entrance/event/EntranceLogListener.scala | 9 +-
.../entrance/event/EntranceLogListenerBus.scala | 24 +-
.../exception/CacheNotReadyException.scala | 16 +-
.../exception/EntranceCastFailException.scala | 15 +-
.../exception/EntranceErrorException.scala | 10 +-
.../exception/JobHistoryFailedException.scala | 11 +-
.../exception/LogReadFailedException.scala | 14 +-
.../exception/SensitiveTablesCheckException.scala | 13 +-
.../entrance/exception/SubmitFailedException.scala | 14 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 209 +-
.../entrance/execute/EngineLockListener.scala | 11 +-
.../linkis/entrance/execute/EntranceExecutor.scala | 61 +-
.../entrance/execute/EntranceExecutorManager.scala | 135 +-
.../linkis/entrance/execute/EntranceJob.scala | 194 +-
.../execute/ExecuteRequestInterceptor.scala | 118 +-
.../entrance/execute/JobLockExecuteRequest.scala | 11 +-
.../apache/linkis/entrance/execute/MarkReq.scala | 15 +-
.../execute/impl/EntranceExecutorManagerImpl.scala | 27 +-
.../execute/operation/ScriptisOperation.scala | 17 +-
.../entrance/interceptor/EntranceInterceptor.scala | 34 +-
.../entrance/interceptor/OnceJobInterceptor.scala | 77 +-
.../entrance/interceptor/RuntypeInterceptor.scala | 18 +-
.../interceptor/exception/CodeCheckException.scala | 15 +-
.../exception/LabelCheckException.scala | 15 +-
.../exception/LimitCheckException.scala | 15 +-
.../exception/LogPathCreateException.scala | 16 +-
.../exception/PythonCodeCheckException.scala | 22 +-
.../exception/VarSubstitutionException.scala | 14 +-
.../interceptor/impl/CSEntranceInterceptor.scala | 13 +-
.../interceptor/impl/CommentInterceptor.scala | 47 +-
.../interceptor/impl/CompatibleInterceptor.scala | 7 +-
.../interceptor/impl/CustomVariableUtils.scala | 34 +-
.../impl/DBInfoCompleteInterceptor.scala | 13 +-
.../linkis/entrance/interceptor/impl/Explain.scala | 274 +--
.../interceptor/impl/LabelCheckInterceptor.scala | 50 +-
.../impl/LogPathCreateInterceptor.scala | 47 +-
.../impl/ParserVarLabelInterceptor.scala | 16 +-
.../impl/PythonCodeCheckInterceptor.scala | 41 +-
.../interceptor/impl/SQLCodeCheckInterceptor.scala | 24 +-
.../impl/SQLLimitEntranceInterceptor.scala | 30 +-
.../interceptor/impl/ScalaCodeInterceptor.scala | 25 +-
.../impl/ShellDangerousGrammerInterceptor.scala | 56 +-
.../impl/SparkCodeCheckInterceptor.scala | 23 +-
.../impl/StorePathEntranceInterceptor.scala | 29 +-
.../impl/VarSubstitutionInterceptor.scala | 34 +-
.../org/apache/linkis/entrance/log/Cache.scala | 14 +-
.../linkis/entrance/log/CacheLogManager.scala | 58 +-
.../linkis/entrance/log/CacheLogReader.scala | 35 +-
.../linkis/entrance/log/CacheLogWriter.scala | 31 +-
.../org/apache/linkis/entrance/log/ErrorCode.scala | 10 +-
.../linkis/entrance/log/ErrorCodeListener.scala | 41 +-
.../linkis/entrance/log/ErrorCodeManager.scala | 35 +-
.../linkis/entrance/log/HDFSCacheLogWriter.scala | 59 +-
.../org/apache/linkis/entrance/log/LogFilter.scala | 14 +-
.../apache/linkis/entrance/log/LogHandler.scala | 22 +-
.../apache/linkis/entrance/log/LogManager.scala | 40 +-
.../org/apache/linkis/entrance/log/LogReader.scala | 143 +-
.../org/apache/linkis/entrance/log/LogWriter.scala | 48 +-
.../org/apache/linkis/entrance/log/LoopArray.scala | 43 +-
.../entrance/log/WebSocketCacheLogReader.scala | 29 +-
.../linkis/entrance/log/WebSocketLogWriter.scala | 28 +-
.../EntranceOrchestrationFactory.scala | 14 +-
.../EntranceUserParallelOrchestratorPlugin.scala | 79 +-
.../entrance/parser/CommonEntranceParser.scala | 178 +-
.../persistence/EntranceResultSetEngine.scala | 25 +-
.../entrance/persistence/HaPersistenceTask.scala | 8 +-
.../persistence/JobCompletedListener.scala | 11 +-
.../entrance/persistence/PersistenceEngine.scala | 16 +-
.../entrance/persistence/PersistenceManager.scala | 19 +-
.../entrance/persistence/ResultSetEngine.scala | 11 +-
.../entrance/persistence/ResultSetListener.scala | 11 +-
.../entrance/restful/EntranceRestfulRemote.scala | 49 +-
.../entrance/scheduler/EntranceGroupFactory.scala | 135 +-
.../scheduler/EntranceSchedulerContext.scala | 19 +-
.../cache/CacheOutputExecuteResponse.scala | 11 +-
.../scheduler/cache/ReadCacheConsumer.scala | 69 +-
.../scheduler/cache/ReadCacheConsumerManager.scala | 20 +-
.../entrance/timeout/JobTimeoutManager.scala | 103 +-
.../linkis/entrance/utils/CommonLogPathUtils.scala | 7 +-
.../linkis/entrance/utils/JobHistoryHelper.scala | 68 +-
.../apache/linkis/entrance/utils/LogHelper.scala | 5 +-
.../apache/linkis/entrance/utils/RGBUtils.scala | 3 +-
.../linkis-application-manager/pom.xml | 308 +--
.../manager/am/LinkisManagerApplication.java | 8 +-
.../linkis/manager/am/exception/AMErrorCode.java | 46 +-
.../manager/am/exception/AMErrorException.java | 14 +-
.../manager/am/exception/AMRetryException.java | 14 +-
.../manager/am/service/ECResourceInfoService.java | 12 +-
.../am/service/impl/ECResourceInfoServiceImpl.java | 56 +-
.../manager/am/util/ECResourceInfoUtils.java | 70 +-
.../linkis/manager/am/vo/AMEngineNodeVo.java | 364 +--
.../manager/am/vo/ECResourceInfoRecordVo.java | 372 +--
.../org/apache/linkis/manager/am/vo/EMNodeVo.java | 308 +--
.../apache/linkis/manager/am/vo/ResourceVo.java | 42 +-
.../linkis/manager/rm/conf/ResourceStatus.java | 44 +-
.../linkis/manager/rm/domain/RMLabelContainer.java | 286 +--
.../linkis/manager/rm/exception/RMErrorCode.java | 93 +-
.../external/dao/ExternalResourceProviderDao.java | 2 +-
.../domain/ExternalResourceIdentifier.java | 2 +-
.../external/domain/ExternalResourceProvider.java | 90 +-
.../parser/ExternalResourceIdentifierParser.java | 4 +-
.../parser/YarnResourceIdentifierParser.java | 18 +-
.../request/ExternalResourceRequester.java | 12 +-
.../external/service/ExternalResourceService.java | 48 +-
.../service/impl/ExternalResourceServiceImpl.java | 330 +--
.../rm/external/yarn/YarnResourceIdentifier.java | 22 +-
.../manager/rm/restful/vo/ApplicationListVo.java | 60 +-
.../manager/rm/restful/vo/EngineInstanceVo.java | 126 +-
.../rm/restful/vo/UserCreatorEngineType.java | 56 +-
.../manager/rm/restful/vo/UserResourceVo.java | 210 +-
.../manager/rm/utils/RequestKerberosUrlUtils.java | 205 +-
.../linkis/manager/am/conf/AMConfiguration.scala | 62 +-
.../manager/am/conf/ConfigurationMapCache.scala | 40 +-
.../am/conf/EngineConnConfigurationService.scala | 25 +-
.../manager/am/conf/ManagerMonitorConf.scala | 17 +-
.../am/converter/DefaultMetricsConverter.scala | 27 +-
.../linkis/manager/am/label/AMLabelChecker.scala | 21 +-
.../linkis/manager/am/label/AMLabelFilter.scala | 25 +-
.../am/label/DefaultManagerLabelService.scala | 17 +-
.../manager/am/label/EngineReuseLabelRester.scala | 12 +-
.../label/MultiUserEngineReuseLabelChooser.scala | 29 +-
.../am/locker/DefaultEngineNodeLocker.scala | 27 +-
.../manager/am/locker/EngineNodeLocker.scala | 12 +-
.../manager/am/manager/DefaultEMNodeManager.scala | 97 +-
.../am/manager/DefaultEngineNodeManager.scala | 189 +-
.../linkis/manager/am/manager/EMNodeManager.scala | 40 +-
.../manager/am/manager/EngineNodeManager.scala | 52 +-
.../manager/am/pointer/AbstractNodePointer.scala | 47 +-
.../manager/am/pointer/DefaultEMNodPointer.scala | 46 +-
.../pointer/DefaultEngineConnPluginPointer.scala | 29 +-
.../am/pointer/DefaultEngineNodPointer.scala | 34 +-
.../am/pointer/DefaultNodePointerBuilder.scala | 17 +-
.../am/pointer/EngineConnPluginPointer.scala | 9 +-
.../am/recycle/AssignNodeRuleExecutor.scala | 24 +-
.../manager/am/recycle/RecyclingRuleExecutor.scala | 9 +-
.../linkis/manager/am/rpc/ManagerRPCFormats.scala | 17 +-
.../manager/am/selector/DefaultNodeSelector.scala | 29 +-
.../manager/am/selector/ECAvailableRule.scala | 15 +-
.../linkis/manager/am/selector/NodeSelector.scala | 9 +-
.../am/selector/rule/AvailableNodeSelectRule.scala | 29 +-
.../selector/rule/ConcurrencyNodeSelectRule.scala | 14 +-
.../am/selector/rule/NewECMStandbyRule.scala | 45 +-
.../manager/am/selector/rule/NodeSelectRule.scala | 9 +-
.../am/selector/rule/OverLoadNodeSelectRule.scala | 33 +-
.../am/selector/rule/ResourceNodeSelectRule.scala | 57 +-
.../am/selector/rule/ScoreNodeSelectRule.scala | 22 +-
.../am/selector/rule/TaskInfoNodeSelectRule.scala | 33 +-
.../manager/am/service/EMEngineService.scala | 12 +-
.../linkis/manager/am/service/EngineService.scala | 11 +-
.../manager/am/service/HeartbeatService.scala | 9 +-
.../cache/ConfCacheRemoveBroadcastListener.scala | 65 +-
.../am/service/em/DefaultECMOperateService.scala | 3 +-
.../am/service/em/DefaultEMEngineService.scala | 55 +-
.../am/service/em/DefaultEMInfoService.scala | 42 +-
.../am/service/em/DefaultEMRegisterService.scala | 59 +-
.../am/service/em/DefaultEMUnregisterService.scala | 31 +-
.../manager/am/service/em/ECMOperateService.scala | 1 +
.../manager/am/service/em/EMInfoService.scala | 9 +-
.../manager/am/service/em/EMRegisterService.scala | 19 +-
.../am/service/em/EMUnregisterService.scala | 9 +-
.../am/service/engine/AbstractEngineService.scala | 13 +-
.../engine/DefaultEngineAskEngineService.scala | 79 +-
.../engine/DefaultEngineConnCanKillService.scala | 36 +-
.../DefaultEngineConnStatusCallbackService.scala | 33 +-
.../engine/DefaultEngineCreateService.scala | 249 +-
.../service/engine/DefaultEngineInfoService.scala | 60 +-
.../engine/DefaultEngineOperateService.scala | 24 +-
.../engine/DefaultEngineRecycleService.scala | 52 +-
.../service/engine/DefaultEngineReuseService.scala | 128 +-
.../service/engine/DefaultEngineStopService.scala | 74 +-
.../engine/DefaultEngineSwitchService.scala | 10 +-
.../am/service/engine/EngineAskEngineService.scala | 9 +-
.../service/engine/EngineConnCanKillService.scala | 3 +-
.../engine/EngineConnStatusCallbackService.scala | 13 +-
.../am/service/engine/EngineCreateService.scala | 9 +-
.../am/service/engine/EngineInfoService.scala | 20 +-
.../am/service/engine/EngineKillService.scala | 14 +-
.../am/service/engine/EngineOperateService.scala | 18 +-
.../am/service/engine/EngineRecycleService.scala | 9 +-
.../am/service/engine/EngineReuseService.scala | 9 +-
.../am/service/engine/EngineStopService.scala | 21 +-
.../am/service/engine/EngineSwitchService.scala | 9 +-
.../am/service/heartbeat/AMHeartbeatService.scala | 31 +-
.../am/service/monitor/NodeHeartbeatMonitor.scala | 234 +-
.../apache/linkis/manager/am/utils/AMUtils.scala | 245 +-
.../linkis/manager/label/LabelManagerUtils.scala | 3 +-
.../manager/label/conf/LabelManagerConf.scala | 12 +-
.../label/score/DefaultNodeLabelScorer.scala | 170 +-
.../label/score/LabelScoreServiceInstance.scala | 15 +-
.../manager/label/score/NodeLabelScorer.scala | 31 +-
.../label/service/NodeLabelAddService.scala | 9 +-
.../label/service/NodeLabelRemoveService.scala | 9 +-
.../manager/label/service/NodeLabelService.scala | 45 +-
.../label/service/ResourceLabelService.scala | 62 +-
.../manager/label/service/UserLabelService.scala | 10 +-
.../service/impl/DefaultNodeLabelAddService.scala | 14 +-
.../impl/DefaultNodeLabelRemoveService.scala | 21 +-
.../service/impl/DefaultNodeLabelService.scala | 273 +--
.../service/impl/DefaultResourceLabelService.scala | 122 +-
.../service/impl/DefaultUserLabelService.scala | 59 +-
.../manager/rm/external/yarn/YarnAppInfo.scala | 11 +-
.../rm/external/yarn/YarnResourceRequester.scala | 216 +-
.../manager/rm/message/RMMessageService.scala | 22 +-
.../linkis/manager/rm/restful/RMMonitorRest.scala | 567 ++---
.../manager/rm/service/LabelResourceService.scala | 14 +-
.../rm/service/RequestResourceService.scala | 334 +--
.../manager/rm/service/ResourceLockService.scala | 32 +-
.../manager/rm/service/ResourceManager.scala | 92 +-
.../service/impl/DefaultReqResourceService.scala | 6 +-
.../rm/service/impl/DefaultResourceManager.scala | 529 ++---
.../impl/DriverAndYarnReqResourceService.scala | 88 +-
.../rm/service/impl/LabelResourceServiceImpl.scala | 34 +-
.../rm/service/impl/ResourceLogService.scala | 58 +-
.../rm/service/impl/UserResourceService.scala | 39 +-
.../apache/linkis/manager/rm/utils/RMUtils.scala | 177 +-
.../manager/rm/utils/UserConfiguration.scala | 114 +-
.../service/common/label/LabelChecker.scala | 9 +-
.../manager/service/common/label/LabelFilter.scala | 9 +-
.../service/common/label/ManagerLabelService.scala | 9 +-
.../service/common/metrics/MetricsConverter.scala | 10 +-
.../service/common/pointer/EMNodPointer.scala | 9 +-
.../service/common/pointer/EngineNodePointer.scala | 15 +-
.../service/common/pointer/NodePointer.scala | 50 +-
.../common/pointer/NodePointerBuilder.scala | 9 +-
.../linkis-manager/linkis-label-common/pom.xml | 123 +-
.../label/builder/AbstractGenericLabelBuilder.java | 616 ++---
.../label/builder/CombinedLabelBuilder.java | 63 +-
.../label/builder/DefaultGlobalLabelBuilder.java | 459 ++--
.../label/builder/ExtensibleLabelBuilder.java | 78 +-
.../manager/label/builder/GenericLabelBuilder.java | 81 +-
.../linkis/manager/label/builder/LabelBuilder.java | 34 +-
.../manager/label/builder/LabelBuilderAdapter.java | 143 +-
.../label/builder/factory/LabelBuilderFactory.java | 158 +-
.../factory/LabelBuilderFactoryContext.java | 99 +-
.../builder/factory/StdLabelBuilderFactory.java | 350 +--
.../manager/label/conf/LabelCommonConfig.java | 88 +-
.../manager/label/constant/LabelConstant.java | 4 +-
.../manager/label/constant/LabelKeyConstant.java | 44 +-
.../manager/label/entity/CloneableLabel.java | 28 +-
.../linkis/manager/label/entity/CombinedLabel.java | 10 +-
.../manager/label/entity/CombinedLabelImpl.java | 106 +-
.../linkis/manager/label/entity/Feature.java | 48 +-
.../linkis/manager/label/entity/GenericLabel.java | 40 +-
.../manager/label/entity/InheritableLabel.java | 58 +-
.../apache/linkis/manager/label/entity/Label.java | 80 +-
.../manager/label/entity/SerializableLabel.java | 233 +-
.../linkis/manager/label/entity/TenantLabel.java | 66 +-
.../manager/label/entity/UserModifiable.java | 6 +-
.../manager/label/entity/annon/ValueSerialNum.java | 2 +-
.../manager/label/entity/cache/CacheLabel.java | 58 +-
.../manager/label/entity/cluster/ClusterLabel.java | 58 +-
.../manager/label/entity/cluster/EnvLabel.java | 51 +-
.../manager/label/entity/em/EMInstanceLabel.java | 80 +-
.../label/entity/engine/CodeLanguageLabel.java | 28 +-
.../entity/engine/ConcurrentEngineConnLabel.java | 28 +-
.../label/entity/engine/EngineBaseInfoLabel.java | 66 +-
.../label/entity/engine/EngineInstanceLabel.java | 83 +-
.../label/entity/engine/EngineTypeLabel.java | 68 +-
.../label/entity/engine/ReuseExclusionLabel.java | 62 +-
.../label/entity/engine/UserCreatorLabel.java | 88 +-
.../label/entity/entrance/BindEngineLabel.java | 124 +-
.../label/entity/entrance/ExecuteOnceLabel.java | 14 +-
.../entity/entrance/JobQueuingTimeoutLabel.java | 29 +-
.../entity/entrance/JobRunningTimeoutLabel.java | 29 +-
.../label/entity/entrance/LoadBalanceLabel.java | 84 +-
.../label/entity/entrance/RetryCountLabel.java | 28 +-
.../entity/entrance/RetryWaitTimeOutLabel.java | 28 +-
.../entity/node/AliasServiceInstanceLabel.java | 60 +-
.../label/entity/node/NodeInstanceLabel.java | 4 +-
.../manager/label/entity/route/RouteLabel.java | 58 +-
.../label/entity/search/SearchableLabel.java | 16 +-
.../label/exception/LabelErrorException.java | 14 +-
.../label/exception/LabelRuntimeException.java | 21 +-
.../label/utils/EngineTypeLabelCreator.java | 144 +-
.../linkis/manager/label/utils/LabelUtils.java | 631 ++---
.../linkis/manager/label/utils/LabelUtil.scala | 27 +-
.../linkis/manager/label/TestLabelBuilder.java | 19 +-
.../linkis-manager/linkis-manager-common/pom.xml | 152 +-
.../linkis/manager/common/constant/AMConstant.java | 16 +-
.../linkis/manager/common/constant/RMConstant.java | 12 +-
.../common/entity/enumeration/MaintainType.java | 6 +-
.../common/entity/enumeration/NodeHealthy.java | 36 +-
.../common/entity/enumeration/NodeStatus.java | 164 +-
.../manager/common/entity/label/LabelKeyValue.java | 38 +-
.../common/entity/metrics/AMNodeMetrics.java | 98 +-
.../common/entity/metrics/NodeHealthyInfo.java | 28 +-
.../manager/common/entity/metrics/NodeMetrics.java | 14 +-
.../common/entity/metrics/NodeOverLoadInfo.java | 56 +-
.../common/entity/metrics/NodeTaskInfo.java | 62 +-
.../manager/common/entity/node/AMEMNode.java | 284 +--
.../manager/common/entity/node/AMEngineNode.java | 398 ++--
.../linkis/manager/common/entity/node/AMNode.java | 12 +-
.../entity/node/DefaultScoreServiceInstance.java | 36 +-
.../manager/common/entity/node/EngineNode.java | 12 +-
.../manager/common/entity/node/InfoRMNode.java | 110 +-
.../manager/common/entity/node/LabelNode.java | 4 +-
.../linkis/manager/common/entity/node/Node.java | 20 +-
.../linkis/manager/common/entity/node/RMNode.java | 4 +-
.../common/entity/node/ScoreServiceInstance.java | 8 +-
.../entity/persistence/ECResourceInfoRecord.java | 312 +--
.../entity/persistence/PersistenceLabel.java | 182 +-
.../entity/persistence/PersistenceLabelRel.java | 14 +-
.../common/entity/persistence/PersistenceLock.java | 128 +-
.../common/entity/persistence/PersistenceNode.java | 126 +-
.../entity/persistence/PersistenceNodeEntity.java | 132 +-
.../entity/persistence/PersistenceNodeMetrics.java | 164 +-
.../persistence/PersistenceNodeMetricsEntity.java | 146 +-
.../entity/persistence/PersistenceResource.java | 226 +-
.../common/entity/resource/CommonNodeResource.java | 312 +--
.../common/entity/resource/NodeResource.java | 40 +-
.../entity/resource/ResourceActionRecord.java | 154 +-
.../common/entity/resource/ResourceType.java | 18 +-
.../common/entity/resource/UserResource.java | 84 +-
.../manager/common/exception/RMErrorException.java | 20 +-
.../manager/common/exception/RMFatalException.java | 12 +-
.../manager/common/exception/RMWarnException.java | 12 +-
.../common/exception/ResourceWarnException.java | 13 +-
.../manager/common/protocol/bml/BmlResource.java | 138 +-
.../common/protocol/em/EMInfoClearRequest.java | 30 +-
.../manager/common/protocol/em/EMRequest.java | 2 +-
.../common/protocol/em/EMResourceClearRequest.java | 30 +-
.../common/protocol/em/GetEMEnginesRequest.java | 30 +-
.../common/protocol/em/GetEMInfoRequest.java | 30 +-
.../manager/common/protocol/em/PauseEMRequest.java | 30 +-
.../manager/common/protocol/em/StopEMRequest.java | 30 +-
.../common/protocol/engine/ECCanKillRequest.java | 110 +-
.../common/protocol/engine/ECCanKillResponse.java | 70 +-
.../common/protocol/engine/EngineAskRequest.java | 170 +-
.../protocol/engine/EngineConnReleaseRequest.java | 74 +-
.../protocol/engine/EngineCreateRequest.java | 188 +-
.../protocol/engine/EngineInfoClearRequest.java | 32 +-
.../common/protocol/engine/EngineLockType.java | 14 +-
.../protocol/engine/EngineRecyclingRequest.java | 30 +-
.../protocol/engine/EngineReourceClearRequest.java | 32 +-
.../common/protocol/engine/EngineRequest.java | 2 +-
.../common/protocol/engine/EngineReuseRequest.java | 106 +-
.../common/protocol/engine/EngineStopRequest.java | 68 +-
.../common/protocol/engine/EngineStopResponse.java | 38 +-
.../protocol/engine/EngineSuicideRequest.java | 76 +-
.../protocol/engine/EngineSwitchRequest.java | 8 +-
.../common/protocol/node/NodeHealthyRequest.java | 14 +-
.../common/protocol/node/NodeHeartbeatMsg.java | 109 +-
.../common/protocol/node/NodeHeartbeatRequest.java | 2 +-
.../protocol/node/NodeHeartbeatResourceMsg.java | 111 +-
.../common/protocol/node/RequestNodeStatus.java | 2 +-
.../common/protocol/node/ResponseNodeStatus.java | 14 +-
.../common/protocol/node/StopNodeRequest.java | 2 +-
.../protocol/yarn/YarnAuthorizationResponse.java | 36 +-
.../linkis/manager/common/utils/ManagerUtils.java | 34 +-
.../manager/common/conf/ManagerCommonConf.scala | 9 +-
.../manager/common/conf/RMConfiguration.scala | 49 +-
.../common/entity/recycle/RecyclingRule.scala | 15 +-
.../manager/common/entity/resource/Resource.scala | 547 ++---
.../manager/common/monitor/ManagerMonitor.scala | 13 +-
.../linkis/manager/common/operator/Operator.scala | 13 +-
.../manager/common/operator/OperatorFactory.scala | 15 +-
.../manager/common/protocol/EngineLock.scala | 20 +-
.../manager/common/protocol/OperateRequest.scala | 23 +-
.../manager/common/protocol/OperateResponse.scala | 3 +-
.../common/protocol/ServiceHealthReport.scala | 13 +-
.../manager/common/protocol/ServiceState.scala | 13 +-
.../common/protocol/em/ECMOperateRequest.scala | 14 +-
.../common/protocol/em/ECMOperateResponse.scala | 12 +-
.../protocol/em/EMResourceRegisterRequest.scala | 4 +-
.../common/protocol/em/RegisterEMRequest.scala | 9 +-
.../common/protocol/em/RegisterEMResponse.scala | 12 +-
.../protocol/engine/EngineAsyncResponse.scala | 19 +-
.../protocol/engine/EngineConnStatusCallback.scala | 30 +-
.../protocol/engine/EngineOperateRequest.scala | 15 +-
.../protocol/engine/EngineOperateResponse.scala | 10 +-
.../common/protocol/label/LabelUpdateRequest.scala | 12 +-
.../protocol/resource/ResourceProtocol.scala | 29 +-
.../protocol/resource/ResourceWithStatus.scala | 15 +-
.../common/serializer/NodeResourceSerializer.scala | 77 +-
.../serializer/RegisterEMRequestSerializer.scala | 65 +-
.../manager/common/utils/ResourceUtils.scala | 136 +-
.../linkis/manager/rm/ResourceManagerParam.scala | 18 +-
.../apache/linkis/manager/rm/ResultResource.scala | 29 +-
.../linkis-manager-persistence/pom.xml | 160 +-
.../manager/PersistenceSpringConfiguration.java | 160 +-
.../linkis/manager/dao/ECResourceRecordMapper.java | 22 +-
.../linkis/manager/dao/LabelManagerMapper.java | 346 +--
.../linkis/manager/dao/LockManagerMapper.java | 34 +-
.../linkis/manager/dao/NodeManagerMapper.java | 244 +-
.../manager/dao/NodeMetricManagerMapper.java | 131 +-
.../linkis/manager/dao/ResourceManagerMapper.java | 152 +-
.../org/apache/linkis/manager/entity/Tunple.java | 30 +-
.../exception/NodeInstanceDuplicateException.java | 6 +-
.../exception/NodeInstanceNotFoundException.java | 6 +-
.../exception/PersistenceErrorException.java | 14 +-
.../exception/PersistenceWarnException.java | 14 +-
.../persistence/LabelManagerPersistence.java | 115 +-
.../persistence/LockManagerPersistence.java | 6 +-
.../manager/persistence/ManagerPersistence.java | 10 +-
.../persistence/NodeManagerPersistence.java | 154 +-
.../persistence/NodeMetricManagerPersistence.java | 76 +-
.../persistence/ResourceLabelPersistence.java | 73 +-
.../persistence/ResourceManagerPersistence.java | 219 +-
.../impl/DefaultLabelManagerPersistence.java | 630 ++---
.../impl/DefaultLockManagerPersistence.java | 89 +-
.../impl/DefaultManagerPersistence.java | 121 +-
.../impl/DefaultNodeManagerPersistence.java | 436 ++--
.../impl/DefaultNodeMetricManagerPersistence.java | 267 ++-
.../impl/DefaultResourceLabelPersistence.java | 280 +--
.../impl/DefaultResourceManagerPersistence.java | 332 +--
.../linkis/manager/util/PersistenceUtils.java | 99 +-
.../test/java/org/apache/linkis/manager/Scan.java | 20 +-
.../manager/persistence/PersistenceTest.java | 478 ++--
.../linkis-manager/pom.xml | 93 +-
linkis-computation-governance/pom.xml | 44 +-
linkis-dist/bin/install.sh | 2 +-
linkis-dist/docker/ldh.Dockerfile | 89 -
linkis-dist/docker/linkis.Dockerfile | 99 -
linkis-dist/docker/scripts/entry-point-ldh.sh | 53 -
linkis-dist/docker/scripts/prepare-ldh-image.sh | 82 -
linkis-dist/helm/README.md | 305 ---
linkis-dist/helm/charts/linkis/.helmignore | 38 -
linkis-dist/helm/charts/linkis/Chart.yaml | 39 -
linkis-dist/helm/charts/linkis/templates/NOTES.txt | 30 -
.../helm/charts/linkis/templates/_helpers.tpl | 393 ---
.../linkis/templates/configmap-init-sql.yaml | 1406 -----------
.../linkis/templates/configmap-linkis-config.yaml | 321 ---
.../templates/configmap-linkis-web-config.yaml | 54 -
linkis-dist/helm/charts/linkis/templates/jobs.yaml | 52 -
.../templates/linkis-cg-engineconnmanager.yaml | 186 --
.../linkis/templates/linkis-cg-engineplugin.yaml | 186 --
.../linkis/templates/linkis-cg-entrance.yaml | 186 --
.../linkis/templates/linkis-cg-linkismanager.yaml | 186 --
.../charts/linkis/templates/linkis-mg-eureka.yaml | 168 --
.../charts/linkis/templates/linkis-mg-gateway.yaml | 186 --
.../helm/charts/linkis/templates/linkis-ps-cs.yaml | 186 --
.../templates/linkis-ps-data-source-manager.yaml | 186 --
.../linkis/templates/linkis-ps-metadataquery.yaml | 189 --
.../linkis/templates/linkis-ps-publicservice.yaml | 186 --
.../helm/charts/linkis/templates/linkis-web.yaml | 126 -
.../charts/linkis/templates/serviceaccount.yaml | 57 -
linkis-dist/helm/charts/linkis/values.yaml | 370 ---
linkis-dist/helm/scripts/common.sh | 33 -
linkis-dist/helm/scripts/create-kind-cluster.sh | 38 -
linkis-dist/helm/scripts/install-charts.sh | 43 -
linkis-dist/helm/scripts/install-ldh.sh | 38 -
linkis-dist/helm/scripts/install-mysql.sh | 35 -
linkis-dist/helm/scripts/login-pod.sh | 32 -
linkis-dist/helm/scripts/remote-debug-proxy.sh | 106 -
.../helm/scripts/resources/kind-cluster.yaml | 30 -
.../resources/ldh/configmaps/configmap-flink.yaml | 562 -----
.../resources/ldh/configmaps/configmap-hadoop.yaml | 659 ------
.../resources/ldh/configmaps/configmap-hive.yaml | 230 --
.../resources/ldh/configmaps/configmap-spark.yaml | 208 --
.../ldh/configmaps/configmap-zookeeper.yaml | 98 -
linkis-dist/helm/scripts/resources/ldh/ldh.yaml | 216 --
linkis-dist/helm/scripts/resources/mysql.yaml | 57 -
linkis-dist/package/db/linkis_dml.sql | 1 -
linkis-dist/package/sbin/ext/linkis-common-start | 30 +-
linkis-dist/package/sbin/ext/linkis-mg-eureka | 33 +-
linkis-dist/package/sbin/ext/linkis-mg-gateway | 31 +-
linkis-dist/pom.xml | 507 ++--
linkis-engineconn-plugins/elasticsearch/pom.xml | 263 ++-
.../ElasticSearchEngineConnPlugin.scala | 15 +-
...asticSearchProcessEngineConnLaunchBuilder.scala | 1 -
.../conf/ElasticSearchConfiguration.scala | 1 -
.../exception/EsConvertResponseException.scala | 3 +-
.../exception/EsEngineException.scala | 1 -
.../exception/EsParamsIllegalException.scala | 1 -
.../executer/ElasticSearchEngineConnExecutor.scala | 93 +-
.../executer/ElasticSearchExecutorOrder.scala | 3 +-
.../executer/client/ElasticSearchExecutor.scala | 10 +-
.../executer/client/ElasticSearchResponse.scala | 10 +-
.../elasticsearch/executer/client/EsClient.scala | 48 +-
.../executer/client/EsClientFactory.scala | 87 +-
.../executer/client/ResponseHandler.scala | 17 +-
.../client/impl/ElasticSearchExecutorImpl.scala | 81 +-
.../executer/client/impl/ResponseHandlerImpl.scala | 81 +-
.../factory/ElasticSearchEngineConnFactory.scala | 17 +-
.../factory/ElasticSearchJsonExecutorFactory.scala | 20 +-
.../factory/ElasticSearchSqlExecutorFactory.scala | 20 +-
linkis-engineconn-plugins/flink/pom.xml | 929 ++++----
.../flink/client/config/Environment.java | 518 ++--
.../flink/client/config/entries/ConfigEntry.java | 56 +-
.../client/config/entries/ExecutionEntry.java | 668 +++---
.../flink/client/context/ExecutionContext.java | 1262 +++++-----
.../deployment/ClusterDescriptorAdapter.java | 331 +--
.../ClusterDescriptorAdapterFactory.java | 24 +-
.../YarnApplicationClusterDescriptorAdapter.java | 82 +-
.../YarnPerJobClusterDescriptorAdapter.java | 95 +-
.../factory/LinkisYarnClusterClientFactory.java | 120 +-
.../flink/client/result/AbstractResult.java | 38 +-
.../flink/client/result/BatchResult.java | 187 +-
.../flink/client/result/ChangelogResult.java | 398 ++--
.../flink/client/result/Result.java | 26 +-
.../flink/client/result/ResultUtil.java | 134 +-
.../flink/client/result/TypedResult.java | 94 +-
.../client/sql/operation/AbstractJobOperation.java | 198 +-
.../flink/client/sql/operation/JobOperation.java | 10 +-
.../flink/client/sql/operation/Operation.java | 4 +-
.../client/sql/operation/OperationFactory.java | 10 +-
.../client/sql/operation/OperationFactoryImpl.java | 190 +-
.../flink/client/sql/operation/OperationUtil.java | 78 +-
.../sql/operation/impl/CreateViewOperation.java | 62 +-
.../client/sql/operation/impl/DDLOperation.java | 108 +-
.../sql/operation/impl/DescribeTableOperation.java | 117 +-
.../sql/operation/impl/DropViewOperation.java | 78 +-
.../sql/operation/impl/ExplainOperation.java | 74 +-
.../client/sql/operation/impl/InsertOperation.java | 149 +-
.../client/sql/operation/impl/ResetOperation.java | 35 +-
.../client/sql/operation/impl/SelectOperation.java | 324 +--
.../client/sql/operation/impl/SetOperation.java | 125 +-
.../sql/operation/impl/ShowCatalogsOperation.java | 22 +-
.../impl/ShowCurrentCatalogOperation.java | 22 +-
.../impl/ShowCurrentDatabaseOperation.java | 22 +-
.../sql/operation/impl/ShowDatabasesOperation.java | 22 +-
.../sql/operation/impl/ShowFunctionsOperation.java | 22 +-
.../sql/operation/impl/ShowModulesOperation.java | 22 +-
.../sql/operation/impl/ShowTablesOperation.java | 45 +-
.../sql/operation/impl/ShowViewsOperation.java | 48 +-
.../sql/operation/impl/UseCatalogOperation.java | 46 +-
.../sql/operation/impl/UseDatabaseOperation.java | 40 +-
.../client/sql/operation/result/ColumnInfo.java | 95 +-
.../client/sql/operation/result/ConstantNames.java | 44 +-
.../client/sql/operation/result/ResultKind.java | 8 +-
.../client/sql/operation/result/ResultSet.java | 246 +-
.../result/ResultSetJsonDeserializer.java | 254 +-
.../operation/result/ResultSetJsonSerializer.java | 128 +-
.../flink/client/sql/parser/SqlCommand.java | 112 +-
.../flink/client/sql/parser/SqlCommandCall.java | 52 +-
.../flink/client/sql/parser/SqlCommandParser.java | 32 +-
.../client/sql/parser/SqlCommandParserImpl.java | 374 +--
.../flink/client/utils/YarnConfLoader.java | 76 +-
.../flink/exception/ExecutorInitException.java | 28 +-
.../flink/exception/FlinkInitFailedException.java | 18 +-
.../flink/exception/JobExecutionException.java | 18 +-
.../flink/exception/SqlExecutionException.java | 18 +-
.../flink/exception/SqlParseException.java | 18 +-
.../flink/FlinkEngineConnPlugin.scala | 21 +-
.../flink/config/FlinkEnvConfiguration.scala | 89 +-
.../flink/config/FlinkResourceConfiguration.scala | 22 +-
.../flink/context/EnvironmentContext.scala | 90 +-
.../flink/context/FlinkEngineConnContext.scala | 20 +-
.../flink/executor/FlinkCodeOnceExecutor.scala | 138 +-
.../flink/executor/FlinkExecutor.scala | 71 +-
.../flink/executor/FlinkJarOnceExecutor.scala | 30 +-
.../flink/executor/FlinkOnceExecutor.scala | 131 +-
.../executor/FlinkSQLComputationExecutor.scala | 231 +-
.../executormanager/FlinkExecutorManager.scala | 19 +-
.../factory/FlinkApplicationExecutorFactory.scala | 19 +-
.../flink/factory/FlinkCodeExecutorFactory.scala | 21 +-
.../flink/factory/FlinkEngineConnFactory.scala | 306 +--
.../flink/factory/FlinkSQLExecutorFactory.scala | 34 +-
.../launch/FlinkEngineConnLaunchBuilder.scala | 62 +-
.../flink/listener/FlinkListener.scala | 22 +-
.../flink/listener/FlinkListenerGroup.scala | 29 +-
.../flink/operator/TriggerSavepointOperator.scala | 12 +-
.../linkis/engineconnplugin/flink/ql/Grammar.scala | 11 +-
.../engineconnplugin/flink/ql/GrammarFactory.scala | 11 +-
.../flink/ql/impl/CreateTableAsSelectGrammar.scala | 29 +-
.../resource/FlinkEngineConnResourceFactory.scala | 39 +-
.../flink/setting/HudiSettings.scala | 114 +-
.../engineconnplugin/flink/setting/Settings.scala | 22 +-
.../engineconnplugin/flink/util/ClassUtil.scala | 25 +-
.../flink/util/FlinkValueFormatUtil.scala | 11 +-
linkis-engineconn-plugins/hive/pom.xml | 724 +++---
.../linkis/engineplugin/hive/log/HiveProgress.java | 66 +-
.../hive/serde/CustomerDelimitedJSONSerDe.java | 615 ++---
.../engineplugin/hive/HiveEngineConnPlugin.scala | 35 +-
.../engineplugin/hive/common/HiveUtils.scala | 60 +-
.../linkis/engineplugin/hive/conf/Counters.scala | 2 +-
.../hive/conf/HiveEngineConfiguration.scala | 30 +-
.../hive/creation/HiveEngineConnFactory.scala | 80 +-
.../linkis/engineplugin/hive/cs/CSHiveHelper.scala | 18 +-
.../engineplugin/hive/entity/HiveSession.scala | 22 +-
.../exception/NotSupportedHiveTypeException.scala | 42 +-
.../hive/executor/HiveEngineConnExecutor.scala | 323 +--
.../hive/hook/HiveAddJarsEngineHook.scala | 51 +-
.../hive/hook/HiveAddMetaTableNameHook.scala | 71 +-
.../HiveProcessEngineConnLaunchBuilder.scala | 18 +-
.../linkis/engineplugin/hive/log/LogHelper.scala | 43 +-
.../hive/progress/HiveProgressHelper.scala | 46 +-
linkis-engineconn-plugins/io_file/pom.xml | 261 +-
.../engineplugin/io/utils/ReflectionUtils.java | 12 +-
.../engineplugin/io/IoEngineConnPlugin.scala | 17 +-
.../builder/IoProcessEngineConnLaunchBuilder.scala | 11 +-
.../io/conf/IOEngineConnConfiguration.scala | 14 +-
.../manager/engineplugin/io/domain/FSInfo.scala | 17 +-
.../io/executor/IoEngineConnExecutor.scala | 309 +--
.../io/factory/IoEngineConnFactory.scala | 27 +-
.../engineplugin/io/service/FsProxyService.scala | 23 +-
.../manager/engineplugin/io/utils/IOHelp.scala | 59 +-
linkis-engineconn-plugins/jdbc/pom.xml | 450 ++--
.../engineplugin/jdbc/ConnectionManager.java | 642 ++---
.../jdbc/JDBCDataSourceConfigurations.java | 68 +-
.../engineplugin/jdbc/JDBCPropertiesParser.java | 18 +-
.../manager/engineplugin/jdbc/JdbcAuthType.java | 38 +-
.../engineplugin/jdbc/PropertiesParser.java | 49 +-
.../jdbc/constant/JDBCEngineConnConstant.java | 104 +-
.../engineplugin/jdbc/monitor/ProgressMonitor.java | 92 +-
.../jdbc/monitor/impl/TrinoProgressMonitor.java | 98 +-
.../engineplugin/jdbc/JDBCEngineConnPlugin.scala | 17 +-
.../JDBCProcessEngineConnLaunchBuilder.scala | 8 +-
.../engineplugin/jdbc/conf/JDBCConfiguration.scala | 11 +-
.../exception/JDBCParamsIllegalException.scala | 14 +-
.../jdbc/executer/JDBCEngineConnExecutor.scala | 245 +-
.../jdbc/executer/JDBCMultiDatasourceParser.scala | 102 +-
.../jdbc/executer/JDBCSQLCodeParser.scala | 18 +-
.../jdbc/factory/JDBCEngineConnFactory.scala | 16 +-
.../engineplugin/jdbc/ConnectionManagerTest.java | 86 +-
.../engineplugin/jdbc/ProgressMonitorTest.java | 82 +-
.../executer/JDBCMultiDatasourceParserTest.scala | 28 -
.../TestJDBCEngineConnExecutor.scala | 134 +-
linkis-engineconn-plugins/openlookeng/pom.xml | 242 +-
.../builder/OpenLooKengProcessECLaunchBuilder.java | 8 +-
.../openlookeng/conf/OpenLooKengConfiguration.java | 48 +-
.../conf/OpenLooKengEngineConfCache.java | 26 +-
.../exception/OpenLooKengClientException.java | 6 +-
.../exception/OpenLooKengSourceGroupException.java | 6 +-
.../OpenLooKengStateInvalidException.java | 6 +-
.../executor/OpenLooKengEngineConnExecutor.java | 678 +++---
.../openlookeng/OpenLooKengECPlugin.scala | 17 +-
.../factory/OpenLooKengEngineConnFactory.scala | 15 +-
linkis-engineconn-plugins/pipeline/pom.xml | 263 ++-
.../pipeline/PipelineEngineConnPlugin.scala | 17 +-
.../builder/PipelineEngineConnLaunchBuilder.scala | 12 +-
.../conf/PipelineEngineConfiguration.scala | 22 +-
.../pipeline/constant/PipeLineConstant.scala | 13 +-
.../pipeline/conversions/FsConvertions.scala | 15 +-
.../exception/PipeLineErrorException.scala | 12 +-
.../pipeline/executor/CSVExecutor.scala | 45 +-
.../pipeline/executor/CopyExecutor.scala | 20 +-
.../pipeline/executor/ExcelExecutor.scala | 51 +-
.../pipeline/executor/OutputStreamCache.scala | 8 +-
.../pipeline/executor/PipeLineExecutor.scala | 14 +-
.../executor/PipelineEngineConnExecutor.scala | 66 +-
.../executor/PipelineExecutorSelector.scala | 31 +-
.../factory/PipelineEngineConnFactory.scala | 18 +-
linkis-engineconn-plugins/pom.xml | 53 +-
linkis-engineconn-plugins/presto/pom.xml | 230 +-
.../presto/PrestoEngineConnPlugin.scala | 14 +-
.../PrestoProcessEngineConnLaunchBuilder.scala | 1 -
.../presto/conf/PrestoConfiguration.scala | 21 +-
.../presto/conf/PrestoEngineConf.scala | 20 +-
.../presto/exception/PrestoException.scala | 7 +-
.../presto/executer/PrestoEngineConnExecutor.scala | 207 +-
.../presto/factory/PrestoEngineConnFactory.scala | 9 +-
linkis-engineconn-plugins/python/pom.xml | 313 +--
.../python/PythonEngineConnPlugin.scala | 25 +-
.../python/conf/PythonEngineConfiguration.scala | 23 +-
.../exception/NoSupportEngineException.scala | 13 +-
.../exception/PythonSessionNullException.scala | 23 +-
.../python/executor/PythonEngineConnExecutor.scala | 89 +-
.../python/executor/PythonSession.scala | 118 +-
.../python/factory/PythonEngineConnFactory.scala | 28 +-
.../python/hook/PythonVersionEngineHook.scala | 44 +-
.../PythonProcessEngineConnLaunchBuilder.scala | 13 +-
.../manager/engineplugin/python/utils/Kind.scala | 49 +-
.../manager/engineplugin/python/utils/State.scala | 12 +-
linkis-engineconn-plugins/shell/pom.xml | 334 +--
.../engineplugin/shell/ShellEngineConnPlugin.scala | 18 +-
.../ShellProcessEngineConnLaunchBuilder.scala | 12 +-
.../shell/common/ShellEnginePluginConst.scala | 2 +-
.../shell/exception/NoCorrectUserException.scala | 14 +-
.../engineplugin/shell/executor/ReaderThread.scala | 22 +-
.../shell/executor/ShellEngineConnExecutor.scala | 183 +-
.../shell/executor/YarnAppIdExtractor.scala | 41 +-
.../shell/factory/ShellEngineConnFactory.scala | 18 +-
.../shell/TestShellEngineConnPlugin.scala | 7 +-
.../common/TestShellEngineConnPluginConst.scala | 10 +-
.../exception/TestNoCorrectUserException.scala | 6 +-
.../executor/TestShellEngineConnExecutor.scala | 20 +-
linkis-engineconn-plugins/spark/pom.xml | 815 +++----
.../spark/Interpreter/Interpreter.scala | 12 +-
.../spark/Interpreter/ProcessInterpreter.scala | 53 +-
.../spark/Interpreter/PythonInterpreter.scala | 96 +-
.../engineplugin/spark/SparkEngineConnPlugin.scala | 17 +-
.../spark/args/SparkPythonArgsAppender.scala | 7 +-
.../args/SparkPythonArgsPreExecutionHook.scala | 107 +-
.../spark/args/SparkScalaPreExecutionHook.scala | 22 +-
.../linkis/engineplugin/spark/common/Kind.scala | 53 +-
.../spark/common/LineBufferedProcess.scala | 12 +-
.../spark/common/LineBufferedStream.scala | 37 +-
.../engineplugin/spark/common/LogContainer.scala | 21 +-
.../spark/common/SparkEnginePluginConst.scala | 2 +-
.../engineplugin/spark/common/SparkKind.scala | 45 +-
.../linkis/engineplugin/spark/common/State.scala | 15 +-
.../spark/config/SparkConfiguration.scala | 77 +-
.../spark/config/SparkResourceConfiguration.scala | 12 +-
.../engineplugin/spark/cs/CSSparkHelper.scala | 18 +-
.../spark/cs/CSSparkPostExecutionHook.scala | 29 +-
.../spark/cs/CSSparkPreExecutionHook.scala | 60 +-
.../engineplugin/spark/cs/CSTableParser.scala | 81 +-
.../spark/entity/SparkEngineSession.scala | 23 +-
.../ApplicationAlreadyStoppedException.scala | 16 +-
.../spark/exception/ExecuteError.scala | 14 +-
.../spark/exception/MDQErrorException.scala | 11 +-
.../spark/exception/NoSupportEngineException.scala | 17 +-
.../spark/exception/QueryFailedException.scala | 15 +-
.../spark/exception/RetryException.scala | 15 +-
.../spark/exception/SparkCreateFileException.scala | 12 +-
.../exception/SparkSessionNullException.scala | 13 +-
.../engineplugin/spark/executor/SQLSession.scala | 102 +-
.../spark/executor/SparkEngineConnExecutor.scala | 146 +-
.../spark/executor/SparkExecutorOrder.scala | 9 +-
.../spark/executor/SparkPythonExecutor.scala | 212 +-
.../spark/executor/SparkScalaExecutor.scala | 271 +--
.../spark/executor/SparkSqlExecutor.scala | 60 +-
.../spark/extension/SparkPostExecutionHook.scala | 26 +-
.../spark/extension/SparkPreExecutionHook.scala | 18 +-
.../spark/extension/SparkSqlExtension.scala | 72 +-
.../spark/factory/SparkEngineConnFactory.scala | 113 +-
.../factory/SparkEngineConnResourceFactory.scala | 34 +-
.../spark/factory/SparkPythonExecutorFactory.scala | 23 +-
.../spark/factory/SparkScalaExecutorFactory.scala | 25 +-
.../spark/factory/SparkSqlExecutorFactory.scala | 25 +-
.../engineplugin/spark/imexport/CsvRelation.scala | 161 +-
.../engineplugin/spark/imexport/ExportData.scala | 65 +-
.../engineplugin/spark/imexport/LoadData.scala | 133 +-
.../imexport/util/BackGroundServiceUtils.scala | 30 +-
.../spark/imexport/util/ImExportUtils.scala | 19 +-
...SparkSubmitProcessEngineConnLaunchBuilder.scala | 209 +-
.../spark/lineage/LineageSparkSqlExtension.scala | 21 +-
.../spark/lineage/SparkLineageUtils.scala | 14 +-
.../spark/mdq/MDQPostExecutionHook.scala | 36 +-
.../spark/mdq/MDQPreExecutionHook.scala | 43 +-
.../engineplugin/spark/metadata/HPOBuilder.scala | 98 +-
.../spark/metadata/MetaDataInfoTool.scala | 35 +-
.../spark/metadata/SparkHiveObject.scala | 24 +-
.../spark/metadata/SparkSQLHistoryParser.scala | 238 +-
.../engineplugin/spark/utils/EngineUtils.scala | 61 +-
.../engineplugin/spark/utils/JobProgressUtil.scala | 65 +-
.../org/apache/spark/sql/MethodInvokeHelper.scala | 12 +-
.../apache/spark/sql/SparkLogicalPlanHelper.scala | 18 +-
.../execution/datasources/csv/DolphinToSpark.scala | 47 +-
.../spark/sql/execution/datasources/csv/UDF.scala | 14 +-
.../scala/org/apache/spark/util/SparkUtils.scala | 24 +-
.../spark/extension/TestExecutionHooks.scala | 11 +-
.../spark/factory/TestSparkEngineConnFactory.scala | 7 +-
...SparkSubmitProcessEngineConnLaunchBuilder.scala | 16 +-
linkis-engineconn-plugins/sqoop/pom.xml | 510 ++--
.../sqoop/client/LinkisSqoopClient.java | 370 +--
.../engineconnplugin/sqoop/client/Sqoop.java | 901 +++----
.../sqoop/client/config/ExecutionContext.java | 8 +-
.../sqoop/client/config/ParamsMapping.java | 232 +-
.../client/exception/JobClosableException.java | 18 +-
.../client/exception/JobExecutionException.java | 18 +-
.../sqoop/client/utils/JarLoader.java | 232 +-
.../java/org/apache/sqoop/mapreduce/JobBase.java | 656 ++---
.../sqoop/SqoopEngineConnPlugin.scala | 19 +-
.../sqoop/context/SqoopEngineConnContext.scala | 7 +-
.../sqoop/context/SqoopEnvConfiguration.scala | 15 +-
.../sqoop/context/SqoopParamsConfiguration.scala | 23 +-
.../sqoop/context/SqoopResourceConfiguration.scala | 10 +-
.../sqoop/executor/SqoopExecutor.scala | 20 +-
.../sqoop/executor/SqoopOnceCodeExecutor.scala | 137 +-
.../sqoop/executor/SqoopOnceExecutor.scala | 23 +-
.../sqoop/factory/SqoopEngineConnFactory.scala | 24 +-
.../sqoop/factory/SqoopExecutorFactory.scala | 15 +-
.../launch/SqoopEngineConnLaunchBuilder.scala | 68 +-
.../sqoop/params/SqoopParamsResolver.scala | 16 +-
.../resource/SqoopEngineConnResourceFactory.scala | 10 +-
.../engineconnplugin/sqoop/util/ClassUtil.scala | 19 +-
linkis-engineconn-plugins/trino/pom.xml | 211 +-
.../trino/interceptor/PasswordInterceptor.java | 51 +-
.../trino/password/CommandPasswordCallback.java | 74 +-
.../trino/password/StaticPasswordCallback.java | 26 +-
.../trino/socket/SocketChannelSocketFactory.java | 53 +-
.../engineplugin/trino/TrinoEngineConnPlugin.scala | 141 +-
.../TrinoProcessEngineConnLaunchBuilder.scala | 65 +-
.../trino/conf/TrinoConfiguration.scala | 127 +-
.../trino/conf/TrinoEngineConfig.scala | 83 +-
.../trino/exception/TrinoException.scala | 63 +-
.../trino/executor/TrinoEngineConnExecutor.scala | 938 ++++----
.../trino/factory/TrinoEngineConnFactory.scala | 84 +-
.../engineplugin/trino/utils/TrinoCode.scala | 97 +-
linkis-extensions/linkis-io-file-client/pom.xml | 95 +-
.../linkis/storage/io/client/DefaultIOClient.scala | 86 +-
.../apache/linkis/storage/io/client/IOClient.scala | 21 +-
.../linkis/storage/io/conf/IOFileClientConf.scala | 11 +-
.../io/iteraceptor/IOMethodInterceptor.scala | 194 +-
.../IOMethodInterceptorCreatorImpl.scala | 9 +-
.../IOComputationOrchestratorSessionFactory.scala | 124 +-
.../orchestrator/IOFileOrchestratorFactory.scala | 9 +-
.../io/orchestrator/IOTaskPlannerTransform.scala | 27 +-
.../IOUserParallelOrchestratorPlugin.scala | 17 +-
.../linkis/storage/io/utils/IOClientUtils.scala | 46 +-
linkis-extensions/pom.xml | 29 +-
.../linkis-code-orchestrator/pom.xml | 98 +-
.../orchestrator/code/plans/ast/CodeJob.scala | 17 +-
.../orchestrator/code/plans/ast/CodeStage.scala | 18 +-
.../plans/execution/CodeExecutionFactory.scala | 16 +-
.../execution/CodeReheaterNotifyTaskConsumer.scala | 18 +-
.../code/plans/logical/CacheTask.scala | 26 +-
.../code/plans/logical/CodeLogicalUnitTask.scala | 16 +-
.../plans/logical/CodeLogicalUnitTaskDesc.scala | 9 +-
.../linkis-computation-orchestrator/pom.xml | 122 +-
.../computation/utils/TaskTreeUtil.java | 72 +-
.../ComputationOrchestratorSessionFactory.scala | 36 +-
...ComputationOrchestratorSessionFactoryImpl.scala | 163 +-
.../converter/CodeConverterTransform.scala | 29 +-
.../converter/exception/CodeCheckException.scala | 19 +-
.../converter/exception/LimitCheckException.scala | 19 +-
.../exception/PythonCodeCheckException.scala | 26 +-
.../exception/SensitiveTablesCheckException.scala | 14 +-
.../exception/VarSubstitutionException.scala | 18 +-
.../converter/ruler/JobReqParamCheckRuler.scala | 29 +-
.../catalyst/optimizer/CacheTaskOptimizer.scala | 10 +-
.../optimizer/ConfigurationOptimizer.scala | 10 +-
.../catalyst/optimizer/PlaybackOptimizer.scala | 12 +-
.../catalyst/optimizer/SimplifyOptimizer.scala | 10 +-
.../catalyst/optimizer/YarnQueueOptimizer.scala | 12 +-
.../parser/DefaultCodeJobParserTransform.scala | 46 +-
.../parser/EnrichLabelParserTransform.scala | 27 +-
.../parser/label/CacheParserLabelFiller.scala | 10 +-
.../catalyst/parser/label/ParserLabelFiller.scala | 10 +-
.../physical/AbstractPhysicalTransform.scala | 160 +-
.../physical/ComputePhysicalTransform.scala | 53 +-
.../catalyst/planner/TaskPlannerTransform.scala | 104 +-
.../reheater/PruneTaskReheaterTransform.scala | 142 +-
.../validator/DefaultLabelRegularCheckRuler.scala | 14 +-
.../validator/LabelRegularCheckRuler.scala | 37 +-
.../validator/RouteLabelRegularCheckRuler.scala | 12 +-
.../conf/ComputationOrchestratorConf.scala | 48 +-
.../computation/entity/ComputationJobReq.scala | 40 +-
.../computation/execute/CodeExecTaskExecutor.scala | 25 +-
.../execute/CodeExecTaskExecutorManager.scala | 67 +-
.../DefaultCodeExecTaskExecutorManager.scala | 163 +-
.../computation/monitor/EngineConnMonitor.scala | 178 +-
.../computation/operation/log/LogEvent.scala | 12 +-
.../computation/operation/log/LogOperation.scala | 43 +-
.../computation/operation/log/LogProcessor.scala | 23 +-
.../progress/AbstractProgressOperation.scala | 43 +-
.../progress/DefaultProgressOperation.scala | 110 +-
.../operation/progress/ProgressInfoEvent.scala | 21 +-
.../operation/progress/ProgressProcessor.scala | 34 +-
.../operation/resource/ResourceReportEvent.scala | 8 +-
.../resource/ResourceReportOperation.scala | 35 +-
.../resource/ResourceReportProcessor.scala | 12 +-
.../computation/physical/CacheExecTask.scala | 103 +-
.../physical/CodeLogicalUnitExecTask.scala | 138 +-
.../service/ComputationTaskExecutionReceiver.scala | 201 +-
.../utils/ComputationOrchestratorUtils.scala | 8 +-
.../computation/utils/TreeNodeUtil.scala | 110 +-
.../linkis-orchestrator-core/pom.xml | 127 +-
.../apache/linkis/orchestrator/Orchestration.scala | 20 +-
.../apache/linkis/orchestrator/Orchestrator.scala | 29 +-
.../linkis/orchestrator/OrchestratorContext.scala | 15 +-
.../linkis/orchestrator/OrchestratorSession.scala | 17 +-
.../conf/OrchestratorConfiguration.scala | 65 +-
.../orchestrator/converter/ASTContextImpl.scala | 21 +-
.../orchestrator/converter/AbstractConverter.scala | 35 +-
.../linkis/orchestrator/converter/Converter.scala | 13 +-
.../orchestrator/converter/ConverterImpl.scala | 19 +-
.../orchestrator/core/AbstractOrchestration.scala | 119 +-
.../orchestrator/core/AbstractOrchestrator.scala | 26 +-
.../core/AbstractOrchestratorContext.scala | 21 +-
.../core/AbstractOrchestratorSession.scala | 19 +-
.../core/AbstractOrchestratorSessionBuilder.scala | 147 +-
.../orchestrator/core/AbstractSessionState.scala | 43 +-
.../linkis/orchestrator/core/CacheStrategy.scala | 21 +-
.../linkis/orchestrator/core/GlobalState.scala | 11 +-
.../linkis/orchestrator/core/MetricsSupport.scala | 13 +-
.../core/OrchestrationCacheManager.scala | 13 +-
.../orchestrator/core/OrchestrationFuture.scala | 13 +-
.../orchestrator/core/OrchestrationResponse.scala | 19 +-
.../orchestrator/core/OrchestratorPlugin.scala | 16 +-
.../core/OrchestratorSessionBuilder.scala | 28 +-
.../linkis/orchestrator/core/PlanBuilder.scala | 13 +-
.../linkis/orchestrator/core/SessionState.scala | 16 +-
.../orchestrator/core/impl/GlobalStateImpl.scala | 15 +-
.../orchestrator/core/impl/OrchestrationImpl.scala | 62 +-
.../core/impl/OrchestratorContextImpl.scala | 15 +-
.../orchestrator/core/impl/OrchestratorImpl.scala | 14 +-
.../core/impl/OrchestratorSessionBuilderImpl.scala | 35 +-
.../core/impl/OrchestratorSessionImpl.scala | 26 +-
.../orchestrator/core/impl/PlanBuilderImpl.scala | 21 +-
.../orchestrator/core/impl/SessionStateImpl.scala | 83 +-
.../core/impl/TableOrchestration.scala | 20 +-
.../apache/linkis/orchestrator/domain/JobReq.scala | 23 +-
.../apache/linkis/orchestrator/domain/Node.scala | 11 +-
.../linkis/orchestrator/domain/TreeNode.scala | 71 +-
.../linkis/orchestrator/domain/req/DataReq.scala | 15 +-
.../orchestrator/domain/req/DataViewReq.scala | 21 +-
.../orchestrator/domain/req/ResultSetReq.scala | 13 +-
.../exception/OrchestratorErrorCodeSummary.scala | 12 +-
.../exception/OrchestratorErrorException.scala | 29 +-
.../exception/OrchestratorRetryException.scala | 17 +-
.../orchestrator/execution/AbstractExecution.scala | 41 +-
.../orchestrator/execution/ExecTaskRunner.scala | 33 +-
.../linkis/orchestrator/execution/Execution.scala | 13 +-
.../orchestrator/execution/ExecutionFactory.scala | 35 +-
.../orchestrator/execution/ExecutionTask.scala | 13 +-
.../orchestrator/execution/TaskConsumer.scala | 13 +-
.../orchestrator/execution/TaskManager.scala | 13 +-
.../orchestrator/execution/TaskResponse.scala | 18 +-
.../orchestrator/execution/TaskScheduler.scala | 13 +-
.../execution/impl/AbstractExecutionFactory.scala | 26 +-
.../execution/impl/AbstractTaskManager.scala | 28 +-
.../execution/impl/BaseExecutionTask.scala | 47 +-
.../execution/impl/BaseTaskResponse.scala | 15 +-
.../execution/impl/BaseTaskScheduler.scala | 56 +-
.../execution/impl/DefaultFailedTaskResponse.scala | 17 +-
.../execution/impl/DefaultTaskManager.scala | 304 +--
.../execution/impl/ExecutionImpl.scala | 61 +-
.../execution/impl/NotifyTaskConsumer.scala | 24 +-
.../execution/impl/UserRunningNumber.scala | 39 +-
.../execution/impl/UserTaskRunner.scala | 24 +-
.../execution/impl/UserTaskRunnerQueue.scala | 60 +-
.../extensions/CatalystExtensions.scala | 13 +-
.../extensions/CheckRulerExtensions.scala | 18 +-
.../orchestrator/extensions/Extensions.scala | 13 +-
.../extensions/OperationExtensions.scala | 13 +-
.../catalyst/CatalystExtensionsImpl.scala | 30 +-
.../extensions/catalyst/CheckRuler.scala | 17 +-
.../catalyst/CheckRulerExtensionsImpl.scala | 29 +-
.../extensions/catalyst/Transform.scala | 15 +-
.../extensions/catalyst/TransformFactory.scala | 81 +-
.../extensions/operation/CancelOperation.scala | 24 +-
.../extensions/operation/NotifyOperation.scala | 13 +-
.../extensions/operation/Operation.scala | 13 +-
.../operation/OperationExtensionsImpl.scala | 15 +-
.../listener/OrchestratorAsyncEvent.scala | 17 +-
.../listener/OrchestratorAsyncListener.scala | 11 +-
.../listener/OrchestratorAsyncListenerBus.scala | 37 +-
.../listener/OrchestratorListenerBusContext.scala | 24 +-
.../listener/OrchestratorSyncEvent.scala | 16 +-
.../listener/OrchestratorSyncListener.scala | 11 +-
.../listener/OrchestratorSyncListenerBus.scala | 29 +-
.../execution/ExecTaskRunnerCompletedEvent.scala | 15 +-
.../execution/ExecutionTaskCompletedListener.scala | 17 +-
.../listener/execution/ExecutionTaskEvent.scala | 23 +-
.../execution/ExecutionTaskStatusListener.scala | 14 +-
.../listener/task/OrchestrationKillListener.scala | 13 +-
.../listener/task/ResourceReportListener.scala | 6 +-
.../listener/task/RootTaskResponseListener.scala | 15 +-
.../orchestrator/listener/task/TaskInfoEvent.scala | 71 +-
.../listener/task/TaskLogListener.scala | 12 +-
.../listener/task/TaskProgressListener.scala | 8 +-
.../listener/task/TaskResultSetListener.scala | 13 +-
.../listener/task/TaskStatusListener.scala | 14 +-
.../linkis/orchestrator/log/LogManager.scala | 17 +-
.../orchestrator/optimizer/AbstractOptimizer.scala | 71 +-
.../linkis/orchestrator/optimizer/Optimizer.scala | 11 +-
.../orchestrator/optimizer/OptimizerImpl.scala | 24 +-
.../orchestrator/parser/AbstractParser.scala | 52 +-
.../apache/linkis/orchestrator/parser/Parser.scala | 11 +-
.../linkis/orchestrator/parser/ParserImpl.scala | 12 +-
.../orchestrator/planner/AbstractPlanner.scala | 52 +-
.../linkis/orchestrator/planner/Planner.scala | 11 +-
.../linkis/orchestrator/planner/PlannerImpl.scala | 12 +-
.../planner/command/ExplainCommandDesc.scala | 14 +-
.../linkis/orchestrator/plans/PlanContext.scala | 21 +-
.../linkis/orchestrator/plans/ast/ASTContext.scala | 14 +-
.../orchestrator/plans/ast/ASTOrchestration.scala | 13 +-
.../orchestrator/plans/ast/AbstractJob.scala | 13 +-
.../orchestrator/plans/ast/AbstractStage.scala | 8 +-
.../apache/linkis/orchestrator/plans/ast/Job.scala | 23 +-
.../orchestrator/plans/ast/QueryParams.scala | 25 +-
.../orchestrator/plans/ast/RuntimeParams.scala | 44 +-
.../linkis/orchestrator/plans/ast/Stage.scala | 11 +-
.../orchestrator/plans/ast/StartupParams.scala | 19 +-
.../orchestrator/plans/logical/AbstractTask.scala | 13 +-
.../orchestrator/plans/logical/CommandDesc.scala | 13 +-
.../orchestrator/plans/logical/CommandTask.scala | 17 +-
.../orchestrator/plans/logical/JobTask.scala | 32 +-
.../plans/logical/LogicalContext.scala | 11 +-
.../plans/logical/LogicalContextImpl.scala | 22 +-
.../plans/logical/LogicalOrchestration.scala | 17 +-
.../linkis/orchestrator/plans/logical/Origin.scala | 27 +-
.../orchestrator/plans/logical/StageTask.scala | 33 +-
.../linkis/orchestrator/plans/logical/Task.scala | 13 +-
.../orchestrator/plans/logical/TaskDesc.scala | 11 +-
.../plans/physical/AbstractExecTask.scala | 22 +-
.../orchestrator/plans/physical/CommandExec.scala | 16 +-
.../orchestrator/plans/physical/ExecTask.scala | 13 +-
.../orchestrator/plans/physical/JobExecTask.scala | 35 +-
.../plans/physical/PhysicalContext.scala | 19 +-
.../plans/physical/PhysicalContextImpl.scala | 52 +-
.../plans/physical/PhysicalOrchestration.scala | 15 +-
.../plans/physical/ReheatableExecTask.scala | 11 +-
.../plans/physical/RetryExecTask.scala | 58 +-
.../plans/physical/StageExecTask.scala | 23 +-
.../orchestrator/plans/unit/CodeLogicalUnit.scala | 41 +-
.../plans/unit/LambdaLogicalUnit.scala | 19 +-
.../orchestrator/plans/unit/LogicalUnit.scala | 11 +-
.../plugin/UserParallelOrchestratorPlugin.scala | 8 +-
.../orchestrator/reheater/AbstractReheater.scala | 25 +-
.../linkis/orchestrator/reheater/Reheater.scala | 11 +-
.../orchestrator/reheater/ReheaterImpl.scala | 12 +-
.../reheater/ReheaterNotifyTaskConsumer.scala | 43 +-
.../strategy/DefaultExecTaskRunnerFactory.scala | 20 +-
.../orchestrator/strategy/ExecTaskStatusInfo.scala | 12 +-
.../strategy/GatherStrategyJobExecTask.scala | 43 +-
.../strategy/GatherStrategyStageInfoExecTask.scala | 48 +-
.../orchestrator/strategy/ResultSetExecTask.scala | 54 +-
.../orchestrator/strategy/StatusInfoExecTask.scala | 71 +-
.../strategy/async/AsyncExecTask.scala | 14 +-
.../strategy/async/AsyncExecTaskRunner.scala | 16 +-
.../strategy/async/AsyncExecTaskRunnerImpl.scala | 85 +-
.../strategy/async/AsyncTaskManager.scala | 30 +-
.../orchestrator/utils/OrchestratorIDCreator.scala | 34 +-
.../linkis/orchestrator/utils/TreeOperator.scala | 22 +-
.../orchestrator/validator/AbstractValidator.scala | 13 +-
.../linkis/orchestrator/validator/Validator.scala | 11 +-
.../orchestrator/validator/ValidatorImpl.scala | 12 +-
.../linkis/orchestrator/OrchestratorSuite.scala | 15 +-
.../plugin/linkis-orchestrator-ecm-plugin/pom.xml | 122 +-
.../linkis/orchestrator/ecm/entity/Policy.java | 10 +-
.../ecm/ComputationEngineConnManager.scala | 138 +-
.../orchestrator/ecm/EngineConnManager.scala | 132 +-
.../ecm/EngineConnManagerBuilder.scala | 29 +-
.../ecm/LoadBalanceLabelEngineConnManager.scala | 99 +-
.../ecm/cache/EngineAsyncResponseCache.scala | 104 +-
.../orchestrator/ecm/conf/ECMPluginConf.scala | 22 +-
.../linkis/orchestrator/ecm/entity/Mark.scala | 19 +-
.../linkis/orchestrator/ecm/entity/MarkReq.scala | 71 +-
.../ecm/exception/ECMPluginErrorException.scala | 15 +-
.../ecm/service/EngineAsyncResponseService.scala | 12 +-
.../ecm/service/EngineConnExecutor.scala | 24 +-
.../ecm/service/TaskExecutionReceiver.scala | 16 +-
.../impl/ComputationEngineConnExecutor.scala | 80 +-
.../impl/DefaultEngineAsyncResponseService.scala | 31 +-
.../linkis/orchestrator/ecm/utils/ECMPUtils.scala | 17 +-
linkis-orchestrator/pom.xml | 35 +-
.../linkis-bml/linkis-bml-client/pom.xml | 123 +-
.../linkis/bml/client/AbstractBmlClient.java | 14 +-
.../org/apache/linkis/bml/client/BmlClient.java | 214 +-
.../apache/linkis/bml/client/BmlClientFactory.java | 24 +-
.../linkis/bml/client/impl/HttpBmlClient.scala | 630 ++---
.../bml/common/POSTActionFailException.scala | 41 +-
.../apache/linkis/bml/conf/BmlConfiguration.scala | 35 +-
.../org/apache/linkis/bml/http/HttpConf.scala | 33 +-
.../apache/linkis/bml/request/BmlPOSTAction.scala | 196 +-
.../org/apache/linkis/bml/response/BmlResult.scala | 132 +-
.../linkis-bml/linkis-bml-common/pom.xml | 76 +-
.../apache/linkis/bml/model/AbstractAuditable.java | 80 +-
.../apache/linkis/bml/protocol/BmlProtocol.scala | 95 +-
.../linkis-bml/linkis-bml-server/pom.xml | 211 +-
.../apache/linkis/bml/LinkisBMLApplication.java | 6 +-
.../org/apache/linkis/bml/common/Constant.java | 22 +-
.../apache/linkis/bml/common/ExecutorManager.java | 176 +-
.../linkis/bml/common/HdfsResourceHelper.java | 258 +-
.../linkis/bml/common/LocalResourceHelper.java | 260 +-
.../apache/linkis/bml/common/OperationEnum.java | 66 +-
.../apache/linkis/bml/common/ResourceHelper.java | 38 +-
.../linkis/bml/common/ResourceHelperFactory.java | 25 +-
.../apache/linkis/bml/common/ScheduledTask.java | 47 +-
.../org/apache/linkis/bml/dao/BmlProjectDao.java | 112 +-
.../org/apache/linkis/bml/dao/DownloadDao.java | 2 +-
.../org/apache/linkis/bml/dao/ResourceDao.java | 32 +-
.../java/org/apache/linkis/bml/dao/TaskDao.java | 76 +-
.../java/org/apache/linkis/bml/dao/VersionDao.java | 99 +-
.../org/apache/linkis/bml/entity/BmlProject.java | 144 +-
.../apache/linkis/bml/entity/DownloadModel.java | 214 +-
.../org/apache/linkis/bml/entity/Resource.java | 385 +--
.../org/apache/linkis/bml/entity/ResourceTask.java | 666 +++---
.../apache/linkis/bml/entity/ResourceVersion.java | 340 +--
.../java/org/apache/linkis/bml/entity/Version.java | 28 +-
.../apache/linkis/bml/restful/RestfulUtils.java | 115 +-
.../linkis/bml/service/BmlProjectService.java | 30 +-
.../bml/service/BmlShareResourceService.java | 20 +-
.../apache/linkis/bml/service/DownloadService.java | 2 +-
.../apache/linkis/bml/service/ResourceService.java | 41 +-
.../org/apache/linkis/bml/service/TaskService.java | 64 +-
.../apache/linkis/bml/service/VersionService.java | 84 +-
.../bml/service/impl/BmlProjectServiceImpl.java | 247 +-
.../linkis/bml/service/impl/BmlServiceImpl.java | 2 +-
.../service/impl/BmlShareResourceServiceImpl.java | 26 +-
.../bml/service/impl/DownloadServiceImpl.java | 10 +-
.../bml/service/impl/ResourceServiceImpl.java | 270 +--
.../linkis/bml/service/impl/TaskServiceImpl.java | 663 +++---
.../bml/service/impl/VersionServiceImpl.java | 347 +--
.../org/apache/linkis/bml/threading/TaskState.java | 80 +-
.../apache/linkis/bml/util/HttpRequestHelper.java | 34 +-
.../java/org/apache/linkis/bml/util/MD5Utils.java | 86 +-
.../org/apache/linkis/bml/vo/ResourceBasicVO.java | 126 +-
.../java/org/apache/linkis/bml/vo/ResourceVO.java | 72 +-
.../apache/linkis/bml/vo/ResourceVersionsVO.java | 58 +-
.../linkis/bml/common/BmlAuthorityException.scala | 21 +-
.../bml/common/BmlPermissionDeniedException.scala | 13 +-
.../linkis/bml/common/BmlQueryFailException.scala | 10 +-
.../bml/common/BmlResourceExpiredException.scala | 11 +-
.../bml/common/BmlServerParaErrorException.scala | 10 +-
.../linkis/bml/conf/BmlServerConfiguration.scala | 21 +-
.../linkis/bml/protocol/BmlServerProtocol.scala | 15 +-
.../org/apache/linkis/bml/rpc/BmlReceiver.scala | 13 +-
.../apache/linkis/bml/WebApplicationServer.java | 6 +-
.../linkis/bml/common/HdfsResourceHelperTest.java | 16 +-
.../linkis/bml/common/LocalResourceHelperTest.java | 18 +-
.../linkis/bml/common/VersionServiceImplTest.java | 36 +-
.../apache/linkis/bml/dao/BmlProjectDaoTest.java | 148 +-
.../org/apache/linkis/bml/dao/DownloadDaoTest.java | 34 +-
.../org/apache/linkis/bml/dao/ResourceDaoTest.java | 142 +-
.../org/apache/linkis/bml/dao/TaskDaoTest.java | 74 +-
.../org/apache/linkis/bml/dao/VersionDaoTest.java | 330 +--
.../linkis/bml/service/BmlProjectServiceTest.java | 256 +-
.../bml/service/DownloadServiceImplTest.java | 40 +-
.../bml/service/ResourceServiceImplTest.java | 241 +-
.../linkis/bml/service/TaskServiceImplTest.java | 240 +-
.../linkis/bml/service/VersionServiceImplTest.java | 323 +--
linkis-public-enhancements/linkis-bml/pom.xml | 36 +-
.../linkis-cs-client/pom.xml | 123 +-
.../java/org/apache/linkis/cs/client/Context.java | 120 +-
.../org/apache/linkis/cs/client/ContextClient.java | 260 +-
.../linkis/cs/client/LinkisWorkFlowContext.java | 226 +-
.../cs/client/builder/ContextClientFactory.java | 20 +-
.../cs/client/builder/HttpContextClientConfig.java | 58 +-
.../cs/client/http/ContextPostActionBuilder.java | 104 +-
.../linkis/cs/client/http/HttpContextClient.java | 1653 ++++++-------
.../linkis/cs/client/http/HttpHeartBeater.java | 186 +-
.../cs/client/listener/ContextClientListener.java | 6 +-
.../client/listener/ContextClientListenerBus.java | 24 +-
.../listener/ContextClientListenerManager.java | 19 +-
.../cs/client/listener/ContextIDListener.java | 84 +-
.../cs/client/listener/ContextKeyListener.java | 80 +-
.../linkis/cs/client/listener/HeartBeater.java | 8 +-
.../cs/client/service/CSMetaDataService.java | 62 +-
.../linkis/cs/client/service/CSNodeService.java | 2 +-
.../cs/client/service/CSNodeServiceImpl.java | 44 +-
.../cs/client/service/CSResourceService.java | 107 +-
.../cs/client/service/CSResultDataService.java | 10 +-
.../cs/client/service/CSResultDataServiceImpl.java | 172 +-
.../linkis/cs/client/service/CSTableService.java | 364 +--
.../cs/client/service/CSVariableService.java | 123 +-
.../linkis/cs/client/service/CSWorkService.java | 6 +-
.../cs/client/service/CSWorkServiceImpl.java | 122 +-
.../service/ContextHistoryClientService.java | 2 +-
.../service/ContextHistoryClientServiceImpl.java | 48 +-
.../cs/client/service/DefaultSearchService.java | 311 +--
.../cs/client/service/LinkisJobDataService.java | 6 +-
.../client/service/LinkisJobDataServiceImpl.java | 138 +-
.../linkis/cs/client/service/MetaDataService.java | 20 +-
.../linkis/cs/client/service/ResourceService.java | 22 +-
.../linkis/cs/client/service/SearchService.java | 58 +-
.../linkis/cs/client/service/TableService.java | 65 +-
.../linkis/cs/client/service/VariableService.java | 8 +-
.../cs/client/utils/ContextServiceUtils.java | 278 +--
.../linkis/cs/client/utils/ExceptionHelper.java | 12 +-
.../linkis/cs/client/utils/SerializeHelper.java | 71 +-
.../exception/ProtocolNotMatchException.scala | 11 +-
.../linkis/cs/client/http/ContextAction.scala | 48 +-
.../linkis/cs/client/http/ContextResult.scala | 74 +-
.../linkis/cs/client/utils/ContextClientConf.scala | 28 +-
.../cs/client/utils/ContextClientUtils.scala | 33 +-
.../cs/client/utils/ContextServerHttpConf.scala | 15 +-
.../org/apache/linkis/cs/client/test/Test.java | 162 +-
.../cs/client/test/bean/ClientTestContextKey.java | 62 +-
.../client/test/bean/ClientTestContextValue.java | 36 +-
.../cs/client/test/bean/ResourceValueBean.java | 30 +-
.../test/listener/CommonContextKeyListener.java | 26 +-
.../client/test/no_context_search/TestClear.java | 50 +-
.../linkis/cs/client/test/restful/RestfulTest.java | 224 +-
.../linkis/cs/client/test/service/TestInfo.java | 96 +-
.../linkis/cs/client/test/service/TestRemove.java | 142 +-
.../cs/client/test/service/TestSearchService.java | 139 +-
.../test/test_multiuser/TestChangeContext.java | 134 +-
.../test/test_multiuser/TestCreateContext.java | 149 +-
.../linkis-cs-common/pom.xml | 93 +-
.../linkis/cs/common/annotation/KeywordMethod.java | 4 +-
.../linkis/cs/common/entity/data/CSResultData.java | 14 +-
.../apache/linkis/cs/common/entity/data/Data.java | 4 +-
.../linkis/cs/common/entity/data/JobData.java | 4 +-
.../cs/common/entity/data/LinkisJobData.java | 18 +-
.../cs/common/entity/enumeration/ContextScope.java | 10 +-
.../cs/common/entity/enumeration/ContextType.java | 18 +-
.../cs/common/entity/enumeration/DBType.java | 12 +-
.../cs/common/entity/enumeration/ExpireType.java | 22 +-
.../cs/common/entity/enumeration/WorkType.java | 8 +-
.../apache/linkis/cs/common/entity/env/OSEnv.java | 4 +-
.../linkis/cs/common/entity/env/SoftWareEnv.java | 4 +-
.../cs/common/entity/env/SoftwareLibEnv.java | 4 +-
.../entity/history/AbstractContextHistory.java | 36 +-
.../entity/history/CommonResourceHistory.java | 20 +-
.../cs/common/entity/history/ContextHistory.java | 12 +-
.../entity/history/ContextHistoryIndexer.java | 2 +-
.../common/entity/history/EnvContextHistory.java | 4 +-
.../history/GlobalPropertyContextHistory.java | 4 +-
.../entity/history/KeywordContextHistroy.java | 4 +-
.../entity/history/ResourceContextHistory.java | 20 +-
.../history/metadata/CSTableLineageHistory.java | 28 +-
.../metadata/CSTableMetadataContextHistory.java | 28 +-
.../history/metadata/DBMetadataContextHistory.java | 4 +-
.../history/metadata/MetadataContextHistory.java | 12 +-
.../history/metadata/TableLineageHistory.java | 4 +-
.../history/metadata/TableOperationType.java | 8 +-
.../listener/CommonContextIDListenerDomain.java | 36 +-
.../listener/CommonContextKeyListenerDomain.java | 50 +-
.../entity/listener/ContextIDListenerDomain.java | 4 +-
.../entity/listener/ContextKeyListenerDomain.java | 4 +-
.../cs/common/entity/listener/ListenerDomain.java | 4 +-
.../linkis/cs/common/entity/metadata/CSColumn.java | 178 +-
.../linkis/cs/common/entity/metadata/CSDB.java | 130 +-
.../cs/common/entity/metadata/CSPartition.java | 196 +-
.../linkis/cs/common/entity/metadata/CSTable.java | 448 ++--
.../linkis/cs/common/entity/metadata/Column.java | 32 +-
.../linkis/cs/common/entity/metadata/DB.java | 20 +-
.../cs/common/entity/metadata/Partition.java | 32 +-
.../linkis/cs/common/entity/metadata/Table.java | 76 +-
.../cs/common/entity/object/CSFlowInfos.java | 18 +-
.../linkis/cs/common/entity/object/CSInfos.java | 4 +-
.../linkis/cs/common/entity/object/CSProperty.java | 8 +-
.../cs/common/entity/object/CommonProperty.java | 48 +-
.../cs/common/entity/resource/BMLResource.java | 64 +-
.../common/entity/resource/CommonFxResource.java | 292 +--
.../common/entity/resource/CommonUDFResource.java | 292 +--
.../cs/common/entity/resource/FxResource.java | 52 +-
.../common/entity/resource/LinkisBMLResource.java | 322 +--
.../cs/common/entity/resource/UDFResource.java | 52 +-
.../entity/source/CombinedNodeIDContextID.java | 70 +-
.../cs/common/entity/source/CommonContextID.java | 42 +-
.../cs/common/entity/source/CommonContextKey.java | 84 +-
.../entity/source/CommonContextKeyValue.java | 46 +-
.../common/entity/source/CommonContextValue.java | 36 +-
.../cs/common/entity/source/CommonHAContextID.java | 82 +-
.../linkis/cs/common/entity/source/ContextID.java | 12 +-
.../cs/common/entity/source/ContextIDParser.java | 2 +-
.../linkis/cs/common/entity/source/ContextKey.java | 32 +-
.../cs/common/entity/source/ContextKeyValue.java | 8 +-
.../cs/common/entity/source/ContextValue.java | 8 +-
.../cs/common/entity/source/CreatorContextKey.java | 4 +-
.../cs/common/entity/source/HAContextID.java | 10 +-
.../entity/source/LinkisHAWorkFlowContextID.java | 56 +-
.../entity/source/LinkisWorkflowContextID.java | 152 +-
.../cs/common/entity/source/OrderContextKey.java | 4 +-
.../cs/common/entity/source/UserContextID.java | 4 +-
.../linkis/cs/common/entity/source/ValueBean.java | 4 +-
.../cs/common/entity/source/VersionContextKey.java | 4 +-
.../cs/common/entity/source/WorkflowContextID.java | 20 +-
.../cs/common/entity/source/YMLContextKey.java | 6 +-
.../cs/common/exception/CSErrorException.java | 14 +-
.../cs/common/exception/CSWarnException.java | 14 +-
.../linkis/cs/common/exception/ErrorCode.java | 28 +-
.../cs/common/listener/ContextIDListener.java | 6 +-
.../cs/common/listener/ContextKeyListener.java | 6 +-
.../cs/common/protocol/ContextHTTPConstant.java | 22 +-
.../cs/common/protocol/ContextHistoryType.java | 40 +-
.../linkis/cs/common/protocol/ContextIDType.java | 72 +-
.../linkis/cs/common/protocol/ContextKeyType.java | 40 +-
.../cs/common/protocol/ContextKeyValueType.java | 40 +-
.../cs/common/protocol/ContextValueType.java | 40 +-
.../search/ContextSearchConditionMapBuilder.java | 325 +--
.../cs/common/serialize/AbstractSerializer.java | 78 +-
.../cs/common/serialize/ContextSerializer.java | 12 +-
.../helper/AbstractSerializationHelper.java | 115 +-
.../helper/ContextSerializationHelper.java | 103 +-
.../serialize/helper/SerializationHelper.java | 10 +-
.../context/CombinedNodeIDContextIDSerializer.java | 28 +-
.../impl/context/CommonContextKeySerializer.java | 28 +-
.../impl/context/ContextKeyValueSerializer.java | 88 +-
.../impl/context/ContextValueSerializer.java | 88 +-
.../LinkisHAWorkFlowContextIDSerializer.java | 31 +-
.../impl/history/CommonHistorySerializer.java | 36 +-
.../history/CommonResourceHistorySerializer.java | 52 +-
.../history/metadata/CSTableLineageSerializer.java | 67 +-
.../metadata/CSTableMetadataHistorySerializer.java | 63 +-
.../impl/value/LinkisBMLResourceSerializer.java | 28 +-
.../impl/value/data/CSResultDataSerializer.java | 28 +-
.../impl/value/data/LinkisJobDataSerializer.java | 28 +-
.../impl/value/metadata/CSTableSerializer.java | 28 +-
.../impl/value/object/CSFlowInfosSerializer.java | 28 +-
.../value/object/LinkisVariableSerializer.java | 28 +-
.../linkis/cs/common/utils/CSCommonUtils.java | 88 +-
.../cs/common/utils/CSHighAvailableUtils.java | 230 +-
.../test/ContextSerializationHelperTest.java | 293 +--
.../linkis-cs-listener/pom.xml | 93 +-
.../apache/linkis/cs/listener/CSIDListener.java | 6 +-
.../apache/linkis/cs/listener/CSKeyListener.java | 8 +-
.../cs/listener/ContextAsyncEventListener.java | 2 +-
.../ListenerBus/ContextAsyncListenerBus.java | 44 +-
.../listener/callback/AbstractCallbackEngine.java | 6 +-
.../cs/listener/callback/CallbackEngine.java | 8 +-
.../listener/callback/ContextIDCallbackEngine.java | 2 +-
.../callback/ContextKeyCallbackEngine.java | 2 +-
.../listener/callback/imp/ContextKeyValueBean.java | 70 +-
.../imp/DefaultContextIDCallbackEngine.java | 224 +-
.../imp/DefaultContextKeyCallbackEngine.java | 259 +-
.../cs/listener/conf/ContextListenerConf.java | 21 +-
.../linkis/cs/listener/event/ContextIDEvent.java | 2 +-
.../cs/listener/event/enumeration/OperateType.java | 16 +-
.../listener/event/impl/DefaultContextIDEvent.java | 32 +-
.../event/impl/DefaultContextKeyEvent.java | 56 +-
.../cs/listener/manager/ListenerManager.java | 6 +-
.../manager/imp/DefaultContextListenerManager.java | 62 +-
.../linkis/cs/listener/test/TestContextID.java | 18 +-
.../linkis/cs/listener/test/TestContextKey.java | 72 +-
.../cs/listener/test/TestContextKeyValue.java | 36 +-
.../linkis/cs/listener/test/TestContextValue.java | 32 +-
.../linkis-cs-server/pom.xml | 262 +-
.../java/org/apache/linkis/cs/ContextSearch.java | 16 +-
.../org/apache/linkis/cs/DefaultContextSearch.java | 101 +-
.../cs/condition/AbstractCommonCondition.java | 24 +-
.../linkis/cs/condition/BinaryLogicCondition.java | 58 +-
.../org/apache/linkis/cs/condition/Condition.java | 8 +-
.../apache/linkis/cs/condition/ConditionType.java | 8 +-
.../linkis/cs/condition/UnaryLogicCondition.java | 20 +-
.../condition/construction/AndConditionParser.java | 23 +-
.../condition/construction/ConditionBuilder.java | 16 +-
.../construction/ConditionBuilderImpl.java | 118 +-
.../cs/condition/construction/ConditionParser.java | 50 +-
.../construction/ContainsConditionParser.java | 16 +-
.../construction/ContextScopeConditionParser.java | 18 +-
.../construction/ContextTypeConditionParser.java | 17 +-
.../ContextValueTypeConditionParser.java | 34 +-
.../construction/NearestConditionParser.java | 26 +-
.../condition/construction/NotConditionParser.java | 18 +-
.../condition/construction/OrConditionParser.java | 23 +-
.../construction/RegexConditionParser.java | 16 +-
.../linkis/cs/condition/impl/AndCondition.java | 14 +-
.../cs/condition/impl/ContainsCondition.java | 28 +-
.../cs/condition/impl/ContextScopeCondition.java | 28 +-
.../cs/condition/impl/ContextTypeCondition.java | 28 +-
.../condition/impl/ContextValueTypeCondition.java | 28 +-
.../linkis/cs/condition/impl/NearestCondition.java | 64 +-
.../linkis/cs/condition/impl/NotCondition.java | 14 +-
.../linkis/cs/condition/impl/OrCondition.java | 14 +-
.../linkis/cs/condition/impl/RegexCondition.java | 28 +-
.../cs/contextcache/ContextCacheService.java | 29 +-
.../contextcache/DefaultContextCacheService.java | 452 ++--
.../linkis/cs/contextcache/cache/ContextCache.java | 16 +-
.../cache/DefaultContextAddListener.java | 71 +-
.../cs/contextcache/cache/DefaultContextCache.java | 295 +--
.../cs/contextcache/cache/csid/ContextIDValue.java | 8 +-
.../cache/csid/ContextIDValueGenerator.java | 2 +-
.../csid/impl/ContextIDValueGeneratorImpl.java | 134 +-
.../cache/csid/impl/ContextIDValueImpl.java | 148 +-
.../cache/cskey/ContextKeyValueContext.java | 34 +-
.../cache/cskey/ContextValueMapSet.java | 24 +-
.../cache/cskey/impl/ContextValueMapSetImpl.java | 249 +-
.../cskey/impl/DefaultContextKeyValueContext.java | 350 +--
.../cache/guava/ContextIDRemoveListener.java | 38 +-
.../cs/contextcache/cleaner/AUTOCleaner.java | 2 +-
.../cs/contextcache/conf/ContextCacheConf.java | 21 +-
.../contextcache/index/ContextInvertedIndex.java | 8 +-
.../index/ContextInvertedIndexSet.java | 14 +-
.../index/ContextInvertedIndexSetImpl.java | 84 +-
.../index/DefaultContextInvertedIndex.java | 56 +-
.../cs/contextcache/metric/ClassIntrospector.java | 363 +--
.../cs/contextcache/metric/ContextCacheMetric.java | 12 +-
.../cs/contextcache/metric/ContextIDMetric.java | 14 +-
.../metric/DefaultContextCacheMetric.java | 66 +-
.../metric/DefaultContextIDMetric.java | 68 +-
.../linkis/cs/contextcache/metric/ObjectInfo.java | 239 +-
.../cs/contextcache/metric/SizeEstimator.java | 30 +-
.../contextcache/parser/ContextKeyValueParser.java | 2 +-
.../parser/DefaultContextKeyValueParser.java | 84 +-
.../cs/contextcache/utils/ContextCacheUtils.java | 16 +-
.../cs/exception/ContextSearchFailedException.java | 6 +-
.../cs/execution/AbstractConditionExecution.java | 106 +-
.../linkis/cs/execution/ConditionExecution.java | 14 +-
.../fetcher/AbstractContextCacheFetcher.java | 8 +-
.../cs/execution/fetcher/ContextCacheFetcher.java | 2 +-
.../fetcher/ContextTypeContextSearchFetcher.java | 34 +-
.../fetcher/IterateContextCacheFetcher.java | 32 +-
.../cs/execution/impl/AndConditionExecution.java | 16 +-
.../impl/BinaryLogicConditionExecution.java | 63 +-
.../execution/impl/ContainsConditionExecution.java | 34 +-
.../impl/ContextScopeConditionExecution.java | 36 +-
.../impl/ContextTypeConditionExecution.java | 37 +-
.../impl/ContextValueTypeConditionExecution.java | 36 +-
.../execution/impl/NearestConditionExecution.java | 22 +-
.../cs/execution/impl/NotConditionExecution.java | 16 +-
.../cs/execution/impl/OrConditionExecution.java | 16 +-
.../cs/execution/impl/RegexConditionExecution.java | 34 +-
.../impl/UnaryLogicConditionExecution.java | 26 +-
.../matcher/AbstractContextSearchMatcher.java | 8 +-
.../matcher/AndLogicContextSearchMatcher.java | 14 +-
.../matcher/BinaryLogicContextSearchMatcher.java | 14 +-
.../matcher/ConditionMatcherResolver.java | 44 +-
.../matcher/ContainsContextSearchMatcher.java | 26 +-
.../matcher/ContextScopeContextSearchMatcher.java | 18 +-
.../cs/execution/matcher/ContextSearchMatcher.java | 2 +-
.../matcher/ContextTypeContextSearchMatcher.java | 18 +-
.../ContextValueTypeContextSearchMatcher.java | 18 +-
.../matcher/NearestLogicContextSearchMatcher.java | 14 +-
.../matcher/NotLogicContextSearchMatcher.java | 14 +-
.../matcher/OrLogicContextSearchMatcher.java | 14 +-
.../matcher/RegexContextSearchMatcher.java | 29 +-
.../execution/matcher/SkipContextSearchMather.java | 14 +-
.../matcher/UnaryLogicContextSearchMatcher.java | 10 +-
.../ruler/AbstractContextSearchRuler.java | 8 +-
.../ruler/CommonListContextSearchRuler.java | 42 +-
.../cs/execution/ruler/ContextSearchRuler.java | 2 +-
.../execution/ruler/NearestContextSearchRuler.java | 262 +-
.../cs/highavailable/AbstractContextHAManager.java | 8 +-
.../linkis/cs/highavailable/ContextHAManager.java | 2 +-
.../cs/highavailable/DefaultContextHAManager.java | 158 +-
.../conf/ContextHighAvailableConf.java | 12 +-
.../cs/highavailable/exception/CSErrorCode.java | 16 +-
.../highavailable/ha/BackupInstanceGenerator.java | 4 +-
.../cs/highavailable/ha/ContextHAChecker.java | 8 +-
.../cs/highavailable/ha/ContextHAIDGenerator.java | 2 +-
.../ha/impl/BackupInstanceGeneratorImpl.java | 95 +-
.../ha/impl/ContextHACheckerImpl.java | 225 +-
.../ha/impl/ContextHAIDGeneratorImpl.java | 54 +-
.../pluggable/HAContextPersistenceManagerImpl.java | 127 +-
.../highavailable/proxy/MethodInterceptorImpl.java | 392 +--
.../linkis/cs/optimize/ConditionOptimizer.java | 2 +-
.../linkis/cs/optimize/OptimizedCondition.java | 159 +-
.../cs/optimize/cost/ConditionCostCalculator.java | 30 +-
.../apache/linkis/cs/optimize/dfs/BinaryTree.java | 8 +-
.../linkis/cs/optimize/dfs/MinCostBinaryTree.java | 112 +-
.../org/apache/linkis/cs/optimize/dfs/Node.java | 14 +-
.../optimize/impl/CostBasedConditionOptimizer.java | 20 +-
.../cs/persistence/ContextPersistenceBeans.java | 44 +-
.../cs/persistence/ContextPersistenceManager.java | 16 +-
.../persistence/ContextPersistenceManagerImpl.java | 194 +-
.../persistence/aop/PersistenceTuningAspect.java | 119 +-
.../cs/persistence/conf/PersistenceConf.java | 28 +-
.../cs/persistence/dao/ContextHistoryMapper.java | 29 +-
.../persistence/dao/ContextIDListenerMapper.java | 8 +-
.../linkis/cs/persistence/dao/ContextIDMapper.java | 24 +-
.../persistence/dao/ContextKeyListenerMapper.java | 12 +-
.../cs/persistence/dao/ContextMapMapper.java | 68 +-
.../cs/persistence/entity/ExtraFieldClass.java | 118 +-
.../entity/PersistenceContextHistory.java | 138 +-
.../persistence/entity/PersistenceContextID.java | 170 +-
.../entity/PersistenceContextIDListener.java | 88 +-
.../persistence/entity/PersistenceContextKey.java | 84 +-
.../entity/PersistenceContextKeyListener.java | 76 +-
.../entity/PersistenceContextKeyValue.java | 120 +-
.../entity/PersistenceContextValue.java | 66 +-
.../cs/persistence/exception/ThrowingFunction.java | 2 +-
.../persistence/ContextHistoryPersistence.java | 12 +-
.../persistence/ContextIDListenerPersistence.java | 14 +-
.../persistence/ContextIDPersistence.java | 28 +-
.../persistence/ContextKeyListenerPersistence.java | 16 +-
.../persistence/ContextMapPersistence.java | 46 +-
.../KeywordContextHistoryPersistence.java | 10 +-
.../persistence/TransactionManager.java | 8 +-
.../impl/ContextHistoryPersistenceImpl.java | 119 +-
.../impl/ContextIDListenerPersistenceImpl.java | 90 +-
.../persistence/impl/ContextIDPersistenceImpl.java | 225 +-
.../impl/ContextKeyListenerPersistenceImpl.java | 159 +-
.../impl/ContextMapPersistenceImpl.java | 366 +--
.../impl/KeywordContextHistoryPersistenceImpl.java | 54 +-
.../persistence/impl/TransactionManagerImpl.java | 46 +-
.../cs/persistence/util/PersistenceUtils.java | 242 +-
.../linkis/cs/server/LinkisCSApplication.java | 6 +-
.../linkis/cs/server/conf/ContextServerConf.java | 21 +-
.../cs/server/enumeration/ServiceMethod.java | 24 +-
.../linkis/cs/server/enumeration/ServiceType.java | 54 +-
.../cs/server/parser/DefaultKeywordParser.java | 184 +-
.../cs/server/parser/KeywordMethodEntity.java | 66 +-
.../linkis/cs/server/parser/KeywordParser.java | 2 +-
.../protocol/AbstractHttpRequestProtocol.java | 54 +-
.../cs/server/protocol/ContextHistoryProtocol.java | 8 +-
.../cs/server/protocol/ContextIDProtocol.java | 8 +-
.../server/protocol/ContextListenerProtocol.java | 8 +-
.../linkis/cs/server/protocol/ContextProtocol.java | 8 +-
.../cs/server/protocol/HttpRequestProtocol.java | 14 +-
.../cs/server/protocol/HttpResponseProtocol.java | 14 +-
.../cs/server/protocol/RestResponseProtocol.java | 116 +-
.../linkis/cs/server/restful/CsRestfulParent.java | 158 +-
.../linkis/cs/server/scheduler/CsScheduler.java | 6 +-
.../cs/server/scheduler/DefaultCsScheduler.java | 78 +-
.../linkis/cs/server/scheduler/HttpAnswerJob.java | 4 +-
.../cs/server/scheduler/HttpAnswerJobBuilder.java | 56 +-
.../apache/linkis/cs/server/scheduler/HttpJob.java | 4 +-
.../linkis/cs/server/scheduler/HttpJobBuilder.java | 16 +-
.../cs/server/scheduler/HttpPriorityJob.java | 2 +-
.../linkis/cs/server/scheduler/RestJobBuilder.java | 12 +-
.../cs/server/scheduler/impl/CsExecuteRequest.java | 58 +-
.../scheduler/impl/CsExecutorExecutionManager.java | 52 +-
.../cs/server/scheduler/impl/CsJobListener.java | 66 +-
.../cs/server/scheduler/impl/CsSchedulerBean.java | 37 +-
.../cs/server/scheduler/impl/CsSchedulerJob.java | 78 +-
.../impl/JobToExecuteRequestConsumer.java | 8 +-
.../linkis/cs/server/service/AbstractService.java | 114 +-
.../cs/server/service/ContextHistoryService.java | 18 +-
.../linkis/cs/server/service/ContextIDService.java | 30 +-
.../cs/server/service/ContextListenerService.java | 12 +-
.../linkis/cs/server/service/ContextService.java | 61 +-
.../apache/linkis/cs/server/service/Service.java | 10 +-
.../service/impl/ContextHistoryServiceImpl.java | 129 +-
.../server/service/impl/ContextIDServiceImpl.java | 202 +-
.../service/impl/ContextListenerServiceImpl.java | 96 +-
.../cs/server/service/impl/ContextServiceImpl.java | 497 ++--
.../org/apache/linkis/cs/server/util/CsUtils.java | 18 +-
.../ha/instancealias/InstanceAliasConverter.scala | 9 +-
.../ha/instancealias/InstanceAliasManager.scala | 9 +-
.../impl/DefaultInstanceAliasConverter.scala | 18 +-
.../impl/InstanceAliasManagerImpl.scala | 38 +-
.../impl/RouteLabelInstanceAliasConverter.scala | 69 +-
.../cs/server/scheduler/impl/CsExecutor.scala | 18 +-
.../java/org/apache/linkis/cs/ContainsTest.java | 160 +-
.../org/apache/linkis/cs/ContextScopeTest.java | 160 +-
.../org/apache/linkis/cs/ContextSearchTest.java | 85 +-
.../java/org/apache/linkis/cs/ContextTypeTest.java | 89 +-
.../test/java/org/apache/linkis/cs/RegexTest.java | 160 +-
.../cs/contextcache/test/csid/TestContextID.java | 18 +-
.../contextcache/test/keyword/TestContextKey.java | 76 +-
.../test/keyword/TestContextKeyValue.java | 36 +-
.../test/keyword/TestContextKeyValueParser.java | 86 +-
.../test/keyword/TestContextValue.java | 50 +-
.../test/service/TestContextCacheService.java | 248 +-
.../org/apache/linkis/cs/csid/TestContextID.java | 18 +-
.../highavailable/test/TestContextHAManager.java | 281 +--
.../cs/highavailable/test/haid/TestHAID.java | 66 +-
.../test/persist/TestPersistence.java | 44 +-
.../apache/linkis/cs/keyword/TestContextKey.java | 114 +-
.../linkis/cs/keyword/TestContextKeyValue.java | 36 +-
.../apache/linkis/cs/keyword/TestContextValue.java | 50 +-
.../org/apache/linkis/cs/parser/ApiJsonTest.java | 128 +-
.../linkis/cs/persistence/AContextHistory.java | 110 +-
.../apache/linkis/cs/persistence/AContextID.java | 154 +-
.../linkis/cs/persistence/AContextIDListener.java | 36 +-
.../apache/linkis/cs/persistence/AContextKey.java | 140 +-
.../linkis/cs/persistence/AContextKeyListener.java | 36 +-
.../linkis/cs/persistence/AContextKeyValue.java | 64 +-
.../linkis/cs/persistence/AContextValue.java | 38 +-
.../linkis/cs/persistence/ContextHistoryTest.java | 165 +-
.../cs/persistence/ContextIDListenerTest.java | 72 +-
.../linkis/cs/persistence/ContextIDTest.java | 60 +-
.../cs/persistence/ContextKeyListenerTest.java | 78 +-
.../linkis/cs/persistence/ContextMapTest.java | 252 +-
.../linkis/cs/persistence/ExtraFieldClassTest.java | 49 +-
.../linkis/cs/persistence/MapTypeAdapter.java | 98 +-
.../apache/linkis/cs/persistence/ProxyMethodA.java | 8 +-
.../apache/linkis/cs/persistence/ProxyTest.java | 18 +-
.../org/apache/linkis/cs/persistence/Scan.java | 20 +-
.../linkis/cs/server/ContextHistoryRestfulApi.java | 159 +-
.../linkis/cs/server/ContextIDRestfulApi.java | 136 +-
.../cs/server/ContextListenerRestfulApi.java | 64 +-
.../apache/linkis/cs/server/ContextRestfulApi.java | 318 +--
.../apache/linkis/cs/server/CsRestfulParent.java | 61 +-
.../java/org/apache/linkis/cs/server/Scan.java | 10 +-
.../org/apache/linkis/cs/server/SchedulerTest.java | 30 +-
.../linkis-context-service/pom.xml | 52 +-
.../linkis-datasource-client/pom.xml | 116 +-
.../datasource/client/AbstractRemoteClient.scala | 2 +-
.../datasource/client/DataSourceRemoteClient.scala | 19 +-
.../datasource/client/MetaDataRemoteClient.scala | 2 +-
.../linkis/datasource/client/RemoteClient.scala | 6 +-
.../client/config/DatasourceClientConfig.scala | 26 +-
.../DataSourceClientBuilderException.scala | 7 +-
.../client/impl/LinkisDataSourceRemoteClient.scala | 87 +-
.../client/impl/LinkisMetaDataRemoteClient.scala | 26 +-
.../client/request/CreateDataSourceAction.scala | 21 +-
.../client/request/DataSourceAction.scala | 2 +-
.../request/DataSourceTestConnectAction.scala | 26 +-
.../client/request/DeleteDataSourceAction.scala | 22 +-
.../client/request/ExpireDataSourceAction.scala | 21 +-
.../request/GetAllDataSourceTypesAction.scala | 11 +-
.../GetConnectParamsByDataSourceIdAction.scala | 18 +-
.../GetConnectParamsByDataSourceNameAction.scala | 34 +-
.../request/GetDataSourceVersionsAction.scala | 18 +-
.../request/GetInfoByDataSourceIdAction.scala | 16 +-
.../request/GetInfoByDataSourceNameAction.scala | 14 +-
.../request/GetKeyTypeDatasourceAction.scala | 16 +-
.../client/request/MetadataGetColumnsAction.scala | 19 +-
.../request/MetadataGetDatabasesAction.scala | 13 +-
.../request/MetadataGetPartitionsAction.scala | 19 +-
.../request/MetadataGetTablePropsAction.scala | 13 +-
.../client/request/MetadataGetTablesAction.scala | 16 +-
.../request/PublishDataSourceVersionAction.scala | 30 +-
.../client/request/QueryDataSourceAction.scala | 6 +-
.../client/request/QueryDataSourceEnvAction.scala | 15 +-
.../client/request/UpdateDataSourceAction.scala | 24 +-
.../request/UpdateDataSourceParameterAction.scala | 25 +-
.../client/response/CreateDataSourceResult.scala | 4 +-
.../response/DataSourceTestConnectResult.scala | 4 +-
.../client/response/DeleteDataSourceResult.scala | 4 +-
.../client/response/ExpireDataSourceResult.scala | 6 +-
.../response/GetAllDataSourceTypesResult.scala | 14 +-
.../GetConnectParamsByDataSourceIdResult.scala | 4 +-
.../GetConnectParamsByDataSourceNameResult.scala | 5 +-
.../response/GetDataSourceVersionsResult.scala | 21 +-
.../response/GetInfoByDataSourceIdResult.scala | 5 +-
.../response/GetInfoByDataSourceNameResult.scala | 3 +-
.../response/GetKeyTypeDatasourceResult.scala | 19 +-
.../client/response/MetadataGetColumnsResult.scala | 19 +-
.../response/MetadataGetDatabasesResult.scala | 5 +-
.../response/MetadataGetPartitionsResult.scala | 12 +-
.../response/MetadataGetTablePropsResult.scala | 5 +-
.../client/response/MetadataGetTablesResult.scala | 5 +-
.../response/PublishDataSourceVersionResult.scala | 6 +-
.../client/response/QueryDataSourceEnvResult.scala | 16 +-
.../client/response/QueryDataSourceResult.scala | 16 +-
.../response/UpdateDataSourceParameterResult.scala | 4 +-
.../client/response/UpdateDataSourceResult.scala | 4 +-
.../linkis-datasource-manager/common/pom.xml | 105 +-
.../datasourcemanager/common/ServiceErrorCode.java | 20 +-
.../datasourcemanager/common/auth/AuthContext.java | 78 +-
.../common/domain/DataSource.java | 370 +--
.../common/domain/DataSourceEnv.java | 210 +-
.../domain/DataSourceParamKeyDefinition.java | 354 +--
.../common/domain/DataSourceParameter.java | 42 +-
.../common/domain/DataSourceType.java | 150 +-
.../common/domain/DatasourceVersion.java | 136 +-
.../common/exception/JsonErrorException.java | 8 +-
.../datasourcemanager/common/util/CryptoUtils.java | 139 +-
.../common/util/PatternInjectUtils.java | 306 +--
.../datasourcemanager/common/util/json/Json.java | 176 +-
.../common/protocol/DsmQueryProtocol.scala | 20 +-
.../linkis-datasource-manager/server/pom.xml | 279 +--
.../core/LinkisDataSourceManagerApplication.java | 10 +-
.../datasourcemanager/core/dao/DataSourceDao.java | 154 +-
.../core/dao/DataSourceEnvDao.java | 80 +-
.../core/dao/DataSourceParamKeyDao.java | 52 +-
.../core/dao/DataSourceTypeDao.java | 26 +-
.../core/dao/DataSourceVersionDao.java | 71 +-
.../CustomMultiPartFormDataTransformer.java | 402 ++--
.../core/formdata/FormDataTransformerFactory.java | 22 +-
.../core/formdata/FormStreamContent.java | 84 +-
.../formdata/MultiPartFormDataTransformer.java | 22 +-
.../core/restful/RestfulApiHelper.java | 192 +-
.../exception/BeanValidationExceptionMapper.java | 18 +-
.../core/service/BmlAppService.java | 48 +-
.../core/service/DataSourceInfoService.java | 387 +--
.../core/service/DataSourceRelateService.java | 76 +-
.../core/service/MetadataOperateService.java | 30 +-
.../core/service/hooks/DataSourceParamsHook.java | 18 +-
.../service/hooks/DefaultDataSourceParamsHook.java | 12 +-
.../core/service/impl/BmlAppServiceImpl.java | 164 +-
.../service/impl/DataSourceInfoServiceImpl.java | 1054 +++++----
.../service/impl/DataSourceRelateServiceImpl.java | 54 +-
.../service/impl/MetadataOperateServiceImpl.java | 170 +-
.../validate/DataSourceParameterValidator.java | 142 +-
.../core/validate/ParameterValidateException.java | 12 +-
.../core/validate/ParameterValidateStrategy.java | 32 +-
.../core/validate/ParameterValidator.java | 42 +-
.../strategy/RegExpParameterValidateStrategy.java | 82 +-
.../strategy/TypeParameterValidateStrategy.java | 87 +-
.../datasourcemanager/core/vo/DataSourceEnvVo.java | 38 +-
.../datasourcemanager/core/vo/DataSourceVo.java | 91 +-
.../datasourcemanager/core/vo/PageViewVo.java | 28 +-
.../core/receivers/DsmReceiver.scala | 95 +-
.../core/WebApplicationServer.java | 6 +-
.../core/dao/DataSourceDaoTest.java | 325 +--
.../core/dao/DataSourceEnvDaoTest.java | 200 +-
.../core/dao/DataSourceParamKeyDaoTest.java | 48 +-
.../core/dao/DataSourceTypeDaoTest.java | 26 +-
.../core/dao/DataSourceVersionDaoTest.java | 126 +-
.../restful/DataSourceAdminRestfulApiTest.java | 286 +--
.../core/restful/DataSourceCoreRestfulApiTest.java | 1025 ++++----
.../restful/DataSourceOperateRestfulApiTest.java | 10 +-
.../datasourcemanager/core/restful/MvcUtils.java | 140 +-
.../core/service/BmlAppServiceTest.java | 76 +-
.../core/service/DataSourceInfoServiceTest.java | 574 ++---
.../core/service/DataSourceRelateServiceTest.java | 16 +-
.../core/service/MetadataOperateServiceTest.java | 82 +-
.../linkis-metadata-query/common/pom.xml | 123 +-
.../metadata/query/common/MdmConfiguration.java | 8 +-
.../query/common/cache/CacheConfiguration.java | 22 +-
.../metadata/query/common/cache/CacheManager.java | 38 +-
.../query/common/cache/ConnCacheManager.java | 85 +-
.../query/common/domain/MetaColumnInfo.java | 112 +-
.../query/common/domain/MetaPartitionInfo.java | 90 +-
.../exception/MetaMethodInvokeException.java | 36 +-
.../common/exception/MetaRuntimeException.java | 16 +-
.../query/common/service/AbstractMetaService.java | 508 ++--
.../query/common/service/BaseMetadataService.java | 16 +-
.../query/common/service/MetadataConnection.java | 46 +-
.../query/common/service/MetadataDbService.java | 120 +-
.../common/protocol/MetadataOperateProtocol.scala | 19 +-
.../query/common/protocol/MetadataProtocol.scala | 6 +-
.../common/protocol/MetadataQueryProtocol.scala | 66 +-
.../linkis-metadata-query/server/pom.xml | 180 +-
.../server/LinkisMetadataQueryApplication.java | 10 +-
.../server/loader/MetaClassLoaderManager.java | 389 +--
.../query/server/service/MetadataQueryService.java | 302 +--
.../service/impl/MetadataQueryServiceImpl.java | 659 +++---
.../metadata/query/server/utils/MetadataUtils.java | 234 +-
.../query/server/receiver/BaseMetaReceiver.scala | 17 +-
.../server/restful/MetadataCoreRestfulTest.java | 409 ++--
.../server/restful/MetadataQueryRestfulTest.java | 457 ++--
.../metadata/query/server/restful/MvcUtils.java | 140 +-
.../service/elasticsearch/pom.xml | 177 +-
.../metadata/query/service/ElasticConnection.java | 191 +-
.../query/service/ElasticParamsMapper.java | 12 +-
.../metadata/query/service/EsMetaService.java | 122 +-
.../linkis-metadata-query/service/hive/pom.xml | 598 ++---
.../metadata/query/service/HiveConnection.java | 222 +-
.../metadata/query/service/HiveMetaService.java | 429 ++--
.../metadata/query/service/HiveParamsMapper.java | 16 +-
.../linkis-metadata-query/service/kafka/pom.xml | 200 +-
.../metadata/query/service/KafkaConnection.java | 44 +-
.../metadata/query/service/KafkaMetaService.java | 173 +-
.../metadata/query/service/KafkaParamsMapper.java | 12 +-
.../linkis-metadata-query/service/mysql/pom.xml | 180 +-
.../metadata/query/service/Db2MetaService.java | 108 +-
.../metadata/query/service/DmMetaService.java | 108 +-
.../query/service/GreenplumMetaService.java | 125 +-
.../query/service/KingbaseMetaService.java | 108 +-
.../metadata/query/service/MysqlMetaService.java | 105 +-
.../metadata/query/service/OracleMetaService.java | 132 +-
.../query/service/PostgresqlMetaService.java | 126 +-
.../metadata/query/service/SqlConnection.java | 386 +--
.../metadata/query/service/SqlParamsMapper.java | 20 +-
.../query/service/SqlserverMetaService.java | 102 +-
.../query/service/conf/SqlParamsMapper.java | 24 +-
.../metadata/query/service/db2/SqlConnection.java | 380 +--
.../metadata/query/service/dm/SqlConnection.java | 396 ++--
.../query/service/greenplum/SqlConnection.java | 380 +--
.../query/service/kingbase/SqlConnection.java | 397 ++--
.../query/service/mysql/SqlConnection.java | 380 +--
.../query/service/oracle/SqlConnection.java | 429 ++--
.../query/service/postgres/SqlConnection.java | 371 +--
.../query/service/sqlserver/SqlConnection.java | 411 ++--
.../linkis-datasource/linkis-metadata/pom.xml | 276 +--
.../metadata/LinkisDataSourceApplication.java | 6 +-
.../metadata/condition/DataSourceCondition.java | 10 +-
.../org/apache/linkis/metadata/dao/MdqDao.java | 26 +-
.../linkis/metadata/domain/AbstractAuditable.java | 86 +-
.../org/apache/linkis/metadata/domain/Column.java | 84 +-
.../metadata/domain/mdq/DomainCoversionUtils.java | 271 +--
.../apache/linkis/metadata/domain/mdq/Tunple.java | 30 +-
.../metadata/domain/mdq/bo/ApplicationBO.java | 42 +-
.../linkis/metadata/domain/mdq/bo/BaseBO.java | 144 +-
.../linkis/metadata/domain/mdq/bo/MdqTableBO.java | 42 +-
.../metadata/domain/mdq/bo/MdqTableBaseInfoBO.java | 42 +-
.../domain/mdq/bo/MdqTableFieldsInfoBO.java | 202 +-
.../domain/mdq/bo/MdqTableImportInfoBO.java | 56 +-
.../linkis/metadata/domain/mdq/bo/ModelBO.java | 72 +-
.../linkis/metadata/domain/mdq/po/MdqAccess.java | 84 +-
.../linkis/metadata/domain/mdq/po/MdqField.java | 218 +-
.../linkis/metadata/domain/mdq/po/MdqImport.java | 72 +-
.../linkis/metadata/domain/mdq/po/MdqLineage.java | 72 +-
.../linkis/metadata/domain/mdq/po/MdqTable.java | 402 ++--
.../metadata/domain/mdq/po/MdqTableInfo.java | 162 +-
.../metadata/domain/mdq/vo/ApplicationVO.java | 42 +-
.../linkis/metadata/domain/mdq/vo/BaseVO.java | 144 +-
.../metadata/domain/mdq/vo/MdqImportInfoVO.java | 88 +-
.../metadata/domain/mdq/vo/MdqTableBaseInfoVO.java | 42 +-
.../domain/mdq/vo/MdqTableFieldsInfoVO.java | 162 +-
.../mdq/vo/MdqTablePartitionStatisticInfoVO.java | 122 +-
.../domain/mdq/vo/MdqTableStatisticInfoVO.java | 128 +-
.../linkis/metadata/domain/mdq/vo/MdqTableVO.java | 56 +-
.../linkis/metadata/domain/mdq/vo/ModelVO.java | 72 +-
.../apache/linkis/metadata/hive/config/DSEnum.java | 4 +-
.../linkis/metadata/hive/config/DataSource.java | 2 +-
.../hive/config/DataSourceContextHolder.java | 20 +-
.../metadata/hive/config/DynamicDataSource.java | 8 +-
.../metadata/hive/config/LinkisMybatisConfig.java | 78 +-
.../metadata/hive/config/MultiSourceExAop.java | 69 +-
.../linkis/metadata/hive/dao/HiveMetaDao.java | 76 +-
.../metadata/hive/dto/MetadataQueryParam.java | 178 +-
.../restful/remote/DataSourceRestfulRemote.java | 54 +-
.../linkis/metadata/service/DataSourceService.java | 16 +-
.../service/HiveMetaWithPermissionService.java | 10 +-
.../apache/linkis/metadata/service/MdqService.java | 68 +-
.../service/impl/DataSourceServiceImpl.java | 439 ++--
.../impl/HiveMetaWithPermissionServiceImpl.java | 161 +-
.../metadata/service/impl/MdqServiceImpl.java | 707 +++---
.../org/apache/linkis/metadata/type/Lifecycle.java | 26 +-
.../apache/linkis/metadata/type/MdqImportType.java | 6 +-
.../apache/linkis/metadata/type/ModelLevel.java | 22 +-
.../apache/linkis/metadata/type/UseWayType.java | 22 +-
.../org/apache/linkis/metadata/util/Constants.java | 16 +-
.../org/apache/linkis/metadata/util/DWSConfig.java | 58 +-
.../org/apache/linkis/metadata/util/HiveUtils.java | 50 +-
.../linkis/metadata/conf/MdqConfiguration.scala | 15 +-
.../apache/linkis/metadata/ddl/DDLCreator.scala | 36 +-
.../org/apache/linkis/metadata/ddl/DDLHelper.scala | 43 +-
.../linkis/metadata/ddl/ImportDDLCreator.scala | 309 +--
.../linkis/metadata/ddl/ScalaDDLCreator.scala | 96 +-
.../exception/MdqIllegalParamException.scala | 11 +-
.../linkis/metadata/receiver/MDQReceiver.scala | 29 +-
.../linkis/metadata/utils/MdqConstants.scala | 3 +-
.../apache/linkis/metadata/utils/MdqUtils.scala | 27 +-
.../linkis-datasource/pom.xml | 47 +-
.../linkis-configuration/pom.xml | 124 +-
.../configuration/LinkisConfigurationApp.java | 6 +-
.../linkis/configuration/dao/ConfigMapper.java | 48 +-
.../linkis/configuration/dao/LabelMapper.java | 10 +-
.../linkis/configuration/entity/CategoryLabel.java | 56 +-
.../configuration/entity/CategoryLabelVo.java | 140 +-
.../linkis/configuration/entity/ConfigKey.java | 168 +-
.../configuration/entity/ConfigKeyValue.java | 238 +-
.../linkis/configuration/entity/ConfigTree.java | 42 +-
.../linkis/configuration/entity/ConfigValue.java | 84 +-
.../exception/ConfigurationException.java | 16 +-
.../configuration/service/ConfigKeyService.java | 12 +-
.../service/impl/ConfigKeyServiceImpl.java | 238 +-
.../util/ConfigurationConfiguration.java | 16 +-
.../configuration/util/LabelEntityParser.java | 106 +-
.../linkis/configuration/conf/Configuration.scala | 23 +-
.../receiver/ConfigurationReceiver.scala | 34 +-
.../receiver/ConfigurationReceiverChooser.scala | 18 +-
.../configuration/service/CategoryService.scala | 174 +-
.../service/ConfigurationService.scala | 300 +--
.../linkis/configuration/util/JsonNodeUtil.scala | 14 +-
.../configuration/util/LabelParameterParser.scala | 42 +-
.../configuration/validate/ContainValidator.scala | 10 +-
.../configuration/validate/FloatValidator.scala | 14 +-
.../configuration/validate/JsonValidator.scala | 20 +-
.../configuration/validate/NoneValidator.scala | 10 +-
.../validate/NumericalValidator.scala | 22 +-
.../configuration/validate/OneOfValidator.scala | 12 +-
.../configuration/validate/RegexValidator.scala | 21 +-
.../linkis/configuration/validate/Validator.scala | 12 +-
.../configuration/validate/ValidatorManager.scala | 10 +-
.../validate/ValidatorManagerImpl.scala | 23 +-
.../linkis/configuration/WebApplicationServer.java | 6 +-
.../linkis/configuration/dao/ConfigMapperTest.java | 324 +--
.../linkis/configuration/dao/LabelMapperTest.java | 94 +-
.../restful/api/ConfigurationRestfulApiTest.java | 267 +--
.../linkis/configuration/restful/api/MvcUtils.java | 159 +-
.../util/ConfigurationConfigurationTest.java | 14 +-
.../configuration/util/LabelEntityParserTest.java | 54 +-
.../linkis-error-code-client/pom.xml | 89 +-
.../errorcode/client/ClientConfiguration.java | 74 +-
.../errorcode/client/ErrorCodeClientBuilder.java | 66 +-
.../errorcode/client/LinkisErrorCodeClient.java | 59 +-
.../errorcode/client/handler/ErrorCodeHandler.java | 8 +-
.../client/handler/ExceptionErrorCodeHandler.java | 2 +-
.../client/handler/LinkisErrorCodeFactory.java | 12 +-
.../client/handler/LinkisErrorCodeHandler.java | 364 +--
.../client/handler/LogErrorCodeHandler.java | 2 +-
.../client/handler/LogFileErrorCodeHandler.java | 32 +-
.../client/manager/LinkisErrorCodeManager.java | 28 +-
.../synchronizer/LinkisErrorCodeSynchronizer.java | 126 +-
.../apache/linkis/errorcode/client/utils/Test.java | 34 +-
.../errorcode/client/action/ErrorCodeAction.scala | 61 +-
.../errorcode/client/result/ErrorCodeResult.scala | 26 +-
.../errorcode/client/utils/ErrorCodeMatcher.scala | 42 +-
.../linkis-error-code-common/pom.xml | 69 +-
.../apache/linkis/errorcode/common/CommonConf.java | 2 +-
.../errorcode/common/AbstractErrorCode.scala | 13 +-
.../apache/linkis/errorcode/common/ErrorCode.scala | 17 +-
.../linkis/errorcode/common/LinkisErrorCode.scala | 44 +-
.../linkis-error-code-server/pom.xml | 121 +-
.../errorcode/server/dao/ErrorCodeMapper.java | 16 +-
.../server/service/LinkisErrorCodeService.java | 2 +-
.../service/impl/LinkisErrorCodeServiceImpl.java | 18 +-
.../errorcode/server/WebApplicationServer.java | 6 +-
.../linkis-publicservice/linkis-error-code/pom.xml | 33 +-
.../linkis-instance-label-client/pom.xml | 115 +-
.../label/client/EurekaInstanceLabelClient.scala | 23 +-
.../label/client/InstanceLabelClient.scala | 41 +-
.../linkis-instance-label-server/pom.xml | 152 +-
.../instance/label/InsLabelAutoConfiguration.java | 102 +-
.../instance/label/async/AsyncConsumerQueue.java | 62 +-
.../label/async/GenericAsyncConsumerQueue.java | 181 +-
.../label/cache/InsLabelCacheConfiguration.java | 91 +-
.../linkis/instance/label/conf/InsLabelConf.java | 44 +-
.../instance/label/dao/InsLabelRelationDao.java | 150 +-
.../linkis/instance/label/dao/InstanceInfoDao.java | 18 +-
.../instance/label/dao/InstanceLabelDao.java | 120 +-
.../instance/label/entity/InsPersistenceLabel.java | 138 +-
.../label/entity/InsPersistenceLabelValue.java | 54 +-
.../linkis/instance/label/entity/InstanceInfo.java | 70 +-
.../label/exception/InstanceErrorException.java | 20 +-
.../label/service/InsLabelAccessService.java | 158 +-
.../instance/label/service/InsLabelService.java | 126 +-
.../label/service/InsLabelServiceAdapter.java | 14 +-
.../label/service/annotation/AdapterMode.java | 2 +-
.../label/service/impl/DefaultInsLabelService.java | 762 +++---
.../impl/DefaultInsLabelServiceAdapter.java | 407 ++--
.../label/service/impl/EurekaInsLabelService.java | 120 +-
.../linkis/instance/label/utils/EntityParser.java | 34 +-
.../label/vo/InsPersistenceLabelSearchVo.java | 54 +-
.../linkis/instance/label/vo/InstanceInfoVo.java | 84 +-
.../label/service/InsLabelRpcService.scala | 44 +-
.../label/service/conf/InstanceConfigration.scala | 9 +-
.../service/rpc/DefaultInsLabelRpcService.scala | 67 +-
.../linkis-publicservice/linkis-jobhistory/pom.xml | 169 +-
.../linkis/jobhistory/LinkisJobHistoryApp.java | 6 +-
.../linkis/jobhistory/cache/QueryCacheManager.java | 8 +-
.../linkis/jobhistory/cache/QueryCacheService.java | 8 +-
.../linkis/jobhistory/cache/domain/TaskResult.java | 132 +-
.../cache/impl/DefaultQueryCacheManager.java | 322 +--
.../jobhistory/cache/impl/ScheduledCleanJob.java | 28 +-
.../jobhistory/cache/impl/ScheduledRefreshJob.java | 28 +-
.../cache/impl/ScheduledRefreshUndoneJob.java | 28 +-
.../jobhistory/cache/impl/UserTaskResultCache.java | 139 +-
.../linkis/jobhistory/cache/utils/MD5Util.java | 91 +-
.../linkis/jobhistory/dao/JobDetailMapper.java | 24 +-
.../linkis/jobhistory/dao/JobHistoryMapper.java | 148 +-
.../apache/linkis/jobhistory/entity/JobDetail.java | 172 +-
.../linkis/jobhistory/entity/JobHistory.java | 350 +--
.../apache/linkis/jobhistory/entity/QueryTask.java | 384 +--
.../linkis/jobhistory/entity/QueryTaskVO.java | 428 ++--
.../linkis/jobhistory/transitional/TaskStatus.java | 40 +-
.../apache/linkis/jobhistory/util/Constants.java | 2 +-
.../jobhistory/conf/JobhistoryConfiguration.scala | 16 +-
.../jobhistory/conversions/TaskConversions.scala | 97 +-
.../linkis/jobhistory/entity/QueryJobDetail.scala | 13 +-
.../linkis/jobhistory/entity/QueryJobHistory.scala | 13 +-
.../impl/JobHistoryDetailQueryServiceImpl.scala | 145 +-
.../service/impl/JobHistoryQueryServiceImpl.scala | 315 +--
.../linkis/jobhistory/util/QueryConfig.scala | 18 +-
.../apache/linkis/jobhistory/util/QueryUtils.scala | 59 +-
.../linkis/jobhistory/WebApplicationServer.java | 6 +-
.../linkis/jobhistory/dao/JobDetailMapperTest.java | 185 +-
.../linkis/jobhistory/entity/JobHistoryTest.java | 36 +-
.../restful/api/QueryRestfulApiTest.java | 226 +-
.../service/JobHistoryDetailQueryServiceTest.java | 234 +-
.../linkis-ps-common-lock/pom.xml | 127 +-
.../common/lock/CommonLockSpringConfiguration.java | 14 +-
.../common/lock/dao/CommonLockMapper.java | 24 +-
.../common/lock/entity/CommonLock.java | 128 +-
.../common/lock/service/CommonLockService.java | 6 +-
.../service/impl/DefaultCommonLockService.java | 78 +-
.../linkis-storage-script-dev-client/pom.xml | 91 +-
.../linkis/filesystem/WorkspaceClientFactory.scala | 13 +-
.../linkis/filesystem/WorkspaceClientImpl.scala | 49 +-
.../action/OpenScriptFromBMLAction.scala | 13 +-
.../filesystem/action/WorkspacePOSTAction.scala | 11 +-
.../filesystem/conf/WorkspaceClientConf.scala | 17 +-
.../filesystem/request/WorkspaceClient.scala | 22 +-
.../filesystem/request/WorkspaceHttpConf.scala | 9 +-
.../response/ScriptFromBMLResponse.scala | 13 +-
.../filesystem/response/WorkspaceResponse.scala | 12 +-
.../result/AbstractWorkspaceResult.scala | 12 +-
.../filesystem/result/ScriptFromBMLResult.scala | 14 +-
.../filesystem/result/ScriptToBMLResult.scala | 12 +-
.../linkis-storage-script-dev-server/pom.xml | 173 +-
.../linkis/filesystem/LinkisPublicServiceApp.java | 6 +-
.../filesystem/conf/WorkSpaceConfiguration.java | 69 +-
.../filesystem/constant/WorkSpaceConstants.java | 10 +-
.../linkis/filesystem/entity/DirFileTree.java | 108 +-
.../apache/linkis/filesystem/entity/LogLevel.java | 44 +-
.../filesystem/exception/WorkSpaceException.java | 12 +-
.../exception/WorkspaceExceptionManager.java | 100 +-
.../linkis/filesystem/util/WorkspaceUtil.java | 120 +-
.../apache/linkis/filesystem/bml/BMLHelper.scala | 58 +-
.../apache/linkis/filesystem/cache/FsCache.scala | 13 +-
.../conf/WorkspaceSpringConfiguration.scala | 31 +-
.../apache/linkis/filesystem/entity/FSInfo.scala | 18 +-
.../apache/linkis/filesystem/quartz/FSQuartz.scala | 39 +-
.../linkis/filesystem/service/FsService.scala | 58 +-
.../filesystem/validator/PathValidator.scala | 59 +-
.../linkis-udf/linkis-udf-client/pom.xml | 139 +-
.../scala/org/apache/linkis/udf/UDFClient.scala | 56 +-
.../apache/linkis/udf/UDFClientConfiguration.scala | 8 +-
.../linkis-udf/linkis-udf-common/pom.xml | 139 +-
.../java/org/apache/linkis/udf/entity/UDFInfo.java | 276 +--
.../org/apache/linkis/udf/entity/UDFManager.java | 28 +-
.../java/org/apache/linkis/udf/entity/UDFTree.java | 228 +-
.../org/apache/linkis/udf/entity/UDFVersion.java | 254 +-
.../apache/linkis/udf/excepiton/UDFException.java | 12 +-
.../org/apache/linkis/udf/utils/ConstantVar.java | 36 +-
.../java/org/apache/linkis/udf/vo/DownloadVo.java | 36 +-
.../java/org/apache/linkis/udf/vo/UDFAddVo.java | 304 +--
.../java/org/apache/linkis/udf/vo/UDFInfoVo.java | 308 +--
.../java/org/apache/linkis/udf/vo/UDFUpdateVo.java | 146 +-
.../org/apache/linkis/udf/vo/UDFVersionVo.java | 232 +-
.../apache/linkis/udf/api/rpc/RequestUdfTree.scala | 14 +-
.../linkis/udf/api/rpc/ResponseUdfTree.scala | 10 +-
.../linkis-udf/linkis-udf-service/pom.xml | 171 +-
.../org/apache/linkis/udf/api/UDFRestfulApi.java | 1607 ++++++-------
.../java/org/apache/linkis/udf/dao/UDFDao.java | 124 +-
.../java/org/apache/linkis/udf/dao/UDFTreeDao.java | 26 +-
.../org/apache/linkis/udf/dao/UDFVersionDao.java | 43 +-
.../org/apache/linkis/udf/service/UDFService.java | 100 +-
.../apache/linkis/udf/service/UDFTreeService.java | 12 +-
.../linkis/udf/service/impl/UDFServiceImpl.java | 1894 +++++++--------
.../udf/service/impl/UDFTreeServiceImpl.java | 381 +--
.../apache/linkis/udf/api/rpc/UdfReceiver.scala | 10 +-
.../linkis/udf/api/rpc/UdfReceiverChooser.scala | 16 +-
.../apache/linkis/udf/utils/UdfConfiguration.scala | 14 +-
.../linkis-publicservice/linkis-variable/pom.xml | 113 +-
.../org/apache/linkis/variable/dao/VarMapper.java | 14 +-
.../org/apache/linkis/variable/entity/VarKey.java | 84 +-
.../linkis/variable/entity/VarKeyAndValue.java | 42 +-
.../apache/linkis/variable/entity/VarKeyUser.java | 70 +-
.../linkis/variable/entity/VarKeyValueVO.java | 86 +-
.../org/apache/linkis/variable/entity/VarTree.java | 84 +-
.../variable/exception/VariableException.java | 6 +-
.../linkis/variable/service/VariableService.java | 10 +-
.../org/apache/linkis/variable/util/Constants.java | 2 +-
.../variable/receiver/VariableReceiver.scala | 20 +-
.../receiver/VariableReceiverChooser.scala | 17 +-
.../variable/service/VariableServiceImpl.scala | 79 +-
.../linkis/variable/WebApplicationServer.java | 6 +-
.../apache/linkis/variable/dao/VarMapperTest.java | 144 +-
.../apache/linkis/variable/restful/MvcUtils.java | 140 +-
.../restful/api/VariableRestfulApiTest.java | 113 +
.../variable/service/VariableServiceTest.java | 59 +-
.../linkis-publicservice/pom.xml | 170 +-
linkis-public-enhancements/pom.xml | 173 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 239 +-
.../eureka/SpringCloudEurekaApplication.java | 6 +-
.../linkis-gateway-authentication/pom.xml | 180 +-
.../gateway/authentication/dao/TokenDao.java | 10 +-
.../gateway/authentication/entity/TokenEntity.java | 162 +-
.../exception/TokenAuthException.java | 20 +-
.../exception/TokenNotExistException.java | 21 +-
.../linkis/gateway/authentication/bo/Token.scala | 24 +-
.../linkis/gateway/authentication/bo/User.scala | 3 +-
.../gateway/authentication/bo/impl/TokenImpl.scala | 33 +-
.../gateway/authentication/bo/impl/UserImpl.scala | 3 +-
.../authentication/conf/TokenConfiguration.scala | 22 +-
.../service/CachedTokenService.scala | 53 +-
.../authentication/service/TokenService.scala | 5 +-
.../authentication/WebApplicationServer.java | 6 +-
.../gateway/authentication/dao/TokenDaoTest.java | 30 +-
.../service/CachedTokenServiceTest.java | 72 +-
.../linkis-gateway-core/pom.xml | 209 +-
.../gateway/config/GatewayConfiguration.scala | 58 +-
.../config/GatewaySpringConfiguration.scala | 35 +-
.../gateway/exception/GatewayErrorException.scala | 14 +-
.../exception/TooManyServiceException.scala | 8 +-
.../linkis/gateway/http/GatewayContext.scala | 18 +-
.../linkis/gateway/http/GatewayHttpRequest.scala | 13 +-
.../linkis/gateway/http/GatewayHttpResponse.scala | 8 +-
.../apache/linkis/gateway/http/GatewayRoute.scala | 34 +-
.../linkis/gateway/parser/GatewayParser.scala | 76 +-
.../linkis/gateway/route/GatewayRouter.scala | 150 +-
.../linkis/gateway/security/GatewaySSOUtils.scala | 84 +-
.../linkis/gateway/security/LDAPUserRestful.scala | 14 +-
.../linkis/gateway/security/LinkisPreFilter.scala | 13 +-
.../linkis/gateway/security/ProxyUserUtils.scala | 60 +-
.../linkis/gateway/security/SecurityFilter.scala | 143 +-
.../linkis/gateway/security/SecurityHook.scala | 8 +-
.../linkis/gateway/security/UserRestful.scala | 226 +-
.../gateway/security/sso/SSOInterceptor.scala | 52 +-
.../security/token/TokenAuthentication.scala | 48 +-
.../rpc/interceptor/ServiceInstanceUtils.scala | 15 +-
.../linkis/server/security/ServerSSOUtils.scala | 11 +-
.../linkis-gateway-httpclient-support/pom.xml | 109 +-
.../dws/annotation/DWSHttpMessageResult.java | 10 +-
.../linkis/httpclient/dws/DWSHttpClient.scala | 127 +-
.../StaticAuthenticationStrategy.scala | 51 +-
.../TokenAuthenticationStrategy.scala | 61 +-
.../httpclient/dws/config/DWSClientConfig.scala | 68 +-
.../dws/config/DWSClientConfigBuilder.scala | 17 +-
.../dws/config/GatewayHttpClientConf.scala | 6 +-
.../dws/discovery/DWSGatewayDiscovery.scala | 27 +-
.../dws/discovery/DefaultConfigDiscovery.scala | 31 +-
.../exception/AuthenticationFailedException.scala | 8 +-
.../dws/exception/UnknownVersionException.scala | 14 +-
.../dws/request/AbstractAuthenticationAction.scala | 22 +-
.../dws/request/DWSHeartbeatAction.scala | 13 +-
.../httpclient/dws/request/DWSHttpAction.scala | 10 +-
.../linkis/httpclient/dws/request/RestType.scala | 8 +-
.../dws/response/DWSAuthenticationResult.scala | 31 +-
.../dws/response/DWSHeartbeatResult.scala | 19 +-
.../dws/response/DWSHttpMessageFactory.scala | 33 +-
.../linkis/httpclient/dws/response/DWSResult.scala | 45 +-
.../linkis-gateway-server-support/pom.xml | 281 +--
.../parser/EntranceExecutionGatewayParser.scala | 57 +-
.../ujes/parser/EntranceRequestGatewayParser.scala | 44 +-
.../ujes/parser/ResultSetCacheGatewayParser.scala | 91 +-
.../ujes/route/AbstractLabelGatewayRouter.scala | 63 +-
.../ujes/route/DefaultLabelGatewayRouter.scala | 55 +-
.../gateway/ujes/route/EntranceGatewayRouter.scala | 64 +-
.../ujes/route/GatewayRouterConfiguration.scala | 38 +-
.../ujes/route/HaContextGatewayRouter.scala | 93 +-
.../route/contextservice/ContextIdParserImpl.scala | 26 +-
.../ujes/route/label/RouteLabelParser.scala | 25 +-
.../linkis-spring-cloud-gateway/pom.xml | 239 +-
.../springcloud/LinkisGatewayApplication.java | 6 +-
.../http/GatewayAuthorizationFilter.java | 398 ++--
.../springcloud/http/SpringCloudHttpUtils.java | 85 +-
.../SpringCloudGatewayWebsocketFilter.java | 455 ++--
.../websocket/WebSocketServiceConfiguration.java | 18 +-
.../SpringCloudGatewayConfiguration.scala | 158 +-
.../errorcode/GatewayErrorConstants.scala | 10 +-
.../http/LinkisGatewayHttpHeadersFilter.scala | 13 +-
.../http/SpringCloudGatewayHttpRequest.scala | 42 +-
.../http/SpringCloudGatewayHttpResponse.scala | 50 +-
.../SpringCloudGatewayWebSocketSecurityHook.scala | 10 +-
.../SpringCloudGatewayWebsocketUtils.scala | 183 +-
.../websocket/WebsocketGatewayHttpResponse.scala | 9 +-
.../websocket/WebsocketGatewaySession.scala | 201 +-
.../linkis-service-gateway/pom.xml | 40 +-
linkis-spring-cloud-services/pom.xml | 32 +-
linkis-web/pom.xml | 82 -
pom.xml | 2496 ++++++++++----------
scalastyle-config.xml | 731 +++---
tool/code-style-idea.xml | 79 -
tool/dependencies/known-dependencies.txt | 33 +-
tool/modify_license.sh | 8 +-
3170 files changed, 110739 insertions(+), 130992 deletions(-)
diff --git a/.github/workflows/auto-comment.yml b/.github/workflows/auto-comment.yml
index 712fbff74..5673ac7f0 100644
--- a/.github/workflows/auto-comment.yml
+++ b/.github/workflows/auto-comment.yml
@@ -27,7 +27,7 @@ jobs:
WeChat Group:
- 
+ 
Mailing Lists:
|name|description|Subscribe|Unsubscribe|archive|
|:-----|:--------|:------|:-------|:-----|
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
deleted file mode 100644
index 6d28cff60..000000000
--- a/.github/workflows/publish-docker.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: publish-docker
-on:
- create:
- branches:
- - release-**
-jobs:
- publish-docker:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- node-version: [14.17.3]
- timeout-minutes: 90
- env:
- TAG: ${{ github.sha }}
- SKIP_TEST: true
- HUB: ghcr.io/apache/incubator-linkis
- LINKIS_VERSION: 1.3.0
- steps:
- - name: Checkout
- uses: actions/checkout@v2
- - id: commit
- uses: pr-mpt/actions-commit-hash@v1
- - name: Set up JDK 8
- uses: actions/setup-java@v2
- with:
- distribution: 'adopt'
- java-version: 8
- - name: Cache local Maven repository
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- - name: Use Node.js ${{ matrix.node-version }}
- uses: actions/setup-node@v2
- with:
- node-version: ${{ matrix.node-version }}
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
- - name: Build frontend by node.js
- run: |
- cd web
- sed -i "/VUE_APP_MN_CONFIG_PREFIX/d" .env
- npm install
- npm run build
- - name: Build backend by maven
- run: |
- ./mvnw -N install
- - name: Build backend by maven
- run: |
- ./mvnw install -Pdocker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dlinkis.build.web=true -Dimage.build.type=release
- - name: Log in to the Container registry
- uses: docker/login-action@v1.10.0
- with:
- registry: ${{ env.HUB }}
- username: ${{ github.actor }}
- password: ${{ secrets.GITHUB_TOKEN }}
- - name: Push Docker Image
- env:
- DOCKER_VERSION: ${{ github.ref_name }}-${{ steps.commit.outputs.short }}
- run: |
- docker tag linkis:${{ env.LINKIS_VERSION }} ${{ env.HUB }}/library/linkis:${{ env.DOCKER_VERSION }}
- docker push ${{ env.HUB }}/library/linkis:${{ env.DOCKER_VERSION }}
- docker tag linkis-web:${{ env.LINKIS_VERSION }} ${{ env.HUB }}/library/linkis-web:${{ env.DOCKER_VERSION }}
- docker push ${{ env.HUB }}/library/linkis-web:${{ env.DOCKER_VERSION }}
diff --git a/.gitignore b/.gitignore
index 4a5aab9a7..9978b4c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,5 +30,4 @@ target/
# log folder
*.log
-logs/
-nohup.out
\ No newline at end of file
+logs/
\ No newline at end of file
diff --git a/.scalafmt.conf b/.scalafmt.conf
deleted file mode 100644
index 2cfa4b701..000000000
--- a/.scalafmt.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-version = 3.5.8
-runner.dialect = scala211
-align.preset = none
-align.tokens = []
-optIn.configStyleArguments = false
-maxColumn = 98
-
-indent.ctrlSite = 4
-
-docstrings.style = Asterisk
-
-newlines.topLevelStatementBlankLines = [
- { blanks = 1 }
-]
-
-rewrite.rules = [Imports]
-rewrite.imports.sort = scalastyle
-rewrite.imports.groups = [
- ["org\\.apache\\.linkis.*"],
- ["org\\.apache.*"],
- ["org\\.springframework.*"]
- ["javax.*"]
- ["java.*"]
- ["scala.*"]
- ["(?!org\\.apache\\.linkis).*"]
-]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index df448ad85..40d013097 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -123,16 +123,16 @@ git push origin dev-fix dev-fix
### 2.3 Issue submission guidelines
- If you still don’t know how to initiate a PR to an open source project, please refer to [About issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues)
-- Issue name, which should briefly describe your problem or suggestion in one sentence; for the international promotion of the project, please write the issue in English or both Chinese and English
+- Issue name, which should briefly describe your problem or suggestion in one sentence; for the international promotion of the project, please write the issue in English or both Chinese and English.
- For each Issue, please bring at least two labels, component and type, such as component=Computation Governance/EngineConn, type=Improvement. Reference: [issue #590](https://github.com/apache/incubator-linkis/issues/590)
### 2.4 Pull Request(PR) Submission Guidelines
- If you still don’t know how to initiate a PR to an open source project, please refer to [About pull requests](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)
- Whether it is a bug fix or a new feature development, please submit a PR to the dev-* branch
-- PR and submission name follow the principle of `<type>(<scope>): <subject>`, for details, please refer to [Commit message and Change log writing guide](https://linkis.apache.org/community/development-specification/commit-message)
-- If the PR contains new features, the document update should be included in this PR
-- If this PR is not ready to merge, please add [WIP] prefix to the head of the name (WIP = work-in-progress)
+ Whether it is a bug fix or a new feature development, please submit a PR to the dev-* branch.
+- PR and submission name follow the principle of `<type>(<scope>): <subject>`, for details, please refer to Ruan Yifeng's [Commit message and Change log writing guide](http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html) this article.
+- If the PR contains new features, the document update should be included in this PR.
+- If this PR is not ready to merge, please add [WIP] prefix to the head of the name (WIP = work-in-progress).
- All submissions to dev-* branches need to go through at least one review before they can be merged
### 2.5 Review Standard
diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
index 117c4e8f7..f842f4050 100644
--- a/CONTRIBUTING_CN.md
+++ b/CONTRIBUTING_CN.md
@@ -1,8 +1,8 @@
# 如何参与项目贡献
-> 更多信息可以见官网[如何参与项目贡献 ](https://linkis.apache.org/community/how-to-contribute)
+>更多信息可以见官网[如何参与项目贡献](https://linkis.apache.org/community/how-to-contribute)
-非常感谢贡献 Linkis 项目！在参与贡献之前，请仔细阅读以下指引。
+非常感谢贡献Linkis项目！在参与贡献之前，请仔细阅读以下指引。
## 一、贡献范畴
@@ -13,7 +13,7 @@
### 1.2 功能交流、实现、重构
-在交流过程中，详细描述新功能（或重构）的细节、机制和使用场景，能够促使它更好更快地被实现（包括测试用例和代码，及 CI/CD 相关工作）。**如果计划实现一个重大的功能（或重构），请务必通过 Issue 或其他方式与核心开发团队进行沟通**，这样大家能以最效率的方式来推进它。包含 `#feature` 标签的打开的 Issue 都是需要被实现的新功能，包含 `#enhancement` 标签打开的 Issue 都是需要改进重构的功能。
+在交流过程中，详细描述新功能（或重构）的细节、机制和使用场景，能够促使它更好更快地被实现（包括测试用例和代码，及CI/CD相关工作）。**如果计划实现一个重大的功能（或重构），请务必通过 Issue 或其他方式与核心开发团队进行沟通**，这样大家能以最效率的方式来推进它。包含 `#feature` 标签的打开的 Issue 都是需要被实现的新功能，包含 `#enhancement` 标签打开的 Issue 都是需要改进重构的功能。
### 1.3 Issue 答疑
@@ -21,10 +21,10 @@
### 1.4 文档改进
-Linkis 文档位于[Linkis 官网 ](https://linkis.apache.org/zh-CN/docs/latest/introduction/) ，文档的补充完善对于 Linkis 的发展也至关重要。
+Linkis 文档位于[Linkis官网](https://linkis.apache.org/zh-CN/docs/latest/introduction/) ，文档的补充完善对于Linkis 的发展也至关重要。
### 1.5 其他
-包括参与和帮助组织社区交流、社区运营活动等，其他能够帮助 Linkis 项目和社区的活动。
+包括参与和帮助组织社区交流、社区运营活动等，其他能够帮助Linkis 项目和社区的活动。
## 二、贡献流程
@@ -33,32 +33,32 @@ Linkis 文档位于[Linkis 官网 ](https://linkis.apache.org/zh-CN/docs/latest/
Linkis 源码可能会产生一些临时分支，但真正有明确意义的只有以下三个分支：
- master: 最近一次稳定 release 的源码，偶尔会多几次 hotfix 提交；
-- release-*: 稳定的 release 版本；
+- release-*: 稳定的release 版本；
- dev-*: 主要开发分支；
#### 2.1.1 概念
-- Upstream 仓库:https://github.com/apache/incubator-linkis linkis 的 apache 仓库文中称为 Upstream 仓库
-- Fork 仓库: 从 https://github.com/apache/incubator-linkis fork 到自己个人仓库 称为 Fork 仓库
+- Upstream仓库:https://github.com/apache/incubator-linkis linkis的apache仓库文中称为Upstream仓库
+- Fork仓库: 从https://github.com/apache/incubator-linkis fork到自己个人仓库 称为Fork仓库
-#### 2.1.2 同步 Upstream 仓库分支最新代码到自己的 Fork 仓库
+#### 2.1.2 同步Upstream仓库分支最新代码到自己的Fork仓库
- step1 进入用户项目页面,选中要更新的分支
-- step2 点击 code 下载按钮下方的 Fetch upstream,选择 Fetch and merge (如自己的 Fork 仓库 该分支不小心污染了，可以删除该分支后，同步 Upstream 仓库新分支到自己的 Fork 仓库 ，参见指引[同步 Upstream 仓库分支最新代码到自己的 Fork 仓库 ](#213-同步 Upstream 仓库新分支到自己的 Fork 仓库 ))
+- step2 点击code下载按钮下方的Fetch upstream,选择Fetch and merge (如自己的Fork仓库 该分支不小心污染了，可以删除该分支后，同步Upstream仓库新分支到自己的Fork仓库 ，参见指引[同步Upstream仓库分支最新代码到自己的Fork仓库 ](#213-同步Upstream仓库新分支到自己的Fork仓库 ))
-#### 2.1.3 同步 Upstream 仓库新分支到自己的 Fork 仓库
+#### 2.1.3 同步Upstream仓库新分支到自己的Fork仓库
-场景：Upstream 仓库有新增分支，但是 fork 的库没有该分支 (可以选择删除后，重新 fork，但是会丢失未 merge 到原始仓库的变更)
+场景：Upstream仓库有新增分支，但是fork的库没有该分支(可以选择删除后，重新fork，但是会丢失未merge到原始仓库的变更)
-在自己 clone 的本地项目中操作
+在自己clone的本地项目中操作
-- step1 添加 apacheUpstream 仓库镜像到本地
+- step1 添加apacheUpstream仓库镜像到本地
```shell script
git remote add apache git@github.com:apache/incubator-linkis.git
```
-- step2 拉去 apache 镜像信息到本地
+- step2 拉去apache镜像信息到本地
```shell script
git fetch apache
@@ -68,11 +68,11 @@ git fetch apache
```shell script
git checkout -b dev-1.1.4 apache/dev-1.1.4
```
-- step4 把本地分支 push 到自己的仓库,如果自己的仓库没有 dev-1.1.4 分支，则会创建 dev-1.1.4 分支
+- step4 把本地分支push到自己的仓库,如果自己的仓库没有dev-1.1.4分支，则会创建dev-1.1.4分支
```shell script
git push origin dev-1.1.4:dev-1.1.4
```
-- step5 删除 upstream 的分支
+- step5 删除upstream的分支
```shell script
git remote remove apache
```
@@ -81,61 +81,61 @@ git remote remove apache
git pull
```
-#### 2.1.4 一个 pr 的流程
+#### 2.1.4 一个pr的流程
-- step1 确认当前开发的基础分支（一般是当前进行的中版本，如当前社区开发中的版本 1.1.0，那么分支就是 dev-1.1.0，不确定的话可以在社区群里问下或则在 issue 中@相关同学）
+- step1 确认当前开发的基础分支（一般是当前进行的中版本，如当前社区开发中的版本1.1.0，那么分支就是dev-1.1.0，不确定的话可以在社区群里问下或则在issue中@相关同学）
-- step2 同步 Upstream 仓库分支最新代码到自己的 Fork 仓库 分支,参见指引 [2.1.2 同步 Upstream 仓库分支最新代码到自己的 Fork 仓库 ]
+- step2 同步Upstream仓库分支最新代码到自己的Fork仓库 分支,参见指引 [2.1.2 同步Upstream仓库分支最新代码到自己的Fork仓库 ]
-- step3 基于开发分支，拉取新 fix/feature 分支 (不要直接在原分支上修改，如果后续 pr 以 squash 方式 merge 后，提交的 commit 记录会被合并成一个)
+- step3 基于开发分支，拉取新fix/feature分支(不要直接在原分支上修改，如果后续pr以squash方式merge后，提交的commit记录会被合并成一个)
```shell script
git checkout -b dev-1.1.4-fix dev-1.1.4
git push origin dev-1.1.4-fix:dev-1.1.4-fix
```
- step4 进行开发
-- step5 提交 pr(如果是正在进行中,开发还未完全结束，请在 pr 标题上加上 WIP 标识 如 `[WIP] Dev 1.1.1 Add junit test code for [linkis-common] ` ;关联对应的 issue 等)
+- step5 提交pr(如果是正在进行中,开发还未完全结束，请在pr标题上加上WIP标识 如 `[WIP] Dev 1.1.1 Add junit test code for [linkis-common] ` ;关联对应的issue等)
- step6 等待被合并
-- step7 删除 fix/future 分支 (可以在 github 页面上进行操作)
+- step7 删除fix/future分支(可以在github页面上进行操作)
```shell script
git branch -d dev-1.1.4-fix
git push
```
-请注意：大特性的 dev 分支，在命名时除了版本号，还会加上相应的命名说明，如：dev-0.10.0-flink，指 0.10.0 的 flink 特性开发分支。
+请注意：大特性的dev分支，在命名时除了版本号，还会加上相应的命名说明，如：dev-0.10.0-flink，指0.10.0的flink特性开发分支。
### 2.2 开发指引
Linkis 前后端代码共用同一个代码库，但在开发上是分离的。在着手开发之前，请先将 Linkis 项目 fork 一份到自己的 Github Repositories 中， 开发时请基于自己 Github Repositories 中的 Linkis 代码库进行开发。
-我们建议克隆 dev 分支命名为 dev-fix 来开发,同时在自己仓库新建 dev-fix 分支，直接在原分支上修改，如果后续 pr 以 squash 方式 merge 后，提交的 commit 记录会被合并成一个
+我们建议克隆dev分支命名为dev-fix来开发,同时在自己仓库新建dev-fix分支，直接在原分支上修改，如果后续pr以squash方式merge后，提交的commit记录会被合并成一个
```shell script
#拉取分支
git clone https://github.com/{githubid}/incubator-linkis.git --branch dev
-#根据 dev 生成本地 dev-fix 分支
+#根据dev生成本地dev-fix分支
git checkout -b dev-fix dev
-#把本地 dev-fix 分支推到自己的仓库
+#把本地dev-fix分支推到自己的仓库
git push origin dev-fix dev-fix
```
### 2.3 Issue 提交指引
- 如果您还不知道怎样向开源项目发起 PR，请参考[About issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues)
-- Issue 名称，应一句话简单描述您的问题或建议；为了项目的国际化推广，请用英文，或中英文双语书写 issue
-- 每个 Issue，请至少带上 component 和 type 两个 label，如 component=Computation Governance/EngineConn，type=Improvement.参考:[issue #590](https://github.com/apache/incubator-linkis/issues/590)
+- Issue 名称，应一句话简单描述您的问题或建议；为了项目的国际化推广，请用英文，或中英文双语书写 issue.
+- 每个Issue，请至少带上component 和type 两个label，如component=Computation Governance/EngineConn，type=Improvement.参考:[issue #590](https://github.com/apache/incubator-linkis/issues/590)
### 2.4 Pull Request(PR) 提交指引
- 如果您还不知道怎样向开源项目发起 PR，请参考[About pull requests](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)
-- 无论是 Bug 修复，还是新功能开发，请将 PR 提交到 dev-* 分支
-- PR 和提交名称遵循 `<type>(<scope>): <subject>` 原则，详情可以参考[Commit message 和 Change log 编写指南 ](https://linkis.apache.org/zh-CN/community/development-specification/commit-message)
-- 如果 PR 中包含新功能，理应将文档更新包含在本次 PR 中
-- 如果本次 PR 尚未准备好合并，请在名称头部加上 [WIP] 前缀（WIP = work-in-progress）
+- 无论是 Bug 修复，还是新功能开发，请将 PR 提交到 dev-* 分支。
+- PR 和提交名称遵循 `<type>(<scope>): <subject>` 原则，详情可以参考阮一峰的 [Commit message 和 Change log 编写指南](http://www.ruanyifeng.com/blog/2016/01/commit_message_change_log.html) 这篇文章。
+- 如果 PR 中包含新功能，理应将文档更新包含在本次 PR 中。
+- 如果本次 PR 尚未准备好合并，请在名称头部加上 [WIP] 前缀（WIP = work-in-progress）。
- 所有提交到 dev-* 分支的提交至少需要经过一次 Review 才可以被合并
### 2.5 Review 标准
-在贡献代码之前，可以了解一下什么样的提交在 Review 中是受欢迎的。简单来说，如果一项提交能带来尽可能多增益和尽可能少的副作用或风险，那它被合并的几率就越高，Review 的速度也会越快。风险大、价值低地提交是几乎不可能被合并的，并且有可能会被拒绝 Review。
+在贡献代码之前，可以了解一下什么样的提交在 Review 中是受欢迎的。简单来说，如果一项提交能带来尽可能多增益和尽可能少的副作用或风险，那它被合并的几率就越高，Review 的速度也会越快。风险大、价值低的提交是几乎不可能被合并的，并且有可能会被拒绝 Review。
#### 2.5.1 增益
@@ -151,7 +151,7 @@ git push origin dev-fix dev-fix
- 仅仅修复 Bug 的表面现象
- 引入复杂度高的新功能
- 为满足小众需求添加复杂度
-- 改动稳定的现有 API 或语义
+- 改动稳定的现有API或语义
- 导致其他功能不能正常运行
- 添加大量依赖
- 随意改变依赖版本
@@ -171,11 +171,11 @@ git push origin dev-fix dev-fix
#### 3.1.1 如何成为 Committer
-如果您对 Linkis 提过颇具价值的 PR 并且被合并，或是连续贡献超过半年，且至少主导过一次版本的发布，您可以通过官方微信群找到 Linkis 项目的一个 PMC ，如果他愿意提名您为 committer，并愿意为您陈述您的贡献给所有 PMC 和 Committer，那么接下来会发起一次投票；PMC 和其他 Committers 将会一起投票决定是否允许您的加入，如果得到足够票数，您将成为 Linkis 项目的 Committer。
+如果您对 Linkis 提过颇具价值的 PR 并且被合并，或是连续贡献超过半年，且至少主导过一次版本的发布，您可以通过官方微信群找到Linkis项目的一个 PMC ，如果他愿意提名您为 committer，并愿意为您陈述您的贡献给所有 PMC和Committer，那么接下来会发起一次投票；PMC和其他 Committers 将会一起投票决定是否允许您的加入，如果得到足够票数，您将成为 Linkis 项目的 Committer。
#### 3.1.2 Committer 的权利
-- 可以加入官方开发者微信群，参与讨论和制定 Linkis 开发计划
+- 可以加入官方开发者微信群，参与讨论和制定Linkis开发计划
- 可以对 Issue 进行管理，包括关闭、添加标签
- 可以创建和管理项目分支，master、dev-* 分支除外
- 可以对提交到 dev-* 分支的 PR 进行 Review
@@ -190,5 +190,5 @@ git push origin dev-fix dev-fix
#### 3.2.2 Committee 成员的权利
- 可以合并其他 Committers 和贡献者提交到 dev-** 分支的 PR
-- 可以参与决定 Linkis 项目的 roadmap 和发展方向
+- 可以参与决定Linkis项目的roadmap和发展方向
- 可以参与新版本发布
diff --git a/README.md b/README.md
index 923cece4f..4971b036b 100644
--- a/README.md
+++ b/README.md
@@ -1,59 +1,10 @@
-<h2 align="center">
- Apache Linkis
-</h2>
-
-<p align="center">
- <strong>Linkis builds a computation middleware layer to decouple the upper applications and the underlying data engines,
- provides standardized interfaces (REST, JDBC, WebSocket etc.) to easily connect to various underlying engines (Spark, Presto, Flink, etc.),
- while enables cross engine context sharing, unified job& engine governance and orchestration.</strong>
-</p>
-<p align="center">
- <a href="https://linkis.apache.org/">https://linkis.apache.org/</a>
-</p>
-
-<p align="center">
- <a href="https://linkis.apache.org/docs/latest/introduction/" >
- <img src="https://img.shields.io/badge/document-English-blue.svg" alt="EN docs" />
- </a>
- <a href="https://linkis.apache.org/zh-CN/docs/latest/introduction/">
- <img src="https://img.shields.io/badge/文档-简体中文-blue.svg" alt="简体中文文档" />
- </a>
-</p>
-
-<p align="center">
- <a target="_blank" href="https://search.maven.org/search?q=g:org.apache.linkis%20AND%20a:linkis">
- <img src="https://img.shields.io/maven-central/v/org.apache.linkis/linkis.svg?label=maven%20central" />
- </a>
- <a target="_blank" href="https://github.com/apache/incubator-linkis/blob/master/LICENSE">
- <img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license" />
- </a>
- <a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
- <img src="https://img.shields.io/badge/JDK-8-green.svg" />
- </a>
- <a target="_blank" href="https://github.com/apache/incubator-linkis/actions">
- <img src="https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg" />
- </a>
-
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img src="https://img.shields.io/github/forks/apache/incubator-linkis.svg" alt="github forks"/>
- </a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img src="https://img.shields.io/github/stars/apache/incubator-linkis.svg" alt="github stars"/>
- </a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg" alt="github contributors"/>
- </a>
- <a target="_blank" href="https://codecov.io/gh/apache/incubator-linkis">
- <img src="https://codecov.io/gh/apache/incubator-linkis/branch/master/graph/badge.svg" />
- </a>
- <a target="_blank" href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
- <img src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
- </a>
-
-</p>
-<br/>
-
----
+Linkis
+==========
+
+[](https://www.apache.org/licenses/LICENSE-2.0.html)
+[](https://codecov.io/gh/apache/incubator-linkis/branch/master)
+[](https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT "Get your own page views count badge on badges.toozhao.com")
+
[English](README.md) | [中文](README_CN.md)
# Introduction
@@ -71,20 +22,20 @@ Since the first release of Linkis in 2019, it has accumulated more than **700**
# Features
-- **Support for diverse underlying computation storage engines**
- - Currently supported computation/storage engines: Spark、Hive、Flink、Python、Pipeline、Sqoop、openLooKeng、Presto、ElasticSearch、JDBC, Shell, etc
- - Computation/storage engines to be supported: Trino (planned 1.3.1), SeaTunnel (planned 1.3.1), etc
- - Supported scripting languages: SparkSQL、HiveQL、Python、Shell、Pyspark、R、Scala and JDBC, etc
+- **Support for diverse underlying computation storage engines**.
+ Currently supported computation/storage engines: Spark, Hive, Flink, Python, Pipeline, Sqoop, openLooKeng, JDBC, Shell, etc.
+ Computation/storage engines to be supported: Presto (planned 1.2.0), ElasticSearch (planned 1.2.0), etc.
+ Supported scripting languages: SparkSQL, HiveQL, Python, Shell, Pyspark, R, Scala and JDBC, etc.
-- **Powerful task/request governance capabilities** With services such as Orchestrator, Label Manager and customized Spring Cloud Gateway, Linkis is able to provide multi-level labels based, cross-cluster/cross-IDC fine-grained routing, load balance, multi-tenancy, traffic control, resource control, and orchestration strategies like dual-active, active-standby, etc
+- **Powerful task/request governance capabilities**. With services such as Orchestrator, Label Manager and customized Spring Cloud Gateway, Linkis is able to provide multi-level labels based, cross-cluster/cross-IDC fine-grained routing, load balance, multi-tenancy, traffic control, resource control, and orchestration strategies like dual-active, active-standby, etc.
-- **Support full stack computation/storage engine** As a computation middleware, it will receive, execute and manage tasks and requests for various computation storage engines, including batch tasks, interactive query tasks, real-time streaming tasks and storage tasks
+- **Support full stack computation/storage engine**. As a computation middleware, it will receive, execute and manage tasks and requests for various computation storage engines, including batch tasks, interactive query tasks, real-time streaming tasks and storage tasks;
-- **Resource management capabilities** ResourceManager is not only capable of managing resources for Yarn and Linkis EngineManger, but also able to provide label-based multi-level resource allocation and recycling, allowing itself to have powerful resource management capabilities across mutiple Yarn clusters and mutiple computation resource types
+- **Resource management capabilities**. ResourceManager is not only capable of managing resources for Yarn and Linkis EngineManger, but also able to provide label-based multi-level resource allocation and recycling, allowing itself to have powerful resource management capabilities across mutiple Yarn clusters and mutiple computation resource types;
-- **Unified Context Service** Generate Context ID for each task/request, associate and manage user and system resource files (JAR, ZIP, Properties, etc.), result set, parameter variable, function, etc., across user, system, and computing engine. Set in one place, automatic reference everywhere
+- **Unified Context Service**. Generate Context ID for each task/request, associate and manage user and system resource files (JAR, ZIP, Properties, etc.), result set, parameter variable, function, etc., across user, system, and computing engine. Set in one place, automatic reference everywhere;
-- **Unified materials** System and user-level unified material management, which can be shared and transferred across users and systems
+- **Unified materials**. System and user-level unified material management, which can be shared and transferred across users and systems.
# Supported Engine Types
@@ -99,9 +50,9 @@ Since the first release of Linkis in 2019, it has accumulated more than **700**
|Pipeline|-|\>=1.0.3|No|Pipeline EngineConn, supports file import and export|
|openLooKeng|openLooKeng >= 1.5.0, <br/>(default openLookEng 1.5.0)|\>=1.1.1|No|openLooKeng EngineConn, supports querying data virtualization engine with Sql openLooKeng|
|Sqoop| Sqoop >= 1.4.6, <br/>(default Apache Sqoop 1.4.6)|\>=1.1.2|No|Sqoop EngineConn, support data migration tool Sqoop engine|
-|Presto|Presto >= 0.180|\>=1.2.0|-|Presto EngineConn, supports Presto SQL code|
-|ElasticSearch|ElasticSearch >=6.0|\>=1.2.0|-|ElasticSearch EngineConn, supports SQL and DSL code|
|Impala|Impala >= 3.2.0, CDH >=6.3.0|ongoing|-|Impala EngineConn, supports Impala SQL code|
+|Presto|Presto >= 0.180|ongoing|-|Presto EngineConn, supports Presto SQL code|
+|ElasticSearch|ElasticSearch >=6.0|ongoing|-|ElasticSearch EngineConn, supports SQL and DSL code|
|MLSQL| MLSQL >=1.1.0|ongoing|-|MLSQL EngineConn, supports MLSQL code.|
|Hadoop|Apache >=2.6.0, <br/>CDH >=5.4.0|ongoing|-|Hadoop EngineConn, supports Hadoop MR/YARN application|
|TiSpark|1.1|ongoing|-|TiSpark EngineConn, supports querying TiDB with SparkSQL|
@@ -111,14 +62,14 @@ Since the first release of Linkis in 2019, it has accumulated more than **700**
| Component | Description | Linkis 1.x(recommend 1.1.1) Compatible |
| --------------- | -------------------------------------------------------------------- | --------- |
-| [**DataSphereStudio**](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/README.md) | DataSphere Studio (DSS for short) is WeDataSphere, a one-stop data application development management portal | **DSS 1.0.1[released][Linkis recommend 1.1.1]** |
-| [**Scriptis**](https://github.com/WeBankFinTech/Scriptis) | Support online script writing such as SQL, Pyspark, HiveQL, etc., submit to [Linkis](https://github.com/apache/incubator-linkis) to perform data analysis web tools | **In DSS 1.0.1[released]** |
-| [**Schedulis**](https://github.com/WeBankFinTech/Schedulis) | Workflow task scheduling system based on Azkaban secondary development, with financial-grade features such as high performance, high availability and multi-tenant resource isolation | **Schedulis0.6.2 [released]** |
+| [**DataSphereStudio**](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/README.md) | DataSphere Studio (DSS for short) is WeDataSphere, a one-stop data application development management portal. | **DSS 1.0.1[released][Linkis recommend 1.1.1]** |
+| [**Scriptis**](https://github.com/WeBankFinTech/Scriptis) | Support online script writing such as SQL, Pyspark, HiveQL, etc., submit to [Linkis](https://github.com/apache/incubator-linkis) to perform data analysis web tools. | **In DSS 1.0.1[released]** |
+| [**Schedulis**](https://github.com/WeBankFinTech/Schedulis) | Workflow task scheduling system based on Azkaban secondary development, with financial-grade features such as high performance, high availability and multi-tenant resource isolation. | **Schedulis0.6.2 [released]** |
| [**Qualitis**](https://github.com/WeBankFinTech/Qualitis) | Data quality verification tool, providing data verification capabilities such as data integrity and correctness |**Qualitis 0.9.1 [released]** |
-| [**Streamis**](https://github.com/WeBankFinTech/Streamis) | Streaming application development management tool. It supports the release of Flink Jar and Flink SQL, and provides the development, debugging and production management capabilities of streaming applications, such as: start-stop, status monitoring, checkpoint, etc| **Streamis 0.1.0 [released][Linkis recommend 1.1.0]** |
+| [**Streamis**](https://github.com/WeBankFinTech/Streamis) | Streaming application development management tool. It supports the release of Flink Jar and Flink SQL, and provides the development, debugging and production management capabilities of streaming applications, such as: start-stop, status monitoring, checkpoint, etc.| **Streamis 0.1.0 [released][Linkis recommend 1.1.0]** |
| [**Exchangis**](https://github.com/WeBankFinTech/Exchangis) | A data exchange platform that supports data transmission between structured and unstructured heterogeneous data sources, the upcoming Exchangis1. 0, will be connected with DSS workflow | **Exchangis 1.0.0 [developing]**|
-| [**Visualis**](https://github.com/WeBankFinTech/Visualis) | A data visualization BI tool based on the second development of Davinci, an open source project of CreditEase, provides users with financial-level data visualization capabilities in terms of data security | **Visualis 1.0.0[developing]**|
-| [**Prophecis**](https://github.com/WeBankFinTech/Prophecis) | A one-stop machine learning platform that integrates multiple open source machine learning frameworks. Prophecis' MLFlow can be connected to DSS workflow through AppConn | **Prophecis 0.3.0 [released]** |
+| [**Visualis**](https://github.com/WeBankFinTech/Visualis) | A data visualization BI tool based on the second development of Davinci, an open source project of CreditEase, provides users with financial-level data visualization capabilities in terms of data security. | **Visualis 1.0.0[developing]**|
+| [**Prophecis**](https://github.com/WeBankFinTech/Prophecis) | A one-stop machine learning platform that integrates multiple open source machine learning frameworks. Prophecis' MLFlow can be connected to DSS workflow through AppConn. | **Prophecis 0.3.0 [released]** |
# Download
@@ -127,24 +78,14 @@ Please go to the [Linkis Releases Page](https://linkis.apache.org/download/main)
# Compile and Deploy
> For more detailed guidance see:
->[[Backend Compile]](https://linkis.apache.org/zh-CN/docs/latest/development/linkis-compile-and-package)
->[[Management Console Build]](https://linkis.apache.org/zh-CN/docs/latest/development/web-build)
+>[[Compile]](https://linkis.apache.org/docs/latest/development/linkis-compile-and-package)
```shell
## compile backend
### Mac OS/Linux
-# 1. When compiling for the first time, execute the following command first
./mvnw -N install
-# 2. make the linkis distribution package
-# - Option 1: make the linkis distribution package only
-./mvnw clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
-# - Option 2: make the linkis distribution package and docker image
-./mvnw clean install -Pdocker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
-# - Option 3: linkis distribution package and docker image (included web)
-./mvnw clean install -Pdocker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dlinkis.build.web=true
-# - Option 4: linkis distribution package and docker image (included web and ldh (hadoop all in one for test))
-./mvnw clean install -Pdocker -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -Dlinkis.build.web=true -Dlinkis.build.ldh=true
+./mvnw clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
### Windows
@@ -152,7 +93,7 @@ mvnw.cmd -N install
mvnw.cmd clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
## compile web
-cd incubator-linkis/linkis-web
+cd incubator-linkis/web
npm install
npm run build
```
@@ -160,20 +101,20 @@ npm run build
Please refer to [Quick Deployment](https://linkis.apache.org/docs/latest/deployment/quick-deploy) to do the deployment.
# Examples and Guidance
-- [User Manual](https://linkis.apache.org/docs/latest/user-guide/overview)
-- [Engine Usage Documents](https://linkis.apache.org/docs/latest/engine-usage/overview)
+- [User Manual](https://linkis.apache.org/docs/latest/user_guide/overview)
+- [Engine Usage Documents](https://linkis.apache.org/docs/latest/engine_usage/overview)
- [API Documents](https://linkis.apache.org/docs/latest/api/overview)
# Documentation & Vedio
-- The documentation of linkis is in [Linkis-Website Git Repository](https://github.com/apache/incubator-linkis-website)
-- Meetup videos on [Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656)
+- The documentation of linkis is in [Linkis-Website Git Repository](https://github.com/apache/incubator-linkis-website).
+- Meetup videos on [Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656).
# Architecture
-Linkis services could be divided into three categories: computation governance services, public enhancement services and microservice governance services
-- The computation governance services, support the 3 major stages of processing a task/request: submission -> preparation -> execution
-- The public enhancement services, including the material library service, context service, and data source service
-- The microservice governance services, including Spring Cloud Gateway, Eureka and Open Feign
+Linkis services could be divided into three categories: computation governance services, public enhancement services and microservice governance services.
+- The computation governance services, support the 3 major stages of processing a task/request: submission -> preparation -> execution;
+- The public enhancement services, including the material library service, context service, and data source service;
+- The microservice governance services, including Spring Cloud Gateway, Eureka and Open Feign.
Below is the Linkis architecture diagram. You can find more detailed architecture docs in [Linkis-Doc/Architecture](https://linkis.apache.org/docs/latest/architecture/overview).
@@ -192,9 +133,9 @@ For code and documentation contributions, please follow the [contribution guide]
- Any questions or suggestions please kindly submit an [issue](https://github.com/apache/incubator-linkis/issues).
- By mail [dev@linkis.apache.org](mailto:dev@linkis.apache.org)
-- You can scan the QR code below to join our WeChat group to get more immediate response
+- You can scan the QR code below to join our WeChat group to get more immediate response.
-
+
diff --git a/README_CN.md b/README_CN.md
index fd721dc93..13896e65f 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,130 +1,77 @@
-<h2 align="center">
- Apache Linkis
-</h2>
-
-<p align="center">
- <strong>Linkis 在上层应用和底层引擎之间构建了一层计算中间件。通过使用Linkis 提供的REST/WebSocket/JDBC 等标准接口，
- 上层应用可以方便地连接访问Spark, Presto, Flink 等底层引擎,同时实现跨引擎上下文共享、统一的计算任务和引擎治理与编排能力</strong>
-</p>
-<p align="center">
- <a href="https://linkis.apache.org/">https://linkis.apache.org/</a>
-</p>
-
-<p align="center">
- <a href="https://linkis.apache.org/docs/latest/introduction/" >
- <img src="https://img.shields.io/badge/document-English-blue.svg" alt="EN docs" />
- </a>
- <a href="https://linkis.apache.org/zh-CN/docs/latest/introduction/">
- <img src="https://img.shields.io/badge/文档-简体中文-blue.svg" alt="简体中文文档" />
- </a>
-</p>
-
-<p align="center">
- <a target="_blank" href="https://search.maven.org/search?q=g:org.apache.linkis%20AND%20a:linkis">
- <img src="https://img.shields.io/maven-central/v/org.apache.linkis/linkis.svg?label=maven%20central" />
- </a>
- <a target="_blank" href="https://github.com/apache/incubator-linkis/blob/master/LICENSE">
- <img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license" />
- </a>
- <a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
- <img src="https://img.shields.io/badge/JDK-8-green.svg" />
- </a>
- <a target="_blank" href="https://github.com/apache/incubator-linkis/actions">
- <img src="https://github.com/apache/incubator-linkis/actions/workflows/build.yml/badge.svg" />
- </a>
-
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img src="https://img.shields.io/github/forks/apache/incubator-linkis.svg" alt="github forks"/>
- </a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img src="https://img.shields.io/github/stars/apache/incubator-linkis.svg" alt="github stars"/>
- </a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg" alt="github contributors"/>
- </a>
- <a target="_blank" href="https://codecov.io/gh/apache/incubator-linkis">
- <img src="https://codecov.io/gh/apache/incubator-linkis/branch/master/graph/badge.svg" />
- </a>
- <a target="_blank" href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
- <img src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
- </a>
-
-</p>
-<br/>
-
----
-[English](README.md) | [中文 ](README_CN.md)
+Linkis
+============
+
+[](https://www.apache.org/licenses/LICENSE-2.0.html)
+[](https://codecov.io/gh/apache/incubator-linkis/branch/master)
+[](https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT "Get your own page views count badge on badges.toozhao.com")
+
+[English](README.md) | [中文](README_CN.md)
# 介绍
-Linkis 在上层应用程序和底层引擎之间构建了一层计算中间件。通过使用 Linkis 提供的 REST/WebSocket/JDBC 等标准接口，
-上层应用可以方便地连接访问 MySQL/Spark/Hive/Presto/Flink 等底层引擎，同时实现变量、脚本、函数和资源文件等用户资源的跨上层应用互通。
-作为计算中间件，Linkis 提供了强大的连通、复用、编排、扩展和治理管控能力。通过计算中间件将应用层和引擎层解耦，简化了复杂的网络调用关系，
-降低了整体复杂度，同时节约了整体开发和维护成本。
-Linkis 自 2019 年开源发布以来，已累计积累了 700 多家试验企业和 1000+沙盒试验用户，涉及金融、电信、制造、互联网等多个行业。
-许多公司已经将 Linkis 作为大数据平台底层计算存储引擎的统一入口，和计算请求/任务的治理管控利器。
+Linkis 在上层应用程序和底层引擎之间构建了一层计算中间件。通过使用Linkis 提供的REST/WebSocket/JDBC 等标准接口，上层应用可以方便地连接访问MySQL/Spark/Hive/Presto/Flink 等底层引擎，同时实现变量、脚本、函数和资源文件等用户资源的跨上层应用互通。
+作为计算中间件，Linkis 提供了强大的连通、复用、编排、扩展和治理管控能力。通过计算中间件将应用层和引擎层解耦，简化了复杂的网络调用关系，降低了整体复杂度，同时节约了整体开发和维护成本。
+Linkis 自2019年开源发布以来，已累计积累了700多家试验企业和1000+沙盒试验用户，涉及金融、电信、制造、互联网等多个行业。许多公司已经将Linkis 作为大数据平台底层计算存储引擎的统一入口，和计算请求/任务的治理管控利器。
-
+
-
+
-## 核心特点
-- **丰富的底层计算存储引擎支持**
- - **目前支持的计算存储引擎** Spark、Hive、Flink、Python、Pipeline、Sqoop、openLooKeng、Presto、ElasticSearch、JDBC 和 Shell 等
- - **正在支持中的计算存储引擎** Trino(计划 1.3.1)、SeaTunnel(计划 1.3.1) 等
- - **支持的脚本语言** SparkSQL、HiveQL、Python、Shell、Pyspark、R、Scala 和 JDBC 等
-- **强大的计算治理能力** 基于 Orchestrator、Label Manager 和定制的 Spring Cloud Gateway 等服务，Linkis 能够提供基于多级标签的跨集群/跨 IDC 细粒度路由、负载均衡、多租户、流量控制、资源控制和编排策略 (如双活、主备等) 支持能力
-- **全栈计算存储引擎架构支持** 能够接收、执行和管理针对各种计算存储引擎的任务和请求，包括离线批量任务、交互式查询任务、实时流式任务和存储型任务
-- **资源管理能力** ResourceManager 不仅具备对 Yarn 和 Linkis EngineManager 的资源管理能力，还将提供基于标签的多级资源分配和回收能力，让 ResourceManager 具备跨集群、跨计算资源类型的强大资源管理能力
-- **统一上下文服务** 为每个计算任务生成 context id，跨用户、系统、计算引擎的关联管理用户和系统资源文件（JAR、ZIP、Properties 等），结果集，参数变量，函数等，一处设置，处处自动引用
-- **统一物料** 系统和用户级物料管理，可分享和流转，跨用户、系统共享物料
-- **统一数据源管理** 提供了 hive、es、mysql、kafka 类型数据源的增删查改、版本控制、连接测试等功能
-- **数据源对应的元数据查询** 提供了 hive、es、mysql、kafka 元数据的数据库、表、分区查询
+# 核心特点
+
+- **丰富的底层计算存储引擎支持**。
+ **目前支持的计算存储引擎**：Spark、Hive、Python、Presto、ElasticSearch、MLSQL、TiSpark、JDBC和Shell等。
+ **正在支持中的计算存储引擎**：Flink(>=1.0.2版本已支持)、Impala等。
+ **支持的脚本语言**：SparkSQL, HiveQL, Python, Shell, Pyspark, R, Scala 和JDBC 等。
+- **强大的计算治理能力**。基于Orchestrator、Label Manager和定制的Spring Cloud Gateway等服务，Linkis能够提供基于多级标签的跨集群/跨IDC 细粒度路由、负载均衡、多租户、流量控制、资源控制和编排策略(如双活、主备等)支持能力。
+- **全栈计算存储引擎架构支持**。能够接收、执行和管理针对各种计算存储引擎的任务和请求，包括离线批量任务、交互式查询任务、实时流式任务和存储型任务；
+- **资源管理能力**。 ResourceManager 具备对 Yarn 和 Linkis EngineManager 的资源管理能力，还将提供基于标签的多级资源分配和回收能力，让 ResourceManager 具备跨集群、跨计算资源类型的强大资源管理能力。
+- **统一上下文服务**。为每个计算任务生成context id，跨用户、系统、计算引擎的关联管理用户和系统资源文件（JAR、ZIP、Properties等），结果集，参数变量，函数等，一处设置，处处自动引用；
+- **统一物料**。系统和用户级物料管理，可分享和流转，跨用户、系统共享物料。
# 支持的引擎类型
-| **引擎名** | **支持底层组件版本 <br/>(默认依赖版本)** | **Linkis 版本要求** | **是否默认包含在发布包中** | **说明** |
+| **引擎名** | **支持底层组件版本<br/>(默认依赖版本)** | **Linkis 版本要求** | **是否默认包含在发布包中** | **说明** |
|:---- |:---- |:---- |:---- |:---- |
-|Spark|Apache 2.0.0~2.4.7, <br/>CDH >= 5.4.0, <br/>（默认 Apache Spark 2.4.3）|\>=1.0.3|是|Spark EngineConn， 支持 SQL, Scala, Pyspark 和 R 代码|
-|Hive|Apache >= 1.0.0, <br/>CDH >= 5.4.0, <br/>（默认 Apache Hive 2.3.3）|\>=1.0.3|是|Hive EngineConn， 支持 HiveQL 代码|
-|Python|Python >= 2.6, <br/>（默认 Python2*）|\>=1.0.3|是|Python EngineConn， 支持 python 代码|
-|Shell|Bash >= 2.0|\>=1.0.3|是|Shell EngineConn， 支持 Bash shell 代码|
-|JDBC|MySQL >= 5.0, Hive >=1.2.1, <br/>(默认 Hive-jdbc 2.3.4)|\>=1.0.3|否|JDBC EngineConn， 已支持 MySQL 和 HiveQL，可快速扩展支持其他有 JDBC Driver 包的引擎, 如 Oracle|
-|Flink |Flink >= 1.12.2, <br/>(默认 Apache Flink 1.12.2)|\>=1.0.3|否|Flink EngineConn， 支持 FlinkSQL 代码，也支持以 Flink Jar 形式启动一个新的 Yarn 应用程序|
+|Spark|Apache 2.0.0~2.4.7, <br/>CDH >= 5.4.0, <br/>（默认Apache Spark 2.4.3）|\>=1.0.3|是|Spark EngineConn， 支持SQL, Scala, Pyspark 和R 代码|
+|Hive|Apache >= 1.0.0, <br/>CDH >= 5.4.0, <br/>（默认Apache Hive 2.3.3）|\>=1.0.3|是|Hive EngineConn， 支持HiveQL 代码|
+|Python|Python >= 2.6, <br/>（默认Python2*）|\>=1.0.3|是|Python EngineConn， 支持python 代码|
+|Shell|Bash >= 2.0|\>=1.0.3|是|Shell EngineConn， 支持Bash shell 代码|
+|JDBC|MySQL >= 5.0, Hive >=1.2.1, <br/>(默认Hive-jdbc 2.3.4)|\>=1.0.3|否|JDBC EngineConn， 已支持MySQL 和HiveQL，可快速扩展支持其他有JDBC Driver 包的引擎, 如Oracle|
+|Flink |Flink >= 1.12.2, <br/>(默认Apache Flink 1.12.2)|\>=1.0.3|否|Flink EngineConn， 支持FlinkSQL 代码，也支持以Flink Jar 形式启动一个新的Yarn 应用程序|
|Pipeline|-|\>=1.0.3|否|Pipeline EngineConn， 支持文件的导入和导出|
-|openLooKeng|openLooKeng >= 1.5.0, <br/>(默认 openLookEng 1.5.0)|\>=1.1.1|否|openLooKeng EngineConn， 支持用 Sql 查询数据虚拟化引擎 openLooKeng|
-|Sqoop| Sqoop >= 1.4.6, <br/>(默认 Apache Sqoop 1.4.6)|\>=1.1.2|否|Sqoop EngineConn， 支持 数据迁移工具 Sqoop 引擎|
-|Presto|Presto >= 0.180|\>=1.2.0|否|Presto EngineConn， 支持 Presto SQL 代码|
-|ElasticSearch|ElasticSearch >=6.0|\>=1.2.0|否|ElasticSearch EngineConn， 支持 SQL 和 DSL 代码|
-|Impala|Impala >= 3.2.0, CDH >=6.3.0|ongoing|-|Impala EngineConn，支持 Impala SQL 代码|
-|MLSQL| MLSQL >=1.1.0|ongoing|-|MLSQL EngineConn， 支持 MLSQL 代码.|
-|Hadoop|Apache >=2.6.0, <br/>CDH >=5.4.0|ongoing|-|Hadoop EngineConn， 支持 Hadoop MR/YARN application|
-|TiSpark|1.1|ongoing|-|TiSpark EngineConn， 支持用 SparkSQL 查询 TiDB|
-
+|openLooKeng|openLooKeng >= 1.5.0, <br/>(默认openLookEng 1.5.0)|\>=1.1.1|否|openLooKeng EngineConn， 支持用Sql查询数据虚拟化引擎openLooKeng|
+|Sqoop| Sqoop >= 1.4.6, <br/>(默认Apache Sqoop 1.4.6)|\>=1.1.2|否|Sqoop EngineConn， 支持 数据迁移工具 Sqoop 引擎|
+|Impala|Impala >= 3.2.0, CDH >=6.3.0|ongoing|-|Impala EngineConn，支持Impala SQL 代码|
+|Presto|Presto >= 0.180|ongoing|-|Presto EngineConn， 支持Presto SQL 代码|
+|ElasticSearch|ElasticSearch >=6.0|ongoing|-|ElasticSearch EngineConn， 支持SQL 和DSL 代码|
+|MLSQL| MLSQL >=1.1.0|ongoing|-|MLSQL EngineConn， 支持MLSQL 代码.|
+|Hadoop|Apache >=2.6.0, <br/>CDH >=5.4.0|ongoing|-|Hadoop EngineConn， 支持Hadoop MR/YARN application|
+|TiSpark|1.1|ongoing|-|TiSpark EngineConn， 支持用SparkSQL 查询TiDB|
# 生态组件
-| 应用工具 | 描述 | Linkis 1.X(推荐 1.1.1) 兼容版本 |
+| 应用工具 | 描述 | Linkis 1.X(推荐1.1.1) 兼容版本 |
| --------------- | -------------------------------------------------------------------- | ---------- |
-| [**DataSphere Studio**](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/README-ZH.md) | DataSphere Studio（简称 DSS）数据应用开发管理集成框架 | **DSS 1.0.1[已发布 ][Linkis 推荐 1.1.1]** |
-| [**Scriptis**](https://github.com/WeBankFinTech/Scriptis) | 支持在线写 SQL、Pyspark、HiveQL 等脚本，提交给[Linkis](https://github.com/apache/incubator-linkis) 执行的数据分析 Web 工具 | 在 DSS 1.0.1 中[已发布 ] |
-| [**Schedulis**](https://github.com/WeBankFinTech/Schedulis) | 基于 Azkaban 二次开发的工作流任务调度系统,具备高性能，高可用和多租户资源隔离等金融级特性 | **Schedulis0.6.2 [已发布 ]** |
-| [**Qualitis**](https://github.com/WeBankFinTech/Qualitis) | 数据质量校验工具，提供数据完整性、正确性等数据校验能力 | **Qualitis 0.9.0 [已发布 ]** |
-| [**Streamis**](https://github.com/WeBankFinTech/Streamis) | 流式应用开发管理工具。支持发布 Flink Jar 和 Flink SQL ，提供流式应用的开发调试和生产管理能力，如：启停、状态监控、checkpoint 等 | **Streamis 0.1.0 [已发布 ][Linkis 推荐 1.1.0]** |
-| [**Exchangis**](https://github.com/WeBankFinTech/Exchangis) | 支持对结构化及无结构化的异构数据源之间的数据传输的数据交换平台，即将发布的 Exchangis1.0，将与 DSS 工作流打通 | **Exchangis 1.0.0 [开发中 ]** |
-| [**Visualis**](https://github.com/WeBankFinTech/Visualis) | 基于宜信开源项目 Davinci 二次开发的数据可视化 BI 工具，为用户在数据安全方面提供金融级数据可视化能力 | **Visualis 1.0.0[开发中 ]** |
-| [**Prophecis**](https://github.com/WeBankFinTech/Prophecis) | 一站式机器学习平台，集成多种开源机器学习框架。Prophecis 的 MLFlow 通过 AppConn 可以接入到 DSS 工作流中 | **Prophecis 0.3.0 [已发布 ]** |
+| [**DataSphere Studio**](https://github.com/WeBankFinTech/DataSphereStudio/blob/master/README-ZH.md) | DataSphere Studio（简称 DSS）数据应用开发管理集成框架 | **DSS 1.0.1[已发布][Linkis 推荐1.1.1]** |
+| [**Scriptis**](https://github.com/WeBankFinTech/Scriptis) | 支持在线写 SQL、Pyspark、HiveQL 等脚本，提交给[Linkis](https://github.com/apache/incubator-linkis)执行的数据分析 Web 工具。 | 在DSS 1.0.1中[已发布] |
+| [**Schedulis**](https://github.com/WeBankFinTech/Schedulis) | 基于 Azkaban 二次开发的工作流任务调度系统,具备高性能，高可用和多租户资源隔离等金融级特性。 | **Schedulis0.6.2 [已发布]** |
+| [**Qualitis**](https://github.com/WeBankFinTech/Qualitis) | 数据质量校验工具，提供数据完整性、正确性等数据校验能力 | **Qualitis 0.9.0 [已发布]** |
+| [**Streamis**](https://github.com/WeBankFinTech/Streamis) | 流式应用开发管理工具。支持发布 Flink Jar 和 Flink SQL ，提供流式应用的开发调试和生产管理能力，如：启停、状态监控、checkpoint 等。 | **Streamis 0.1.0 [已发布][Linkis 推荐1.1.0]** |
+| [**Exchangis**](https://github.com/WeBankFinTech/Exchangis) | 支持对结构化及无结构化的异构数据源之间的数据传输的数据交换平台，即将发布的 Exchangis1.0，将与 DSS 工作流打通 | **Exchangis 1.0.0 [开发中]** |
+| [**Visualis**](https://github.com/WeBankFinTech/Visualis) | 基于宜信开源项目 Davinci 二次开发的数据可视化 BI 工具，为用户在数据安全方面提供金融级数据可视化能力。 | **Visualis 1.0.0[开发中]** |
+| [**Prophecis**](https://github.com/WeBankFinTech/Prophecis) | 一站式机器学习平台，集成多种开源机器学习框架。Prophecis 的 MLFlow 通过 AppConn 可以接入到 DSS 工作流中。 | **Prophecis 0.3.0 [已发布]** |
# 下载
-请前往[Linkis Releases 页面 ](https://linkis.apache.org/download/main) 下载 Linkis 的已编译版本或源码包。
+请前往[Linkis Releases 页面](https://linkis.apache.org/download/main) 下载Linkis 的已编译版本或源码包。
# 编译和安装部署
> 更详细的步骤参见:
->[后端编译打包 ](https://linkis.apache.org/zh-CN/docs/latest/development/linkis-compile-and-package)
->[管理台编译 ](https://linkis.apache.org/zh-CN/docs/latest/development/web-build)
+>[后端编译打包](https://linkis.apache.org/zh-CN/docs/latest/development/linkis-compile-and-package)
+>[管理台编译](https://linkis.apache.org/zh-CN/docs/latest/development/web-build)
```shell script
## 后端编译
@@ -133,12 +80,12 @@ Linkis 自 2019 年开源发布以来，已累计积累了 700 多家试验企
./mvnw -N install
./mvnw clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
-### Windows 系统
+### Windows系统
mvnw.cmd -N install
mvnw.cmd clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
## 管理台编译
-cd incubator-linkis/linkis-web
+cd incubator-linkis/web
npm install
npm run build
```
@@ -147,60 +94,60 @@ npm run build
# 示例和使用指引
-- [用户手册 ](https://linkis.apache.org/zh-CN/docs/latest/user-guide/overview),
-- [各引擎使用指引 ](https://linkis.apache.org/zh-CN/docs/latest/engine-usage/overview)
-- [API 文档 ](https://linkis.apache.org/zh-CN/docs/latest/api/overview)
+- [用户手册](https://linkis.apache.org/zh-CN/docs/latest/user_guide/overview),
+- [各引擎使用指引](https://linkis.apache.org/zh-CN/docs/latest/engine_usage/overview)
+- [API 文档](https://linkis.apache.org/zh-CN/docs/latest/api/overview)
# 文档&视频
-- 完整的 Linkis 文档代码存放在[linkis-website 仓库中 ](https://github.com/apache/incubator-linkis-website)
+- 完整的Linkis文档代码存放在[linkis-website仓库中](https://github.com/apache/incubator-linkis-website)
-- Meetup 视频 [Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656)
+- Meetup 视频 [Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656).
# 架构概要
-Linkis 基于微服务架构开发，其服务可以分为 3 类:计算治理服务、公共增强服务和微服务治理服务。
-- 计算治理服务，支持计算任务/请求处理流程的 3 个主要阶段:提交-> 准备-> 执行
-- 公共增强服务，包括上下文服务、物料管理服务及数据源服务等
-- 微服务治理服务，包括定制化的 Spring Cloud Gateway、Eureka、Open Feign
+Linkis 基于微服务架构开发，其服务可以分为3类:计算治理服务、公共增强服务和微服务治理服务。
+- 计算治理服务，支持计算任务/请求处理流程的3个主要阶段:提交->准备->执行;
+- 公共增强服务，包括上下文服务、物料管理服务及数据源服务等;
+- 微服务治理服务，包括定制化的Spring Cloud Gateway、Eureka、Open Feign。
-下面是 Linkis 的架构概要图. 更多详细架构文档请见 [Linkis-Doc/Architecture](https://linkis.apache.org/zh-CN/docs/latest/architecture/overview).
+下面是Linkis 的架构概要图. 更多详细架构文档请见 [Linkis-Doc/Architecture](https://linkis.apache.org/zh-CN/docs/latest/architecture/overview).
-基于 Linkis 计算中间件，我们在大数据平台套件[WeDataSphere](https://github.com/WeBankFinTech/WeDataSphere) 中构建了许多应用和工具系统。下面是目前可用的开源项目。
+基于Linkis 计算中间件，我们在大数据平台套件[WeDataSphere](https://github.com/WeBankFinTech/WeDataSphere) 中构建了许多应用和工具系统。下面是目前可用的开源项目。
-- [**DataSphere Studio** - 数据应用集成开发框架 ](https://github.com/WeBankFinTech/DataSphereStudio)
+- [**DataSphere Studio** - 数据应用集成开发框架](https://github.com/WeBankFinTech/DataSphereStudio)
-- [**Scriptis** - 数据研发 IDE 工具 ](https://github.com/WeBankFinTech/Scriptis)
+- [**Scriptis** - 数据研发IDE工具](https://github.com/WeBankFinTech/Scriptis)
-- [**Visualis** - 数据可视化工具 ](https://github.com/WeBankFinTech/Visualis)
+- [**Visualis** - 数据可视化工具](https://github.com/WeBankFinTech/Visualis)
-- [**Schedulis** - 工作流调度工具 ](https://github.com/WeBankFinTech/Schedulis)
+- [**Schedulis** - 工作流调度工具](https://github.com/WeBankFinTech/Schedulis)
-- [**Qualitis** - 数据质量工具 ](https://github.com/WeBankFinTech/Qualitis)
+- [**Qualitis** - 数据质量工具](https://github.com/WeBankFinTech/Qualitis)
-- [**MLLabis** - 容器化机器学习 notebook 开发环境 ](https://github.com/WeBankFinTech/prophecis)
+- [**MLLabis** - 容器化机器学习notebook 开发环境](https://github.com/WeBankFinTech/prophecis)
更多项目开源准备中，敬请期待。
# 贡献
-我们非常欢迎和期待更多的贡献者参与共建 Linkis, 不论是代码、文档，或是其他能够帮助到社区的贡献形式。
-代码和文档相关的贡献请参照[贡献指引 ](https://linkis.apache.org/zh-CN/community/how-to-contribute).
+我们非常欢迎和期待更多的贡献者参与共建Linkis, 不论是代码、文档，或是其他能够帮助到社区的贡献形式。
+代码和文档相关的贡献请参照[贡献指引](https://linkis.apache.org/zh-CN/community/how-to-contribute).
# 联系我们
-- 对 Linkis 的任何问题和建议，可以提交 issue，以便跟踪处理和经验沉淀共享
+- 对Linkis 的任何问题和建议，可以提交issue，以便跟踪处理和经验沉淀共享
- 通过邮件方式 [dev@linkis.apache.org](mailto:dev@linkis.apache.org)
- 可以扫描下面的二维码，加入我们的微信群，以获得更快速的响应
-
+
-# 谁在使用 Linkis
+# 谁在使用Linkis
-我们创建了一个 issue [[Who is Using Linkis]](https://github.com/apache/incubator-linkis/issues/23) 以便用户反馈和记录谁在使用 Linkis.
-Linkis 自 2019 年开源发布以来，累计已有 700 多家试验企业和 1000+沙盒试验用户，涉及金融、电信、制造、互联网等多个行业。
+我们创建了一个 issue [[Who is Using Linkis]](https://github.com/apache/incubator-linkis/issues/23) 以便用户反馈和记录谁在使用Linkis.
+Linkis 自2019年开源发布以来，累计已有700多家试验企业和1000+沙盒试验用户，涉及金融、电信、制造、互联网等多个行业。
diff --git a/docs/index.md b/docs/index.md
deleted file mode 100644
index 28254c297..000000000
--- a/docs/index.md
+++ /dev/null
@@ -1,7 +0,0 @@
-This docs folder is only used to temporarily store some version documents.
-For detailed documentation, please visit the official website
-https://linkis.apache.org/docs/latest/introduction
-
-------
-这个docs文件夹，只是用来临时存放一些版本文档，
-详细文档 请到官网查看 https://linkis.apache.org/zh-CN/docs/latest/introduction/
\ No newline at end of file
diff --git a/tool/license-header b/license-header
similarity index 99%
rename from tool/license-header
rename to license-header
index 29400e587..3e7c6c26f 100644
--- a/tool/license-header
+++ b/license-header
@@ -14,4 +14,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
diff --git a/linkis-commons/linkis-common/pom.xml b/linkis-commons/linkis-common/pom.xml
index 69c344ec1..20f91412d 100644
--- a/linkis-commons/linkis-common/pom.xml
+++ b/linkis-commons/linkis-common/pom.xml
@@ -15,160 +15,167 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.linkis</groupId>
- <artifactId>linkis</artifactId>
- <version>1.2.0</version>
- </parent>
-
- <artifactId>linkis-common</artifactId>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scalap</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <!-- Java Logging 桥接 -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- </dependency>
- <!--用于与sfl4j保持桥接-->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.10</version>
- </dependency>
-
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
-
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>com.ginsberg</groupId>
- <artifactId>junit5-system-exit</artifactId>
- <version>1.1.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>linkis</artifactId>
+ <groupId>org.apache.linkis</groupId>
+ <version>1.2.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>linkis-common</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scalap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <!-- Java Logging 桥接 -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jul</artifactId>
+ </dependency>
+ <!--用于与sfl4j保持桥接-->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>${reflections.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.ginsberg</groupId>
+ <artifactId>junit5-system-exit</artifactId>
+ <version>1.1.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ </build>
+
+
+</project>
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/ErrorCodeUtils.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/ErrorCodeUtils.java
index e013cb316..ce8127855 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/ErrorCodeUtils.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/ErrorCodeUtils.java
@@ -24,12 +24,12 @@ import static org.apache.linkis.common.errorcode.LinkisFrameErrorCodeSummary.VAL
public class ErrorCodeUtils {
- private static final Logger LOGGER = LoggerFactory.getLogger(ErrorCodeUtils.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ErrorCodeUtils.class);
- public static void validateErrorCode(int errCode, int startCode, int endCode) {
- if (errCode < startCode || errCode > endCode) {
- LOGGER.error("You error code validate failed, please fix it and reboot");
- System.exit(VALIDATE_ERROR_CODE_FAILED.getErrorCode());
+ public static void validateErrorCode(int errCode, int startCode, int endCode) {
+ if (errCode < startCode || errCode > endCode) {
+ LOGGER.error("You error code validate failed, please fix it and reboot");
+ System.exit(VALIDATE_ERROR_CODE_FAILED.getErrorCode());
+ }
}
- }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisCommonsErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisCommonsErrorCodeSummary.java
index e72dc4223..c15173e90 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisCommonsErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisCommonsErrorCodeSummary.java
@@ -18,58 +18,58 @@
package org.apache.linkis.common.errorcode;
public enum LinkisCommonsErrorCodeSummary {
- ENGINE_FAILED_STARTED(11000, "引擎启动失败", "引擎启动失败", "hiveEngineConn");
+ ENGINE_FAILED_STARTED(11000, "引擎启动失败", "引擎启动失败", "hiveEngineConn");
- /** 错误码 */
- private int errorCode;
- /** 错误描述 */
- private String errorDesc;
- /** 错误可能出现的原因 */
- private String comment;
- /** 所属的linkis的模块 */
- private String module;
+ /** 错误码 */
+ private int errorCode;
+ /** 错误描述 */
+ private String errorDesc;
+ /** 错误可能出现的原因 */
+ private String comment;
+ /** 所属的linkis的模块 */
+ private String module;
- LinkisCommonsErrorCodeSummary(int errorCode, String errorDesc, String comment, String module) {
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisCommonsErrorCodeSummary(int errorCode, String errorDesc, String comment, String module) {
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisComputationGovernanceErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisComputationGovernanceErrorCodeSummary.java
index f217485da..b415d55c8 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisComputationGovernanceErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisComputationGovernanceErrorCodeSummary.java
@@ -18,66 +18,67 @@
package org.apache.linkis.common.errorcode;
public enum LinkisComputationGovernanceErrorCodeSummary {
- ENGINE_LAUNCH_REQUEST_USER_BLANK(20000, "请求引擎的参数中user为空", "请求引擎的参数中user为空", "EngineConnManager"),
- ENGINE_LAUNCH_REQUEST_CREATOR_BLANK(
- 20001, "请求启动引擎的参数中creator为空", "请求启动引擎的参数中creator为空", "EngineConnManager"),
- ENGINE_INIT_FAILED(20002, "引擎初始化失败", "引擎初始化失败", "EngineConnManager"),
+ ENGINE_LAUNCH_REQUEST_USER_BLANK(
+ 20000, "请求引擎的参数中user为空", "请求引擎的参数中user为空", "EngineConnManager"),
+ ENGINE_LAUNCH_REQUEST_CREATOR_BLANK(
+ 20001, "请求启动引擎的参数中creator为空", "请求启动引擎的参数中creator为空", "EngineConnManager"),
+ ENGINE_INIT_FAILED(20002, "引擎初始化失败", "引擎初始化失败", "EngineConnManager"),
- ENGINE_REQUEST_USER_BLANK(20000, "请求引擎的参数中user为空", "请求引擎的参数中user为空", "EngineConnManager"),
+ ENGINE_REQUEST_USER_BLANK(20000, "请求引擎的参数中user为空", "请求引擎的参数中user为空", "EngineConnManager"),
- AM_EM_NOT_FOUND(20100, "请求引擎的参数中user为空", "请求引擎的参数中user为空", "EngineConnManager");
- /** 错误码 */
- private int errorCode;
- /** 错误描述 */
- private String errorDesc;
- /** 错误可能出现的原因 */
- private String comment;
- /** 所属的linkis的模块 */
- private String module;
+ AM_EM_NOT_FOUND(20100, "请求引擎的参数中user为空", "请求引擎的参数中user为空", "EngineConnManager");
+ /** 错误码 */
+ private int errorCode;
+ /** 错误描述 */
+ private String errorDesc;
+ /** 错误可能出现的原因 */
+ private String comment;
+ /** 所属的linkis的模块 */
+ private String module;
- LinkisComputationGovernanceErrorCodeSummary(
- int errorCode, String errorDesc, String comment, String module) {
- ErrorCodeUtils.validateErrorCode(errorCode, 20000, 24999);
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisComputationGovernanceErrorCodeSummary(
+ int errorCode, String errorDesc, String comment, String module) {
+ ErrorCodeUtils.validateErrorCode(errorCode, 20000, 24999);
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisEngineConnErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisEngineConnErrorCodeSummary.java
index eeb5e9a30..4fba224ac 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisEngineConnErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisEngineConnErrorCodeSummary.java
@@ -18,58 +18,59 @@
package org.apache.linkis.common.errorcode;
public enum LinkisEngineConnErrorCodeSummary {
- ;
- /** 错误码 */
- private int errorCode;
- /** 错误描述 */
- private String errorDesc;
- /** 错误可能出现的原因 */
- private String comment;
- /** 所属的linkis的模块 */
- private String module;
+ ;
+ /** 错误码 */
+ private int errorCode;
+ /** 错误描述 */
+ private String errorDesc;
+ /** 错误可能出现的原因 */
+ private String comment;
+ /** 所属的linkis的模块 */
+ private String module;
- LinkisEngineConnErrorCodeSummary(int errorCode, String errorDesc, String comment, String module) {
- ErrorCodeUtils.validateErrorCode(errorCode, 26000, 29999);
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisEngineConnErrorCodeSummary(
+ int errorCode, String errorDesc, String comment, String module) {
+ ErrorCodeUtils.validateErrorCode(errorCode, 26000, 29999);
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisErrorCodeSummary.java
index e925fddc2..527b48270 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisErrorCodeSummary.java
@@ -19,70 +19,70 @@ package org.apache.linkis.common.errorcode;
public enum LinkisErrorCodeSummary {
- /**
- * 10000-10999 linkis-frame 11000-12999 linkis-commons 13000-14999 linkis-spring-cloud-services
- * 15000-19999 linkis-public-enhancements 20000-24999 linkis-computation-governance 25000-25999
- * linkis-extensions 26000-29999 linkis-engineconn-plugins
- */
- EngineManagerErrorException(321, "引擎启动失败", "在某种情况下启动失败", "hadoop", "EngineConnManager");
- /** 错误码 */
- private int errorCode;
- /** 错误描述 */
- private String errorDesc;
- /** 评论 */
- private String comment;
+ /**
+ * 10000-10999 linkis-frame 11000-12999 linkis-commons 13000-14999 linkis-spring-cloud-services
+ * 15000-19999 linkis-public-enhancements 20000-24999 linkis-computation-governance 25000-25999
+ * linkis-extensions 26000-29999 linkis-engineconn-plugins
+ */
+ EngineManagerErrorException(321, "引擎启动失败", "在某种情况下启动失败", "hadoop", "EngineConnManager");
+ /** 错误码 */
+ private int errorCode;
+ /** 错误描述 */
+ private String errorDesc;
+ /** 评论 */
+ private String comment;
- /** errorCode的创建人 */
- private String creator;
- /** 所属的linkis的模块 */
- private String module;
+ /** errorCode的创建人 */
+ private String creator;
+ /** 所属的linkis的模块 */
+ private String module;
- LinkisErrorCodeSummary(
- int errorCode, String errorDesc, String comment, String creator, String module) {
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.creator = creator;
- this.module = module;
- }
+ LinkisErrorCodeSummary(
+ int errorCode, String errorDesc, String comment, String creator, String module) {
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.creator = creator;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getCreator() {
- return creator;
- }
+ public String getCreator() {
+ return creator;
+ }
- public void setCreator(String creator) {
- this.creator = creator;
- }
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisExtensionErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisExtensionErrorCodeSummary.java
index 147da0a94..baeae1667 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisExtensionErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisExtensionErrorCodeSummary.java
@@ -18,57 +18,58 @@
package org.apache.linkis.common.errorcode;
public enum LinkisExtensionErrorCodeSummary {
- ;
- private int errorCode;
+ ;
+ private int errorCode;
- private String errorDesc;
+ private String errorDesc;
- private String comment;
+ private String comment;
- private String module;
+ private String module;
- LinkisExtensionErrorCodeSummary(int errorCode, String errorDesc, String comment, String module) {
- ErrorCodeUtils.validateErrorCode(errorCode, 26000, 26999);
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisExtensionErrorCodeSummary(
+ int errorCode, String errorDesc, String comment, String module) {
+ ErrorCodeUtils.validateErrorCode(errorCode, 26000, 26999);
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisFrameErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisFrameErrorCodeSummary.java
index 80978fcd5..6404a4a70 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisFrameErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisFrameErrorCodeSummary.java
@@ -18,58 +18,58 @@
package org.apache.linkis.common.errorcode;
public enum LinkisFrameErrorCodeSummary {
- VALIDATE_ERROR_CODE_FAILED(10000, "错误码定义有误", "错误码定义超过最大值或者小于最小值", "linkis-frame");
+ VALIDATE_ERROR_CODE_FAILED(10000, "错误码定义有误", "错误码定义超过最大值或者小于最小值", "linkis-frame");
- private int errorCode;
+ private int errorCode;
- private String errorDesc;
+ private String errorDesc;
- private String comment;
+ private String comment;
- private String module;
+ private String module;
- LinkisFrameErrorCodeSummary(int errorCode, String errorDesc, String comment, String module) {
- ErrorCodeUtils.validateErrorCode(errorCode, 10000, 10999);
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisFrameErrorCodeSummary(int errorCode, String errorDesc, String comment, String module) {
+ ErrorCodeUtils.validateErrorCode(errorCode, 10000, 10999);
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisPublicEnhancementErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisPublicEnhancementErrorCodeSummary.java
index 69fb939aa..9b7f09f9c 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisPublicEnhancementErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisPublicEnhancementErrorCodeSummary.java
@@ -18,55 +18,55 @@
package org.apache.linkis.common.errorcode;
public enum LinkisPublicEnhancementErrorCodeSummary {
- ;
- private int errorCode;
- private String errorDesc;
- private String comment;
- private String module;
+ ;
+ private int errorCode;
+ private String errorDesc;
+ private String comment;
+ private String module;
- LinkisPublicEnhancementErrorCodeSummary(
- int errorCode, String errorDesc, String comment, String module) {
- ErrorCodeUtils.validateErrorCode(errorCode, 15000, 19999);
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisPublicEnhancementErrorCodeSummary(
+ int errorCode, String errorDesc, String comment, String module) {
+ ErrorCodeUtils.validateErrorCode(errorCode, 15000, 19999);
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisSpringCloudServiceErrorCodeSummary.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisSpringCloudServiceErrorCodeSummary.java
index c17428426..a7546d2cb 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisSpringCloudServiceErrorCodeSummary.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/errorcode/LinkisSpringCloudServiceErrorCodeSummary.java
@@ -19,54 +19,54 @@ package org.apache.linkis.common.errorcode;
public class LinkisSpringCloudServiceErrorCodeSummary {;
- private int errorCode;
- private String errorDesc;
- private String comment;
- private String module;
+ private int errorCode;
+ private String errorDesc;
+ private String comment;
+ private String module;
- LinkisSpringCloudServiceErrorCodeSummary(
- int errorCode, String errorDesc, String comment, String module) {
- ErrorCodeUtils.validateErrorCode(errorCode, 13000, 14999);
- this.errorCode = errorCode;
- this.errorDesc = errorDesc;
- this.comment = comment;
- this.module = module;
- }
+ LinkisSpringCloudServiceErrorCodeSummary(
+ int errorCode, String errorDesc, String comment, String module) {
+ ErrorCodeUtils.validateErrorCode(errorCode, 13000, 14999);
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ this.module = module;
+ }
- public int getErrorCode() {
- return errorCode;
- }
+ public int getErrorCode() {
+ return errorCode;
+ }
- public void setErrorCode(int errorCode) {
- this.errorCode = errorCode;
- }
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
- public String getErrorDesc() {
- return errorDesc;
- }
+ public String getErrorDesc() {
+ return errorDesc;
+ }
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
- public String getComment() {
- return comment;
- }
+ public String getComment() {
+ return comment;
+ }
- public void setComment(String comment) {
- this.comment = comment;
- }
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
- public String getModule() {
- return module;
- }
+ public String getModule() {
+ return module;
+ }
- public void setModule(String module) {
- this.module = module;
- }
+ public void setModule(String module) {
+ this.module = module;
+ }
- @Override
- public String toString() {
- return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
- }
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ErrorException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ErrorException.java
index c2429b99a..e4a8a796d 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ErrorException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ErrorException.java
@@ -18,18 +18,18 @@
package org.apache.linkis.common.exception;
public class ErrorException extends LinkisException {
- private ExceptionLevel level = ExceptionLevel.ERROR;
+ private ExceptionLevel level = ExceptionLevel.ERROR;
- public ErrorException(int errCode, String desc) {
- super(errCode, desc);
- }
+ public ErrorException(int errCode, String desc) {
+ super(errCode, desc);
+ }
- public ErrorException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(errCode, desc, ip, port, serviceKind);
- }
+ public ErrorException(int errCode, String desc, String ip, int port, String serviceKind) {
+ super(errCode, desc, ip, port, serviceKind);
+ }
- @Override
- public ExceptionLevel getLevel() {
- return this.level;
- }
+ @Override
+ public ExceptionLevel getLevel() {
+ return this.level;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionLevel.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionLevel.java
index b947613bd..213c48524 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionLevel.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionLevel.java
@@ -18,37 +18,37 @@
package org.apache.linkis.common.exception;
public enum ExceptionLevel {
- /** warn 1 error 2 fatal 3 */
- WARN(1, "warn"),
- ERROR(2, "error"),
- FATAL(3, "fatal"),
- RETRY(4, "retry");
- private int level;
- private String name;
-
- private ExceptionLevel(int level, String name) {
- this.name = name;
- this.level = level;
- }
-
- public int getLevel() {
- return level;
- }
-
- public void setLevel(int level) {
- this.level = level;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return "ExceptionLevel{" + "level=" + level + ", name='" + name + '\'' + '}';
- }
+ /** warn 1 error 2 fatal 3 */
+ WARN(1, "warn"),
+ ERROR(2, "error"),
+ FATAL(3, "fatal"),
+ RETRY(4, "retry");
+ private int level;
+ private String name;
+
+ private ExceptionLevel(int level, String name) {
+ this.name = name;
+ this.level = level;
+ }
+
+ public int getLevel() {
+ return level;
+ }
+
+ public void setLevel(int level) {
+ this.level = level;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "ExceptionLevel{" + "level=" + level + ", name='" + name + '\'' + '}';
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionManager.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionManager.java
index a9915e4d7..7c994e887 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionManager.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/ExceptionManager.java
@@ -25,52 +25,52 @@ import java.util.Map;
import static org.apache.linkis.common.exception.ExceptionLevel.*;
public final class ExceptionManager {
- private static final String LEVEL = "level";
- private static final String ERRCODE = "errCode";
- private static final String DESC = "desc";
- private static final String IP = "ip";
- private static final String PORT = "port";
- private static final String SERVICEKIND = "serviceKind";
+ private static final String LEVEL = "level";
+ private static final String ERRCODE = "errCode";
+ private static final String DESC = "desc";
+ private static final String IP = "ip";
+ private static final String PORT = "port";
+ private static final String SERVICEKIND = "serviceKind";
- public static Exception generateException(Map<String, Object> map) {
- Exception retException = null;
- if (null == map || map.get(LEVEL) == null) {
- return new ErrorException(
- CommonErrorConstants.COMMON_ERROR(),
- "The map cannot be parsed normally, "
- + "the map is empty or the LEVEL value is missing:(map不能被正常的解析，map为空或者缺少LEVEL值: )"
- + map);
+ public static Exception generateException(Map<String, Object> map) {
+ Exception retException = null;
+ if (null == map || map.get(LEVEL) == null) {
+ return new ErrorException(
+ CommonErrorConstants.COMMON_ERROR(),
+ "The map cannot be parsed normally, "
+ + "the map is empty or the LEVEL value is missing:(map不能被正常的解析，map为空或者缺少LEVEL值: )"
+ + map);
+ }
+ int level = Integer.parseInt(map.get(LEVEL).toString());
+ int errCode = Integer.parseInt(map.get(ERRCODE).toString());
+ String desc = (String) map.get(DESC);
+ String ip = (String) map.get(IP);
+ int port = Integer.parseInt(map.get(PORT).toString());
+ String serviceKind = (String) map.get(SERVICEKIND);
+ if (WARN.getLevel() == level) {
+ retException = new WarnException(errCode, desc, ip, port, serviceKind);
+ } else if (ERROR.getLevel() == level) {
+ retException = new ErrorException(errCode, desc, ip, port, serviceKind);
+ } else if (FATAL.getLevel() == level) {
+ retException = new FatalException(errCode, desc, ip, port, serviceKind);
+ } else if (RETRY.getLevel() == level) {
+ retException = new LinkisRetryException(errCode, desc, ip, port, serviceKind);
+ }
+ return retException != null
+ ? retException
+ : new ErrorException(
+ CommonErrorConstants.COMMON_ERROR(),
+ "Exception Map that cannot be parsed:(不能解析的异常Map：)" + map);
}
- int level = Integer.parseInt(map.get(LEVEL).toString());
- int errCode = Integer.parseInt(map.get(ERRCODE).toString());
- String desc = (String) map.get(DESC);
- String ip = (String) map.get(IP);
- int port = Integer.parseInt(map.get(PORT).toString());
- String serviceKind = (String) map.get(SERVICEKIND);
- if (WARN.getLevel() == level) {
- retException = new WarnException(errCode, desc, ip, port, serviceKind);
- } else if (ERROR.getLevel() == level) {
- retException = new ErrorException(errCode, desc, ip, port, serviceKind);
- } else if (FATAL.getLevel() == level) {
- retException = new FatalException(errCode, desc, ip, port, serviceKind);
- } else if (RETRY.getLevel() == level) {
- retException = new LinkisRetryException(errCode, desc, ip, port, serviceKind);
- }
- return retException != null
- ? retException
- : new ErrorException(
- CommonErrorConstants.COMMON_ERROR(),
- "Exception Map that cannot be parsed:(不能解析的异常Map：)" + map);
- }
- public static Map<String, Object> unknownException(String errorMsg) {
- Map<String, Object> retMap = new HashMap<String, Object>();
- retMap.put("level", ERROR.getLevel());
- retMap.put("errCode", 0);
- retMap.put("desc", errorMsg);
- retMap.put("ip", LinkisException.hostname);
- retMap.put("port", LinkisException.hostPort);
- retMap.put("serviceKind", LinkisException.applicationName);
- return retMap;
- }
+ public static Map<String, Object> unknownException(String errorMsg) {
+ Map<String, Object> retMap = new HashMap<String, Object>();
+ retMap.put("level", ERROR.getLevel());
+ retMap.put("errCode", 0);
+ retMap.put("desc", errorMsg);
+ retMap.put("ip", LinkisException.hostname);
+ retMap.put("port", LinkisException.hostPort);
+ retMap.put("serviceKind", LinkisException.applicationName);
+ return retMap;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/FatalException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/FatalException.java
index 72b27207c..f79e2db79 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/FatalException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/FatalException.java
@@ -18,18 +18,18 @@
package org.apache.linkis.common.exception;
public class FatalException extends LinkisException {
- private ExceptionLevel level = ExceptionLevel.FATAL;
+ private ExceptionLevel level = ExceptionLevel.FATAL;
- public FatalException(int errCode, String desc) {
- super(errCode, desc);
- }
+ public FatalException(int errCode, String desc) {
+ super(errCode, desc);
+ }
- public FatalException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(errCode, desc, ip, port, serviceKind);
- }
+ public FatalException(int errCode, String desc, String ip, int port, String serviceKind) {
+ super(errCode, desc, ip, port, serviceKind);
+ }
- @Override
- public ExceptionLevel getLevel() {
- return this.level;
- }
+ @Override
+ public ExceptionLevel getLevel() {
+ return this.level;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisCommonErrorException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisCommonErrorException.java
index b4a94f3a8..e8f385ad7 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisCommonErrorException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisCommonErrorException.java
@@ -18,12 +18,12 @@
package org.apache.linkis.common.exception;
public class LinkisCommonErrorException extends ErrorException {
- public LinkisCommonErrorException(int errCode, String desc) {
- super(errCode, desc);
- }
+ public LinkisCommonErrorException(int errCode, String desc) {
+ super(errCode, desc);
+ }
- public LinkisCommonErrorException(
- int errCode, String desc, String ip, int port, String serviceKind) {
- super(errCode, desc, ip, port, serviceKind);
- }
+ public LinkisCommonErrorException(
+ int errCode, String desc, String ip, int port, String serviceKind) {
+ super(errCode, desc, ip, port, serviceKind);
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisException.java
index c8f47e33f..cf3b93bc6 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisException.java
@@ -22,126 +22,126 @@ import java.util.Map;
public abstract class LinkisException extends Exception {
- static String applicationName;
- static String hostname;
- static int hostPort;
-
- public LinkisException(int errCode, String desc) {
- this(errCode, desc, hostname, hostPort, applicationName);
- }
-
- public LinkisException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(
- "errCode: "
- + errCode
- + " ,desc: "
- + desc
- + " ,ip: "
- + ip
- + " ,port: "
- + port
- + " ,serviceKind: "
- + serviceKind);
- this.errCode = errCode;
- this.desc = desc;
- this.ip = ip;
- this.port = port;
- this.serviceKind = serviceKind;
- }
-
- public static void setApplicationName(String applicationName) {
- LinkisException.applicationName = applicationName;
- }
-
- /**
- * Errcode error code(errcode 错误码) Desc error description(desc 错误描述) Ip abnormal server ip(ip
- * 发生异常的服务器ip) Port An abnormal process port(port 发生异常的进程端口) serviceKind microservice type with
- * exception(serviceKind 发生异常的微服务类型)
- */
- private int errCode;
-
- private String desc;
- private String ip;
- private int port;
- private String serviceKind;
-
- public static void setHostname(String hostname) {
- LinkisException.hostname = hostname;
- }
-
- public static void setHostPort(int hostPort) {
- LinkisException.hostPort = hostPort;
- }
-
- public int getErrCode() {
- return errCode;
- }
-
- public void setErrCode(int errCode) {
- this.errCode = errCode;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getServiceKind() {
- return serviceKind;
- }
-
- public void setServiceKind(String serviceKind) {
- this.serviceKind = serviceKind;
- }
-
- public Map<String, Object> toMap() {
- Map<String, Object> retMap = new HashMap<>();
- retMap.put("level", getLevel().getLevel());
- retMap.put("errCode", getErrCode());
- retMap.put("desc", getDesc());
- retMap.put("ip", getIp());
- retMap.put("port", getPort());
- retMap.put("serviceKind", getServiceKind());
- return retMap;
- }
-
- abstract ExceptionLevel getLevel();
-
- @Override
- public String toString() {
- return "LinkisException{"
- + "errCode="
- + errCode
- + ", desc='"
- + desc
- + "'"
- + ", ip='"
- + ip
- + "'"
- + ", port="
- + port
- + ", serviceKind='"
- + serviceKind
- + "'"
- + '}';
- }
+ static String applicationName;
+ static String hostname;
+ static int hostPort;
+
+ public LinkisException(int errCode, String desc) {
+ this(errCode, desc, hostname, hostPort, applicationName);
+ }
+
+ public LinkisException(int errCode, String desc, String ip, int port, String serviceKind) {
+ super(
+ "errCode: "
+ + errCode
+ + " ,desc: "
+ + desc
+ + " ,ip: "
+ + ip
+ + " ,port: "
+ + port
+ + " ,serviceKind: "
+ + serviceKind);
+ this.errCode = errCode;
+ this.desc = desc;
+ this.ip = ip;
+ this.port = port;
+ this.serviceKind = serviceKind;
+ }
+
+ public static void setApplicationName(String applicationName) {
+ LinkisException.applicationName = applicationName;
+ }
+
+ /**
+ * Errcode error code(errcode 错误码) Desc error description(desc 错误描述) Ip abnormal server ip(ip
+ * 发生异常的服务器ip) Port An abnormal process port(port 发生异常的进程端口) serviceKind microservice type with
+ * exception(serviceKind 发生异常的微服务类型)
+ */
+ private int errCode;
+
+ private String desc;
+ private String ip;
+ private int port;
+ private String serviceKind;
+
+ public static void setHostname(String hostname) {
+ LinkisException.hostname = hostname;
+ }
+
+ public static void setHostPort(int hostPort) {
+ LinkisException.hostPort = hostPort;
+ }
+
+ public int getErrCode() {
+ return errCode;
+ }
+
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getServiceKind() {
+ return serviceKind;
+ }
+
+ public void setServiceKind(String serviceKind) {
+ this.serviceKind = serviceKind;
+ }
+
+ public Map<String, Object> toMap() {
+ Map<String, Object> retMap = new HashMap<>();
+ retMap.put("level", getLevel().getLevel());
+ retMap.put("errCode", getErrCode());
+ retMap.put("desc", getDesc());
+ retMap.put("ip", getIp());
+ retMap.put("port", getPort());
+ retMap.put("serviceKind", getServiceKind());
+ return retMap;
+ }
+
+ abstract ExceptionLevel getLevel();
+
+ @Override
+ public String toString() {
+ return "LinkisException{"
+ + "errCode="
+ + errCode
+ + ", desc='"
+ + desc
+ + "'"
+ + ", ip='"
+ + ip
+ + "'"
+ + ", port="
+ + port
+ + ", serviceKind='"
+ + serviceKind
+ + "'"
+ + '}';
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRetryException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRetryException.java
index 4b9f3ba0f..09d0858d8 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRetryException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRetryException.java
@@ -18,16 +18,16 @@
package org.apache.linkis.common.exception;
public class LinkisRetryException extends LinkisException {
- LinkisRetryException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(errCode, desc, ip, port, serviceKind);
- }
+ LinkisRetryException(int errCode, String desc, String ip, int port, String serviceKind) {
+ super(errCode, desc, ip, port, serviceKind);
+ }
- public LinkisRetryException(int errCode, String desc) {
- super(errCode, desc);
- }
+ public LinkisRetryException(int errCode, String desc) {
+ super(errCode, desc);
+ }
- @Override
- ExceptionLevel getLevel() {
- return ExceptionLevel.RETRY;
- }
+ @Override
+ ExceptionLevel getLevel() {
+ return ExceptionLevel.RETRY;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRuntimeException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRuntimeException.java
index d0b21e0cd..5f922c70a 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRuntimeException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRuntimeException.java
@@ -24,104 +24,105 @@ import static org.apache.linkis.common.exception.LinkisException.*;
public abstract class LinkisRuntimeException extends RuntimeException {
- private int errCode;
- private String desc;
- private String ip;
- private int port;
- private String serviceKind;
-
- public LinkisRuntimeException(int errCode, String desc) {
- this(errCode, desc, hostname, hostPort, applicationName);
- }
-
- public LinkisRuntimeException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(
- "errCode: "
- + errCode
- + " ,desc: "
- + desc
- + " ,ip: "
- + ip
- + " ,port: "
- + port
- + " ,serviceKind: "
- + serviceKind);
- this.errCode = errCode;
- this.desc = desc;
- this.ip = ip;
- this.port = port;
- this.serviceKind = serviceKind;
- }
-
- public int getErrCode() {
- return errCode;
- }
-
- public void setErrCode(int errCode) {
- this.errCode = errCode;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getServiceKind() {
- return serviceKind;
- }
-
- public void setServiceKind(String serviceKind) {
- this.serviceKind = serviceKind;
- }
-
- public Map<String, Object> toMap() {
- Map<String, Object> retMap = new HashMap<String, Object>();
- retMap.put("errCode", getErrCode());
- retMap.put("desc", getDesc());
- retMap.put("ip", getIp());
- retMap.put("port", getPort());
- retMap.put("level", getLevel().getLevel());
- retMap.put("serviceKind", getServiceKind());
- return retMap;
- }
-
- public abstract ExceptionLevel getLevel();
-
- @Override
- public String toString() {
- return "LinkisException{"
- + "errCode="
- + errCode
- + ", desc='"
- + desc
- + '\''
- + ", ip='"
- + ip
- + '\''
- + ", port="
- + port
- + ", serviceKind='"
- + serviceKind
- + '\''
- + '}';
- }
+ private int errCode;
+ private String desc;
+ private String ip;
+ private int port;
+ private String serviceKind;
+
+ public LinkisRuntimeException(int errCode, String desc) {
+ this(errCode, desc, hostname, hostPort, applicationName);
+ }
+
+ public LinkisRuntimeException(
+ int errCode, String desc, String ip, int port, String serviceKind) {
+ super(
+ "errCode: "
+ + errCode
+ + " ,desc: "
+ + desc
+ + " ,ip: "
+ + ip
+ + " ,port: "
+ + port
+ + " ,serviceKind: "
+ + serviceKind);
+ this.errCode = errCode;
+ this.desc = desc;
+ this.ip = ip;
+ this.port = port;
+ this.serviceKind = serviceKind;
+ }
+
+ public int getErrCode() {
+ return errCode;
+ }
+
+ public void setErrCode(int errCode) {
+ this.errCode = errCode;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getServiceKind() {
+ return serviceKind;
+ }
+
+ public void setServiceKind(String serviceKind) {
+ this.serviceKind = serviceKind;
+ }
+
+ public Map<String, Object> toMap() {
+ Map<String, Object> retMap = new HashMap<String, Object>();
+ retMap.put("errCode", getErrCode());
+ retMap.put("desc", getDesc());
+ retMap.put("ip", getIp());
+ retMap.put("port", getPort());
+ retMap.put("level", getLevel().getLevel());
+ retMap.put("serviceKind", getServiceKind());
+ return retMap;
+ }
+
+ public abstract ExceptionLevel getLevel();
+
+ @Override
+ public String toString() {
+ return "LinkisException{"
+ + "errCode="
+ + errCode
+ + ", desc='"
+ + desc
+ + '\''
+ + ", ip='"
+ + ip
+ + '\''
+ + ", port="
+ + port
+ + ", serviceKind='"
+ + serviceKind
+ + '\''
+ + '}';
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/VariableOperationFailedException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/VariableOperationFailedException.java
index d2e1f3fdf..ed2ff207c 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/VariableOperationFailedException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/VariableOperationFailedException.java
@@ -19,12 +19,12 @@ package org.apache.linkis.common.exception;
public class VariableOperationFailedException extends ErrorException {
- public VariableOperationFailedException(int errCode, String desc) {
- super(errCode, desc);
- }
+ public VariableOperationFailedException(int errCode, String desc) {
+ super(errCode, desc);
+ }
- public VariableOperationFailedException(int errCode, String desc, Exception e) {
- super(errCode, desc);
- this.initCause(e);
- }
+ public VariableOperationFailedException(int errCode, String desc, Exception e) {
+ super(errCode, desc);
+ this.initCause(e);
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/WarnException.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/WarnException.java
index 80b8d0973..0eeff762d 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/WarnException.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/exception/WarnException.java
@@ -18,18 +18,18 @@
package org.apache.linkis.common.exception;
public class WarnException extends LinkisRuntimeException {
- private ExceptionLevel level = ExceptionLevel.WARN;
+ private ExceptionLevel level = ExceptionLevel.WARN;
- public WarnException(int errCode, String desc) {
- super(errCode, desc);
- }
+ public WarnException(int errCode, String desc) {
+ super(errCode, desc);
+ }
- public WarnException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(errCode, desc, ip, port, serviceKind);
- }
+ public WarnException(int errCode, String desc, String ip, int port, String serviceKind) {
+ super(errCode, desc, ip, port, serviceKind);
+ }
- @Override
- public ExceptionLevel getLevel() {
- return this.level;
- }
+ @Override
+ public ExceptionLevel getLevel() {
+ return this.level;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java
index 64e8cbce0..d85709338 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/Fs.java
@@ -26,33 +26,33 @@ import java.util.Map;
public interface Fs extends Closeable {
- void init(Map<String, String> properties) throws IOException;
+ void init(Map<String, String> properties) throws IOException;
- String fsName();
+ String fsName();
- String rootUserName();
+ String rootUserName();
- FsPath get(String dest) throws IOException;
+ FsPath get(String dest) throws IOException;
- InputStream read(FsPath dest) throws IOException;
+ InputStream read(FsPath dest) throws IOException;
- OutputStream write(FsPath dest, boolean overwrite) throws IOException;
+ OutputStream write(FsPath dest, boolean overwrite) throws IOException;
- boolean create(String dest) throws IOException;
+ boolean create(String dest) throws IOException;
- List<FsPath> list(final FsPath path) throws IOException;
+ List<FsPath> list(final FsPath path) throws IOException;
- boolean canRead(FsPath dest) throws IOException;
+ boolean canRead(FsPath dest) throws IOException;
- boolean canWrite(FsPath dest) throws IOException;
+ boolean canWrite(FsPath dest) throws IOException;
- boolean exists(FsPath dest) throws IOException;
+ boolean exists(FsPath dest) throws IOException;
- boolean delete(FsPath dest) throws IOException;
+ boolean delete(FsPath dest) throws IOException;
- boolean renameTo(FsPath oldDest, FsPath newDest) throws IOException;
+ boolean renameTo(FsPath oldDest, FsPath newDest) throws IOException;
- boolean mkdir(FsPath dest) throws IOException;
+ boolean mkdir(FsPath dest) throws IOException;
- boolean mkdirs(FsPath dest) throws IOException;
+ boolean mkdirs(FsPath dest) throws IOException;
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
index 5f198e701..6b29f6f1d 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/io/FsPath.java
@@ -33,300 +33,302 @@ import java.util.regex.Pattern;
public class FsPath {
- public static final String CUR_DIR = ".";
- public static final boolean WINDOWS = System.getProperty("os.name").startsWith("Windows");
- public static final char SEPARATOR_CHAR = '/';
- public static final String SEPARATOR = "/";
- private static final Pattern hasDriveLetterSpecifier = Pattern.compile("^/?[a-zA-Z]:");
-
- private URI uri;
- private long modification_time;
- private long access_time;
- private long length;
- private boolean isdir;
- private String permissionString;
- private String owner;
- private String group;
- private PosixFilePermission[] permissions;
-
- public FsPath(String pathString) throws IllegalArgumentException {
- checkPathArg(pathString);
- // We can't use 'new URI(String)' directly, since it assumes things are
- // escaped, which we don't require of Paths.
-
- // add a slash in front of paths with Windows drive letters
- if (hasWindowsDrive(pathString) && pathString.charAt(0) != '/') {
- pathString = "/" + pathString;
- }
- // parse uri components
- String scheme = null;
- String authority = null;
-
- int start = 0;
- // parse uri scheme, if any
- int colon = pathString.indexOf(':');
- int slash = pathString.indexOf('/');
- if ((colon != -1) && ((slash == -1) || (colon < slash))) { // has a scheme
- scheme = pathString.substring(0, colon);
- start = colon + 1;
- }
- // parse uri authority, if any
- if (pathString.startsWith("//", start) && (pathString.length() - start > 2)) { // has authority
- int nextSlash = pathString.indexOf('/', start + 2);
- int authEnd = nextSlash > 0 ? nextSlash : pathString.length();
- authority = pathString.substring(start + 2, authEnd);
- start = authEnd;
- }
-
- // uri path is the rest of the string -- query & fragment not supported
- String path = pathString.substring(start, pathString.length());
- initialize(scheme, authority, path, null);
- }
-
- public FsPath(String scheme, String authority, String path) {
- checkPathArg(path);
- // add a slash in front of paths with Windows drive letters
- if (hasWindowsDrive(path) && path.charAt(0) != '/') {
- path = "/" + path;
- }
- // add "./" in front of Linux relative paths so that a path containing
- // a colon e.q. "a:b" will not be interpreted as scheme "a".
- if (!WINDOWS && path.charAt(0) != '/') {
- path = "./" + path;
- }
- initialize(scheme, authority, path, null);
- }
-
- private void checkPathArg(String path) throws IllegalArgumentException {
- // disallow construction of a Path from an empty string
- if (path == null) {
- throw new IllegalArgumentException("Can not create a Path from a null string");
- }
- if (path.length() == 0) {
- throw new IllegalArgumentException("Can not create a Path from an empty string");
- }
- }
-
- private void initialize(String scheme, String authority, String path, String fragment) {
- try {
- this.uri =
- new URI(scheme, authority, normalizePath(scheme, path), null, fragment).normalize();
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException(e);
- }
- }
-
- private static String normalizePath(String scheme, String path) {
- // Remove double forward slashes.
- path = StringUtils.replace(path, "//", "/");
-
- // Remove backslashes if this looks like a Windows path. Avoid
- // the substitution if it looks like a non-local URI.
- if (WINDOWS
- && (hasWindowsDrive(path)
- || (scheme == null)
- || (scheme.isEmpty())
- || (scheme.equals("file")))) {
- path = StringUtils.replace(path, "\\", "/");
- }
-
- // trim trailing slash from non-root path (ignoring windows drive)
- int minLength = startPositionWithoutWindowsDrive(path) + 1;
- if (path.length() > minLength && path.endsWith(SEPARATOR)) {
- path = path.substring(0, path.length() - 1);
- }
-
- return path;
- }
-
- private static boolean hasWindowsDrive(String path) {
- return (WINDOWS && hasDriveLetterSpecifier.matcher(path).find());
- }
-
- private static int startPositionWithoutWindowsDrive(String path) {
- if (hasWindowsDrive(path)) {
- return path.charAt(0) == SEPARATOR_CHAR ? 3 : 2;
- } else {
- return 0;
- }
- }
-
- /** @return if no storage type pointed, hdfs type will returned */
- public String getFsType() {
- return getFsType("file");
- }
-
- public String getFsType(String defaultType) {
- String scheme = uri.getScheme();
- if (StringUtils.isEmpty(scheme)) {
- return defaultType;
- } else {
- return scheme;
- }
- }
-
- public File toFile() {
- return new File(uri);
- }
-
- public Path toPath() {
- return FileSystems.getDefault().getPath(uri.toString());
- }
-
- public boolean isOwner(String user) {
- return owner.equals(user);
- }
-
- public FsPath getParent() throws IOException {
- String path = uri.getPath();
- int lastSlash = path.lastIndexOf('/');
- int start = startPositionWithoutWindowsDrive(path);
- if ((path.length() == start)
- || // empty path
- (lastSlash == start && path.length() == start + 1)) { // at root
- return null;
- }
- String parent;
- if (lastSlash == -1) {
- parent = CUR_DIR;
- } else {
- parent = path.substring(0, lastSlash == start ? start + 1 : lastSlash);
- }
- return new FsPath(uri.getScheme(), uri.getAuthority(), parent);
- }
-
- public long getModification_time() {
- return modification_time;
- }
-
- public void setModification_time(long modification_time) {
- this.modification_time = modification_time;
- }
-
- public long getAccess_time() {
- return access_time;
- }
-
- public void setAccess_time(long access_time) {
- this.access_time = access_time;
- }
-
- public long getLength() {
- return length;
- }
-
- public void setLength(long length) {
- this.length = length;
- }
-
- public boolean isdir() {
- return isdir;
- }
-
- public void setIsdir(boolean isdir) {
- this.isdir = isdir;
- }
-
- public String getPermissionString() {
- return permissionString;
- }
-
- public String getOwner() {
- return owner;
- }
-
- public void setOwner(String owner) {
- this.owner = owner;
- }
-
- public String getGroup() {
- return group;
- }
-
- public void setGroup(String group) {
- this.group = group;
- }
-
- public void setPermissions(Set<PosixFilePermission> permissions) throws IOException {
- // this.permissions = FileSystem.permissionFormatted(permissions);
- this.permissions = permissions.toArray(new PosixFilePermission[] {});
- this.permissionString = PosixFilePermissions.toString(permissions);
- }
-
- public void setPermissionString(String permissionString) throws IOException {
- this.permissionString = permissionFormatted(permissionString);
- this.permissions =
- PosixFilePermissions.fromString(this.permissionString)
- .toArray(new PosixFilePermission[] {});
- }
-
- public String getPath() {
- if (WINDOWS && !"hdfs".equals(getFsType())) {
- return uri.getAuthority() + uri.getPath();
- }
- return uri.getPath();
- }
-
- public String getSchemaPath() {
- if (WINDOWS && !"hdfs".equals(getFsType())) {
- return getFsType() + "://" + uri.getAuthority() + uri.getPath();
- }
- return getFsType() + "://" + uri.getPath();
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append("{");
- sb.append("path=").append(uri.getPath());
- sb.append("; isDirectory=").append(isdir);
- if (!isdir) {
- sb.append("; length=").append(length);
- }
- sb.append("; modification_time=").append(modification_time);
- sb.append("; access_time=").append(access_time);
- sb.append("; owner=").append(owner);
- sb.append("; group=").append(group);
- sb.append("; permission=").append(permissions);
- sb.append("}");
- return sb.toString();
- }
-
- public static String permissionFormatted(String permission) throws IOException {
- if (!StringUtils.isNumeric(permission)) {
- return permission;
- }
- char[] ps = permission.toCharArray();
- return permissionFormatted(ps[0]) + permissionFormatted(ps[1]) + permissionFormatted(ps[2]);
- }
-
- public static String permissionFormatted(char i) throws IOException {
- int in = Integer.parseInt(String.valueOf(i));
- switch (in) {
- case 0:
- return "---";
- case 1:
- return "--x";
- case 2:
- return "-w-";
- case 3:
- return "-wx";
- case 4:
- return "r--";
- case 5:
- return "r-x";
- case 6:
- return "rw-";
- case 7:
- return "rwx";
- default:
- throw new IOException("Incorrent permission number " + in);
- }
- }
-
- public static FsPath getFsPath(String path, String... more) {
- String realPath = Paths.get(path, more).toFile().getPath();
- return new FsPath(realPath);
- }
+ public static final String CUR_DIR = ".";
+ public static final boolean WINDOWS = System.getProperty("os.name").startsWith("Windows");
+ public static final char SEPARATOR_CHAR = '/';
+ public static final String SEPARATOR = "/";
+ private static final Pattern hasDriveLetterSpecifier = Pattern.compile("^/?[a-zA-Z]:");
+
+ private URI uri;
+ private long modification_time;
+ private long access_time;
+ private long length;
+ private boolean isdir;
+ private String permissionString;
+ private String owner;
+ private String group;
+ private PosixFilePermission[] permissions;
+
+ public FsPath(String pathString) throws IllegalArgumentException {
+ checkPathArg(pathString);
+ // We can't use 'new URI(String)' directly, since it assumes things are
+ // escaped, which we don't require of Paths.
+
+ // add a slash in front of paths with Windows drive letters
+ if (hasWindowsDrive(pathString) && pathString.charAt(0) != '/') {
+ pathString = "/" + pathString;
+ }
+ // parse uri components
+ String scheme = null;
+ String authority = null;
+
+ int start = 0;
+ // parse uri scheme, if any
+ int colon = pathString.indexOf(':');
+ int slash = pathString.indexOf('/');
+ if ((colon != -1) && ((slash == -1) || (colon < slash))) { // has a scheme
+ scheme = pathString.substring(0, colon);
+ start = colon + 1;
+ }
+ // parse uri authority, if any
+ if (pathString.startsWith("//", start)
+ && (pathString.length() - start > 2)) { // has authority
+ int nextSlash = pathString.indexOf('/', start + 2);
+ int authEnd = nextSlash > 0 ? nextSlash : pathString.length();
+ authority = pathString.substring(start + 2, authEnd);
+ start = authEnd;
+ }
+
+ // uri path is the rest of the string -- query & fragment not supported
+ String path = pathString.substring(start, pathString.length());
+ initialize(scheme, authority, path, null);
+ }
+
+ public FsPath(String scheme, String authority, String path) {
+ checkPathArg(path);
+ // add a slash in front of paths with Windows drive letters
+ if (hasWindowsDrive(path) && path.charAt(0) != '/') {
+ path = "/" + path;
+ }
+ // add "./" in front of Linux relative paths so that a path containing
+ // a colon e.q. "a:b" will not be interpreted as scheme "a".
+ if (!WINDOWS && path.charAt(0) != '/') {
+ path = "./" + path;
+ }
+ initialize(scheme, authority, path, null);
+ }
+
+ private void checkPathArg(String path) throws IllegalArgumentException {
+ // disallow construction of a Path from an empty string
+ if (path == null) {
+ throw new IllegalArgumentException("Can not create a Path from a null string");
+ }
+ if (path.length() == 0) {
+ throw new IllegalArgumentException("Can not create a Path from an empty string");
+ }
+ }
+
+ private void initialize(String scheme, String authority, String path, String fragment) {
+ try {
+ this.uri =
+ new URI(scheme, authority, normalizePath(scheme, path), null, fragment)
+ .normalize();
+ } catch (URISyntaxException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ private static String normalizePath(String scheme, String path) {
+ // Remove double forward slashes.
+ path = StringUtils.replace(path, "//", "/");
+
+ // Remove backslashes if this looks like a Windows path. Avoid
+ // the substitution if it looks like a non-local URI.
+ if (WINDOWS
+ && (hasWindowsDrive(path)
+ || (scheme == null)
+ || (scheme.isEmpty())
+ || (scheme.equals("file")))) {
+ path = StringUtils.replace(path, "\\", "/");
+ }
+
+ // trim trailing slash from non-root path (ignoring windows drive)
+ int minLength = startPositionWithoutWindowsDrive(path) + 1;
+ if (path.length() > minLength && path.endsWith(SEPARATOR)) {
+ path = path.substring(0, path.length() - 1);
+ }
+
+ return path;
+ }
+
+ private static boolean hasWindowsDrive(String path) {
+ return (WINDOWS && hasDriveLetterSpecifier.matcher(path).find());
+ }
+
+ private static int startPositionWithoutWindowsDrive(String path) {
+ if (hasWindowsDrive(path)) {
+ return path.charAt(0) == SEPARATOR_CHAR ? 3 : 2;
+ } else {
+ return 0;
+ }
+ }
+
+ /** @return if no storage type pointed, hdfs type will returned */
+ public String getFsType() {
+ return getFsType("file");
+ }
+
+ public String getFsType(String defaultType) {
+ String scheme = uri.getScheme();
+ if (StringUtils.isEmpty(scheme)) {
+ return defaultType;
+ } else {
+ return scheme;
+ }
+ }
+
+ public File toFile() {
+ return new File(uri);
+ }
+
+ public Path toPath() {
+ return FileSystems.getDefault().getPath(uri.toString());
+ }
+
+ public boolean isOwner(String user) {
+ return owner.equals(user);
+ }
+
+ public FsPath getParent() throws IOException {
+ String path = uri.getPath();
+ int lastSlash = path.lastIndexOf('/');
+ int start = startPositionWithoutWindowsDrive(path);
+ if ((path.length() == start)
+ || // empty path
+ (lastSlash == start && path.length() == start + 1)) { // at root
+ return null;
+ }
+ String parent;
+ if (lastSlash == -1) {
+ parent = CUR_DIR;
+ } else {
+ parent = path.substring(0, lastSlash == start ? start + 1 : lastSlash);
+ }
+ return new FsPath(uri.getScheme(), uri.getAuthority(), parent);
+ }
+
+ public long getModification_time() {
+ return modification_time;
+ }
+
+ public void setModification_time(long modification_time) {
+ this.modification_time = modification_time;
+ }
+
+ public long getAccess_time() {
+ return access_time;
+ }
+
+ public void setAccess_time(long access_time) {
+ this.access_time = access_time;
+ }
+
+ public long getLength() {
+ return length;
+ }
+
+ public void setLength(long length) {
+ this.length = length;
+ }
+
+ public boolean isdir() {
+ return isdir;
+ }
+
+ public void setIsdir(boolean isdir) {
+ this.isdir = isdir;
+ }
+
+ public String getPermissionString() {
+ return permissionString;
+ }
+
+ public String getOwner() {
+ return owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public String getGroup() {
+ return group;
+ }
+
+ public void setGroup(String group) {
+ this.group = group;
+ }
+
+ public void setPermissions(Set<PosixFilePermission> permissions) throws IOException {
+ // this.permissions = FileSystem.permissionFormatted(permissions);
+ this.permissions = permissions.toArray(new PosixFilePermission[] {});
+ this.permissionString = PosixFilePermissions.toString(permissions);
+ }
+
+ public void setPermissionString(String permissionString) throws IOException {
+ this.permissionString = permissionFormatted(permissionString);
+ this.permissions =
+ PosixFilePermissions.fromString(this.permissionString)
+ .toArray(new PosixFilePermission[] {});
+ }
+
+ public String getPath() {
+ if (WINDOWS && !"hdfs".equals(getFsType())) {
+ return uri.getAuthority() + uri.getPath();
+ }
+ return uri.getPath();
+ }
+
+ public String getSchemaPath() {
+ if (WINDOWS && !"hdfs".equals(getFsType())) {
+ return getFsType() + "://" + uri.getAuthority() + uri.getPath();
+ }
+ return getFsType() + "://" + uri.getPath();
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(getClass().getSimpleName());
+ sb.append("{");
+ sb.append("path=").append(uri.getPath());
+ sb.append("; isDirectory=").append(isdir);
+ if (!isdir) {
+ sb.append("; length=").append(length);
+ }
+ sb.append("; modification_time=").append(modification_time);
+ sb.append("; access_time=").append(access_time);
+ sb.append("; owner=").append(owner);
+ sb.append("; group=").append(group);
+ sb.append("; permission=").append(permissions);
+ sb.append("}");
+ return sb.toString();
+ }
+
+ public static String permissionFormatted(String permission) throws IOException {
+ if (!StringUtils.isNumeric(permission)) {
+ return permission;
+ }
+ char[] ps = permission.toCharArray();
+ return permissionFormatted(ps[0]) + permissionFormatted(ps[1]) + permissionFormatted(ps[2]);
+ }
+
+ public static String permissionFormatted(char i) throws IOException {
+ int in = Integer.parseInt(String.valueOf(i));
+ switch (in) {
+ case 0:
+ return "---";
+ case 1:
+ return "--x";
+ case 2:
+ return "-w-";
+ case 3:
+ return "-wx";
+ case 4:
+ return "r--";
+ case 5:
+ return "r-x";
+ case 6:
+ return "rw-";
+ case 7:
+ return "rwx";
+ default:
+ throw new IOException("Incorrent permission number " + in);
+ }
+ }
+
+ public static FsPath getFsPath(String path, String... more) {
+ String realPath = Paths.get(path, more).toFile().getPath();
+ return new FsPath(realPath);
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/ByteTimeUtils.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/ByteTimeUtils.java
index da283b808..30f004652 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/ByteTimeUtils.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/ByteTimeUtils.java
@@ -17,6 +17,8 @@
package org.apache.linkis.common.utils;
+import com.google.common.collect.ImmutableMap;
+
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -25,358 +27,358 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.google.common.collect.ImmutableMap;
-
public class ByteTimeUtils {
- /** Returns a hash consistent with Spark's Utils.nonNegativeHash(). */
- public static int nonNegativeHash(Object obj) {
- if (obj == null) {
- return 0;
- }
- int hash = obj.hashCode();
- return hash != Integer.MIN_VALUE ? Math.abs(hash) : 0;
- }
-
- /**
- * Delete a file or directory and its contents recursively. Don't follow directories if they are
- * symlinks. Throws an exception if deletion is unsuccessful.
- */
- public static void deleteRecursively(File file) throws IOException {
- if (file == null) {
- return;
+ /** Returns a hash consistent with Spark's Utils.nonNegativeHash(). */
+ public static int nonNegativeHash(Object obj) {
+ if (obj == null) {
+ return 0;
+ }
+ int hash = obj.hashCode();
+ return hash != Integer.MIN_VALUE ? Math.abs(hash) : 0;
}
- if (file.isDirectory() && !isSymlink(file)) {
- IOException savedIOException = null;
- for (File child : listFilesSafely(file)) {
- try {
- deleteRecursively(child);
- } catch (IOException e) {
- // In case of multiple exceptions, only last one will be thrown
- savedIOException = e;
+ /**
+ * Delete a file or directory and its contents recursively. Don't follow directories if they are
+ * symlinks. Throws an exception if deletion is unsuccessful.
+ */
+ public static void deleteRecursively(File file) throws IOException {
+ if (file == null) {
+ return;
}
- }
- if (savedIOException != null) {
- throw savedIOException;
- }
- }
- boolean deleted = file.delete();
- // Delete can also fail if the file simply did not exist.
- if (!deleted && file.exists()) {
- throw new IOException("Failed to delete: " + file.getAbsolutePath());
- }
- }
-
- private static File[] listFilesSafely(File file) throws IOException {
- if (file.exists()) {
- File[] files = file.listFiles();
- if (files == null) {
- throw new IOException("Failed to list files for dir: " + file);
- }
- return files;
- } else {
- return new File[0];
- }
- }
-
- private static boolean isSymlink(File file) throws IOException {
- File fileInCanonicalDir = null;
- if (file.getParent() == null) {
- fileInCanonicalDir = file;
- } else {
- fileInCanonicalDir = new File(file.getParentFile().getCanonicalFile(), file.getName());
- }
- return !fileInCanonicalDir.getCanonicalFile().equals(fileInCanonicalDir.getAbsoluteFile());
- }
-
- private static final ImmutableMap<String, TimeUnit> timeSuffixes =
- ImmutableMap.<String, TimeUnit>builder()
- .put("us", TimeUnit.MICROSECONDS)
- .put("ms", TimeUnit.MILLISECONDS)
- .put("s", TimeUnit.SECONDS)
- .put("m", TimeUnit.MINUTES)
- .put("min", TimeUnit.MINUTES)
- .put("h", TimeUnit.HOURS)
- .put("d", TimeUnit.DAYS)
- .build();
-
- private static final ImmutableMap<String, ByteUnit> byteSuffixes =
- ImmutableMap.<String, ByteUnit>builder()
- .put("b", ByteUnit.BYTE)
- .put("k", ByteUnit.KiB)
- .put("kb", ByteUnit.KiB)
- .put("m", ByteUnit.MiB)
- .put("mb", ByteUnit.MiB)
- .put("g", ByteUnit.GiB)
- .put("gb", ByteUnit.GiB)
- .put("t", ByteUnit.TiB)
- .put("tb", ByteUnit.TiB)
- .put("p", ByteUnit.PiB)
- .put("pb", ByteUnit.PiB)
- .build();
-
- /**
- * Convert a passed time string (e.g. 50s, 100ms, or 250us) to a time count for internal use. If
- * no suffix is provided a direct conversion is attempted.
- */
- private static long parseTimeString(String str, TimeUnit unit) {
- String lower = str.toLowerCase().trim();
-
- try {
- Matcher m = Pattern.compile("(-?[0-9]+)([a-z]+)?").matcher(lower);
- if (!m.matches()) {
- throw new NumberFormatException("Failed to parse time string: " + str);
- }
-
- long val = Long.parseLong(m.group(1));
- String suffix = m.group(2);
-
- // Check for invalid suffixes
- if (suffix != null && !timeSuffixes.containsKey(suffix)) {
- throw new NumberFormatException("Invalid suffix: \"" + suffix + "\"");
- }
-
- // If suffix is valid use that, otherwise none was provided and use the default passed
- return unit.convert(val, suffix != null ? timeSuffixes.get(suffix) : unit);
- } catch (NumberFormatException e) {
- String timeError =
- "Time "
- + str
- + " must be specified as seconds (s), "
- + "milliseconds (ms), microseconds (us), minutes (m or min), hour (h), or day (d). "
- + "E.g. 50s, 100ms, or 250us.";
-
- throw new NumberFormatException(timeError + "\n" + e.getMessage());
+ if (file.isDirectory() && !isSymlink(file)) {
+ IOException savedIOException = null;
+ for (File child : listFilesSafely(file)) {
+ try {
+ deleteRecursively(child);
+ } catch (IOException e) {
+ // In case of multiple exceptions, only last one will be thrown
+ savedIOException = e;
+ }
+ }
+ if (savedIOException != null) {
+ throw savedIOException;
+ }
+ }
+
+ boolean deleted = file.delete();
+ // Delete can also fail if the file simply did not exist.
+ if (!deleted && file.exists()) {
+ throw new IOException("Failed to delete: " + file.getAbsolutePath());
+ }
}
- }
-
- /**
- * Convert a time parameter such as (50s, 100ms, or 250us) to milliseconds for internal use. If no
- * suffix is provided, the passed number is assumed to be in ms.
- */
- public static long timeStringAsMs(String str) {
- return parseTimeString(str, TimeUnit.MILLISECONDS);
- }
-
- /**
- * Convert a time parameter such as (50s, 100ms, or 250us) to seconds for internal use. If no
- * suffix is provided, the passed number is assumed to be in seconds.
- */
- public static long timeStringAsSec(String str) {
- return parseTimeString(str, TimeUnit.SECONDS);
- }
-
- /** Returns a human-readable string representing a duration such as "35ms" */
- public static String msDurationToString(long ms) {
- int second = 1000;
- int minute = 60 * second;
- int hour = 60 * minute;
- Locale locale = Locale.US;
- if (ms < second) {
- return String.format(locale, "%d ms", ms);
- } else if (ms < minute) {
- return String.format(locale, "%.1f s", ms * 1f / second);
- } else if (ms < hour) {
- return String.format(locale, "%.1f m", ms * 1f / minute);
- } else {
- return String.format(locale, "%.2f h", ms * 1f / hour);
+
+ private static File[] listFilesSafely(File file) throws IOException {
+ if (file.exists()) {
+ File[] files = file.listFiles();
+ if (files == null) {
+ throw new IOException("Failed to list files for dir: " + file);
+ }
+ return files;
+ } else {
+ return new File[0];
+ }
}
- }
-
- /**
- * Convert a passed byte string (e.g. 50b, 100kb, or 250mb) to a ByteUnit for internal use. If no
- * suffix is provided a direct conversion of the provided default is attempted.
- */
- private static long parseByteString(String str, ByteUnit unit) {
- String lower = str.toLowerCase().trim();
-
- try {
- Matcher m = Pattern.compile("([0-9]+)\\s?([a-zA-Z]+)?").matcher(lower);
- // Matcher fractionMatcher =
- // Pattern.compile("([0-9]+\\.[0-9]+)\\s?([a-z]+)?").matcher(lower);
- Matcher fractionMatcher =
- Pattern.compile("([0-9]+\\.[0-9]+)\\s?([a-zA-Z]{1,2})?").matcher(lower);
-
- long size = 0;
- int sub = 1;
- String suffix;
- if (fractionMatcher.matches()) {
- double val = Double.parseDouble(fractionMatcher.group(1));
- size = (long) (val * 100);
- suffix = fractionMatcher.group(2);
- sub = 100;
- } else if (m.matches()) {
- size = Long.parseLong(m.group(1));
- suffix = m.group(2);
- } else {
- throw new NumberFormatException("Failed to parse byte string: " + str);
- }
- suffix = suffix.toLowerCase();
- // Check for invalid suffixes
- if (suffix != null && !byteSuffixes.containsKey(suffix)) {
- throw new NumberFormatException("Invalid suffix: \"" + suffix + "\"");
- }
- // If suffix is valid use that, otherwise none was provided and use the default passed
- return unit.convertFrom(size, suffix != null ? byteSuffixes.get(suffix) : unit) / sub;
-
- } catch (NumberFormatException e) {
- String timeError =
- "Error size string "
- + str
- + ". Size must be specified as bytes (b), "
- + "kibibytes (k), mebibytes (m), gibibytes (g), tebibytes (t), or pebibytes(p). "
- + "E.g. 50b, 100k, or 250m.";
-
- throw new IllegalArgumentException(timeError, e);
+
+ private static boolean isSymlink(File file) throws IOException {
+ File fileInCanonicalDir = null;
+ if (file.getParent() == null) {
+ fileInCanonicalDir = file;
+ } else {
+ fileInCanonicalDir = new File(file.getParentFile().getCanonicalFile(), file.getName());
+ }
+ return !fileInCanonicalDir.getCanonicalFile().equals(fileInCanonicalDir.getAbsoluteFile());
}
- }
-
- /** Convert a quantity in bytes to a human-readable string such as "4.0 MB". */
- public static String bytesToString(long size) {
- long TB = 1L << 40;
- long GB = 1L << 30;
- long MB = 1L << 20;
- long KB = 1L << 10;
-
- double value;
- String unit;
- if (size >= 2 * TB || -2 * TB >= size) {
- value = size * 1f / TB;
- unit = "TB";
- } else if (size >= 2 * GB || -2 * GB >= size) {
- value = size * 1f / GB;
- unit = "GB";
- } else if (size >= 2 * MB || -2 * MB >= size) {
- value = size * 1f / MB;
- unit = "MB";
- } else if (size >= 2 * KB || -2 * KB >= size) {
- value = size * 1f / KB;
- unit = "KB";
- } else {
- value = size * 1f;
- unit = "B";
+
+ private static final ImmutableMap<String, TimeUnit> timeSuffixes =
+ ImmutableMap.<String, TimeUnit>builder()
+ .put("us", TimeUnit.MICROSECONDS)
+ .put("ms", TimeUnit.MILLISECONDS)
+ .put("s", TimeUnit.SECONDS)
+ .put("m", TimeUnit.MINUTES)
+ .put("min", TimeUnit.MINUTES)
+ .put("h", TimeUnit.HOURS)
+ .put("d", TimeUnit.DAYS)
+ .build();
+
+ private static final ImmutableMap<String, ByteUnit> byteSuffixes =
+ ImmutableMap.<String, ByteUnit>builder()
+ .put("b", ByteUnit.BYTE)
+ .put("k", ByteUnit.KiB)
+ .put("kb", ByteUnit.KiB)
+ .put("m", ByteUnit.MiB)
+ .put("mb", ByteUnit.MiB)
+ .put("g", ByteUnit.GiB)
+ .put("gb", ByteUnit.GiB)
+ .put("t", ByteUnit.TiB)
+ .put("tb", ByteUnit.TiB)
+ .put("p", ByteUnit.PiB)
+ .put("pb", ByteUnit.PiB)
+ .build();
+
+ /**
+ * Convert a passed time string (e.g. 50s, 100ms, or 250us) to a time count for internal use. If
+ * no suffix is provided a direct conversion is attempted.
+ */
+ private static long parseTimeString(String str, TimeUnit unit) {
+ String lower = str.toLowerCase().trim();
+
+ try {
+ Matcher m = Pattern.compile("(-?[0-9]+)([a-z]+)?").matcher(lower);
+ if (!m.matches()) {
+ throw new NumberFormatException("Failed to parse time string: " + str);
+ }
+
+ long val = Long.parseLong(m.group(1));
+ String suffix = m.group(2);
+
+ // Check for invalid suffixes
+ if (suffix != null && !timeSuffixes.containsKey(suffix)) {
+ throw new NumberFormatException("Invalid suffix: \"" + suffix + "\"");
+ }
+
+ // If suffix is valid use that, otherwise none was provided and use the default passed
+ return unit.convert(val, suffix != null ? timeSuffixes.get(suffix) : unit);
+ } catch (NumberFormatException e) {
+ String timeError =
+ "Time "
+ + str
+ + " must be specified as seconds (s), "
+ + "milliseconds (ms), microseconds (us), minutes (m or min), hour (h), or day (d). "
+ + "E.g. 50s, 100ms, or 250us.";
+
+ throw new NumberFormatException(timeError + "\n" + e.getMessage());
+ }
}
- return String.format(Locale.US, "%.1f %s", value, unit);
- }
-
- /**
- * Convert a passed byte string (e.g. 50b, 100k, or 250m) to bytes for internal use.
- *
- * <p>If no suffix is provided, the passed number is assumed to be in bytes.
- */
- public static long byteStringAsBytes(String str) {
- return parseByteString(str, ByteUnit.BYTE);
- }
-
- /**
- * Convert a passed byte string (e.g. 50b, 100k, or 250m) to kibibytes for internal use.
- *
- * <p>If no suffix is provided, the passed number is assumed to be in kibibytes.
- */
- public static long byteStringAsKb(String str) {
- return parseByteString(str, ByteUnit.KiB);
- }
-
- /**
- * Convert a passed byte string (e.g. 50b, 100k, or 250m) to mebibytes for internal use.
- *
- * <p>If no suffix is provided, the passed number is assumed to be in mebibytes.
- */
- public static long byteStringAsMb(String str) {
- return parseByteString(str, ByteUnit.MiB);
- }
-
- /**
- * Convert a passed byte string (e.g. 50b, 100k, or 250m) to gibibytes for internal use.
- *
- * <p>If no suffix is provided, the passed number is assumed to be in gibibytes.
- */
- public static long byteStringAsGb(String str) {
- return parseByteString(str, ByteUnit.GiB);
- }
-
- /**
- * Returns a byte array with the buffer's contents, trying to avoid copying the data if possible.
- */
- public static byte[] bufferToArray(ByteBuffer buffer) {
- if (buffer.hasArray()
- && buffer.arrayOffset() == 0
- && buffer.array().length == buffer.remaining()) {
- return buffer.array();
- } else {
- byte[] bytes = new byte[buffer.remaining()];
- buffer.get(bytes);
- return bytes;
+
+ /**
+ * Convert a time parameter such as (50s, 100ms, or 250us) to milliseconds for internal use. If
+ * no suffix is provided, the passed number is assumed to be in ms.
+ */
+ public static long timeStringAsMs(String str) {
+ return parseTimeString(str, TimeUnit.MILLISECONDS);
}
- }
-
- enum ByteUnit {
- BYTE(1),
- KiB(1024L),
- MiB((long) Math.pow(1024L, 2L)),
- GiB((long) Math.pow(1024L, 3L)),
- TiB((long) Math.pow(1024L, 4L)),
- PiB((long) Math.pow(1024L, 5L));
-
- private ByteUnit(long multiplier) {
- this.multiplier = multiplier;
+
+ /**
+ * Convert a time parameter such as (50s, 100ms, or 250us) to seconds for internal use. If no
+ * suffix is provided, the passed number is assumed to be in seconds.
+ */
+ public static long timeStringAsSec(String str) {
+ return parseTimeString(str, TimeUnit.SECONDS);
}
- // Interpret the provided number (d) with suffix (u) as this unit type.
- // E.g. KiB.interpret(1, MiB) interprets 1MiB as its KiB representation = 1024k
- public long convertFrom(long d, ByteUnit u) {
- return u.convertTo(d, this);
+ /** Returns a human-readable string representing a duration such as "35ms" */
+ public static String msDurationToString(long ms) {
+ int second = 1000;
+ int minute = 60 * second;
+ int hour = 60 * minute;
+ Locale locale = Locale.US;
+ if (ms < second) {
+ return String.format(locale, "%d ms", ms);
+ } else if (ms < minute) {
+ return String.format(locale, "%.1f s", ms * 1f / second);
+ } else if (ms < hour) {
+ return String.format(locale, "%.1f m", ms * 1f / minute);
+ } else {
+ return String.format(locale, "%.2f h", ms * 1f / hour);
+ }
}
- // Convert the provided number (d) interpreted as this unit type to unit type (u).
- public long convertTo(long d, ByteUnit u) {
- if (multiplier > u.multiplier) {
- long ratio = multiplier / u.multiplier;
- if (Long.MAX_VALUE / ratio < d) {
- throw new IllegalArgumentException(
- "Conversion of "
- + d
- + " exceeds Long.MAX_VALUE in "
- + name()
- + ". Try a larger unit (e.g. MiB instead of KiB)");
+ /**
+ * Convert a passed byte string (e.g. 50b, 100kb, or 250mb) to a ByteUnit for internal use. If
+ * no suffix is provided a direct conversion of the provided default is attempted.
+ */
+ private static long parseByteString(String str, ByteUnit unit) {
+ String lower = str.toLowerCase().trim();
+
+ try {
+ Matcher m = Pattern.compile("([0-9]+)\\s?([a-zA-Z]+)?").matcher(lower);
+ // Matcher fractionMatcher =
+ // Pattern.compile("([0-9]+\\.[0-9]+)\\s?([a-z]+)?").matcher(lower);
+ Matcher fractionMatcher =
+ Pattern.compile("([0-9]+\\.[0-9]+)\\s?([a-zA-Z]{1,2})?").matcher(lower);
+
+ long size = 0;
+ int sub = 1;
+ String suffix;
+ if (fractionMatcher.matches()) {
+ double val = Double.parseDouble(fractionMatcher.group(1));
+ size = (long) (val * 100);
+ suffix = fractionMatcher.group(2);
+ sub = 100;
+ } else if (m.matches()) {
+ size = Long.parseLong(m.group(1));
+ suffix = m.group(2);
+ } else {
+ throw new NumberFormatException("Failed to parse byte string: " + str);
+ }
+ suffix = suffix.toLowerCase();
+ // Check for invalid suffixes
+ if (suffix != null && !byteSuffixes.containsKey(suffix)) {
+ throw new NumberFormatException("Invalid suffix: \"" + suffix + "\"");
+ }
+ // If suffix is valid use that, otherwise none was provided and use the default passed
+ return unit.convertFrom(size, suffix != null ? byteSuffixes.get(suffix) : unit) / sub;
+
+ } catch (NumberFormatException e) {
+ String timeError =
+ "Error size string "
+ + str
+ + ". Size must be specified as bytes (b), "
+ + "kibibytes (k), mebibytes (m), gibibytes (g), tebibytes (t), or pebibytes(p). "
+ + "E.g. 50b, 100k, or 250m.";
+
+ throw new IllegalArgumentException(timeError, e);
}
- return d * ratio;
- } else {
- // Perform operations in this order to avoid potential overflow
- // when computing d * multiplier
- return d / (u.multiplier / multiplier);
- }
}
- public double toBytes(long d) {
- if (d < 0) {
- throw new IllegalArgumentException("Negative size value. Size must be positive: " + d);
- }
- return d * multiplier;
+ /** Convert a quantity in bytes to a human-readable string such as "4.0 MB". */
+ public static String bytesToString(long size) {
+ long TB = 1L << 40;
+ long GB = 1L << 30;
+ long MB = 1L << 20;
+ long KB = 1L << 10;
+
+ double value;
+ String unit;
+ if (size >= 2 * TB || -2 * TB >= size) {
+ value = size * 1f / TB;
+ unit = "TB";
+ } else if (size >= 2 * GB || -2 * GB >= size) {
+ value = size * 1f / GB;
+ unit = "GB";
+ } else if (size >= 2 * MB || -2 * MB >= size) {
+ value = size * 1f / MB;
+ unit = "MB";
+ } else if (size >= 2 * KB || -2 * KB >= size) {
+ value = size * 1f / KB;
+ unit = "KB";
+ } else {
+ value = size * 1f;
+ unit = "B";
+ }
+ return String.format(Locale.US, "%.1f %s", value, unit);
}
- public long toKiB(long d) {
- return convertTo(d, KiB);
+ /**
+ * Convert a passed byte string (e.g. 50b, 100k, or 250m) to bytes for internal use.
+ *
+ * <p>If no suffix is provided, the passed number is assumed to be in bytes.
+ */
+ public static long byteStringAsBytes(String str) {
+ return parseByteString(str, ByteUnit.BYTE);
}
- public long toMiB(long d) {
- return convertTo(d, MiB);
+ /**
+ * Convert a passed byte string (e.g. 50b, 100k, or 250m) to kibibytes for internal use.
+ *
+ * <p>If no suffix is provided, the passed number is assumed to be in kibibytes.
+ */
+ public static long byteStringAsKb(String str) {
+ return parseByteString(str, ByteUnit.KiB);
}
- public long toGiB(long d) {
- return convertTo(d, GiB);
+ /**
+ * Convert a passed byte string (e.g. 50b, 100k, or 250m) to mebibytes for internal use.
+ *
+ * <p>If no suffix is provided, the passed number is assumed to be in mebibytes.
+ */
+ public static long byteStringAsMb(String str) {
+ return parseByteString(str, ByteUnit.MiB);
}
- public long toTiB(long d) {
- return convertTo(d, TiB);
+ /**
+ * Convert a passed byte string (e.g. 50b, 100k, or 250m) to gibibytes for internal use.
+ *
+ * <p>If no suffix is provided, the passed number is assumed to be in gibibytes.
+ */
+ public static long byteStringAsGb(String str) {
+ return parseByteString(str, ByteUnit.GiB);
}
- public long toPiB(long d) {
- return convertTo(d, PiB);
+ /**
+ * Returns a byte array with the buffer's contents, trying to avoid copying the data if
+ * possible.
+ */
+ public static byte[] bufferToArray(ByteBuffer buffer) {
+ if (buffer.hasArray()
+ && buffer.arrayOffset() == 0
+ && buffer.array().length == buffer.remaining()) {
+ return buffer.array();
+ } else {
+ byte[] bytes = new byte[buffer.remaining()];
+ buffer.get(bytes);
+ return bytes;
+ }
}
- private final long multiplier;
- }
+ enum ByteUnit {
+ BYTE(1),
+ KiB(1024L),
+ MiB((long) Math.pow(1024L, 2L)),
+ GiB((long) Math.pow(1024L, 3L)),
+ TiB((long) Math.pow(1024L, 4L)),
+ PiB((long) Math.pow(1024L, 5L));
+
+ private ByteUnit(long multiplier) {
+ this.multiplier = multiplier;
+ }
+
+ // Interpret the provided number (d) with suffix (u) as this unit type.
+ // E.g. KiB.interpret(1, MiB) interprets 1MiB as its KiB representation = 1024k
+ public long convertFrom(long d, ByteUnit u) {
+ return u.convertTo(d, this);
+ }
+
+ // Convert the provided number (d) interpreted as this unit type to unit type (u).
+ public long convertTo(long d, ByteUnit u) {
+ if (multiplier > u.multiplier) {
+ long ratio = multiplier / u.multiplier;
+ if (Long.MAX_VALUE / ratio < d) {
+ throw new IllegalArgumentException(
+ "Conversion of "
+ + d
+ + " exceeds Long.MAX_VALUE in "
+ + name()
+ + ". Try a larger unit (e.g. MiB instead of KiB)");
+ }
+ return d * ratio;
+ } else {
+ // Perform operations in this order to avoid potential overflow
+ // when computing d * multiplier
+ return d / (u.multiplier / multiplier);
+ }
+ }
+
+ public double toBytes(long d) {
+ if (d < 0) {
+ throw new IllegalArgumentException(
+ "Negative size value. Size must be positive: " + d);
+ }
+ return d * multiplier;
+ }
+
+ public long toKiB(long d) {
+ return convertTo(d, KiB);
+ }
+
+ public long toMiB(long d) {
+ return convertTo(d, MiB);
+ }
+
+ public long toGiB(long d) {
+ return convertTo(d, GiB);
+ }
+
+ public long toTiB(long d) {
+ return convertTo(d, TiB);
+ }
+
+ public long toPiB(long d) {
+ return convertTo(d, PiB);
+ }
+
+ private final long multiplier;
+ }
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java
index 44fd34838..c4058bbdb 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/DESUtil.java
@@ -28,111 +28,111 @@ import java.security.SecureRandom;
import java.util.Base64;
public class DESUtil {
- private static final String DES = "DES";
- private static final String XBYTE = "X";
-
- /**
- * Description Encryption based on key values(Description 根据键值进行加密)
- *
- * @param data
- * @param key Encryption key byte array(加密键byte数组)
- * @return Ciphertext(密文)
- * @throws Exception
- */
- public static String encrypt(String data, String key) throws Exception {
- if (StringUtils.isNotBlank(key) && key.length() < 8) {
- int i = key.length();
- while ((8 - i) > 0) {
- key += XBYTE;
- i++;
- }
+ private static final String DES = "DES";
+ private static final String XBYTE = "X";
+
+ /**
+ * Description Encryption based on key values(Description 根据键值进行加密)
+ *
+ * @param data
+ * @param key Encryption key byte array(加密键byte数组)
+ * @return Ciphertext(密文)
+ * @throws Exception
+ */
+ public static String encrypt(String data, String key) throws Exception {
+ if (StringUtils.isNotBlank(key) && key.length() < 8) {
+ int i = key.length();
+ while ((8 - i) > 0) {
+ key += XBYTE;
+ i++;
+ }
+ }
+ byte[] bt = encrypt(data.getBytes(), key.getBytes());
+ return Base64.getMimeEncoder().encodeToString(bt);
}
- byte[] bt = encrypt(data.getBytes(), key.getBytes());
- return Base64.getMimeEncoder().encodeToString(bt);
- }
-
- /**
- * Description Encryption based on key values(Description 根据键值进行加密)
- *
- * @param data
- * @param key Encryption key byte array(加密键byte数组)
- * @return Ciphertext(密文)
- * @throws Exception
- */
- public static String decrypt(String data, String key) throws Exception {
- if (StringUtils.isBlank(data)) {
- return null;
+
+ /**
+ * Description Encryption based on key values(Description 根据键值进行加密)
+ *
+ * @param data
+ * @param key Encryption key byte array(加密键byte数组)
+ * @return Ciphertext(密文)
+ * @throws Exception
+ */
+ public static String decrypt(String data, String key) throws Exception {
+ if (StringUtils.isBlank(data)) {
+ return null;
+ }
+ if (StringUtils.isNotBlank(key) && key.length() < 8) {
+ int i = key.length();
+ while ((8 - i) > 0) {
+ key += XBYTE;
+ i++;
+ }
+ }
+ Base64.Decoder decoder = Base64.getMimeDecoder();
+ byte[] buf = decoder.decode(data);
+ byte[] bt = decrypt(buf, key.getBytes());
+ return new String(bt);
}
- if (StringUtils.isNotBlank(key) && key.length() < 8) {
- int i = key.length();
- while ((8 - i) > 0) {
- key += XBYTE;
- i++;
- }
+
+ /**
+ * Description Encryption based on key values(Description 根据键值进行加密)
+ *
+ * @param data
+ * @param key Encryption key byte array(加密键byte数组)
+ * @return Ciphertext(密文)
+ * @throws Exception
+ */
+ private static byte[] encrypt(byte[] data, byte[] key) throws Exception {
+ // Generate a trusted random number source(生成一个可信任的随机数源)
+ SecureRandom sr = new SecureRandom();
+
+ // Create a DESKeySpec object from the original key data（从原始密钥数据创建DESKeySpec对象）
+ DESKeySpec dks = new DESKeySpec(key);
+
+ // Create a key factory and use it to convert the DESKeySpec to a SecretKey
+ // object（创建一个密钥工厂，然后用它把DESKeySpec转换成SecretKey对象）
+ SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
+ SecretKey securekey = keyFactory.generateSecret(dks);
+
+ // The Cipher object actually completes the encryption operation.（Cipher对象实际完成加密操作）
+ Cipher cipher = Cipher.getInstance(DES);
+
+ // Initialize a Cipher object with a key（用密钥初始化Cipher对象）
+ cipher.init(Cipher.ENCRYPT_MODE, securekey, sr);
+
+ return cipher.doFinal(data);
}
- Base64.Decoder decoder = Base64.getMimeDecoder();
- byte[] buf = decoder.decode(data);
- byte[] bt = decrypt(buf, key.getBytes());
- return new String(bt);
- }
-
- /**
- * Description Encryption based on key values(Description 根据键值进行加密)
- *
- * @param data
- * @param key Encryption key byte array(加密键byte数组)
- * @return Ciphertext(密文)
- * @throws Exception
- */
- private static byte[] encrypt(byte[] data, byte[] key) throws Exception {
- // Generate a trusted random number source(生成一个可信任的随机数源)
- SecureRandom sr = new SecureRandom();
-
- // Create a DESKeySpec object from the original key data（从原始密钥数据创建DESKeySpec对象）
- DESKeySpec dks = new DESKeySpec(key);
-
- // Create a key factory and use it to convert the DESKeySpec to a SecretKey
- // object（创建一个密钥工厂，然后用它把DESKeySpec转换成SecretKey对象）
- SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
- SecretKey securekey = keyFactory.generateSecret(dks);
-
- // The Cipher object actually completes the encryption operation.（Cipher对象实际完成加密操作）
- Cipher cipher = Cipher.getInstance(DES);
-
- // Initialize a Cipher object with a key（用密钥初始化Cipher对象）
- cipher.init(Cipher.ENCRYPT_MODE, securekey, sr);
-
- return cipher.doFinal(data);
- }
-
- /**
- * Description Encryption based on key values(Description 根据键值进行加密)
- *
- * @param data
- * @param key Encryption key byte array(加密键byte数组)
- * @return Ciphertext(密文)
- * @throws Exception
- */
- private static byte[] decrypt(byte[] data, byte[] key) throws Exception {
- // Generate a trusted random number source（生成一个可信任的随机数源）
- SecureRandom sr = new SecureRandom();
-
- // Create a DESKeySpec object from the original key data（从原始密钥数据创建DESKeySpec对象）
- DESKeySpec dks = new DESKeySpec(key);
-
- // Create a key factory and use it to convert the DESKeySpec to a SecretKey
- // object（创建一个密钥工厂，然后用它把DESKeySpec转换成SecretKey对象）
- SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
- SecretKey securekey = keyFactory.generateSecret(dks);
-
- // The Cipher object actually completes the decryption operation.（Cipher对象实际完成解密操作）
- Cipher cipher = Cipher.getInstance(DES);
-
- // Initialize a Cipher object with a key（用密钥初始化Cipher对象）
- cipher.init(Cipher.DECRYPT_MODE, securekey, sr);
-
- return cipher.doFinal(data);
- }
-
- public static void main(String[] args) throws Exception {}
+
+ /**
+ * Description Encryption based on key values(Description 根据键值进行加密)
+ *
+ * @param data
+ * @param key Encryption key byte array(加密键byte数组)
+ * @return Ciphertext(密文)
+ * @throws Exception
+ */
+ private static byte[] decrypt(byte[] data, byte[] key) throws Exception {
+ // Generate a trusted random number source（生成一个可信任的随机数源）
+ SecureRandom sr = new SecureRandom();
+
+ // Create a DESKeySpec object from the original key data（从原始密钥数据创建DESKeySpec对象）
+ DESKeySpec dks = new DESKeySpec(key);
+
+ // Create a key factory and use it to convert the DESKeySpec to a SecretKey
+ // object（创建一个密钥工厂，然后用它把DESKeySpec转换成SecretKey对象）
+ SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(DES);
+ SecretKey securekey = keyFactory.generateSecret(dks);
+
+ // The Cipher object actually completes the decryption operation.（Cipher对象实际完成解密操作）
+ Cipher cipher = Cipher.getInstance(DES);
+
+ // Initialize a Cipher object with a key（用密钥初始化Cipher对象）
+ cipher.init(Cipher.DECRYPT_MODE, securekey, sr);
+
+ return cipher.doFinal(data);
+ }
+
+ public static void main(String[] args) throws Exception {}
}
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/VariableOperationUtils.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/VariableOperationUtils.java
index 53d95231e..657cd0bdf 100644
--- a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/VariableOperationUtils.java
+++ b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/VariableOperationUtils.java
@@ -18,6 +18,10 @@ package org.apache.linkis.common.utils;
import org.apache.linkis.common.exception.VariableOperationFailedException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -27,183 +31,184 @@ import java.util.Date;
import java.util.Iterator;
import java.util.Map;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
/** support variable operation #{yyyyMMdd%-1d}/#{yyyy-MM-01%-2M} Date: 2021/5/7 11:10 */
public class VariableOperationUtils {
- private static final String DOLLAR = "&";
- private static final String PLACEHOLDER_SPLIT = "%";
- private static final String PLACEHOLDER_LEFT = "{";
- private static final String LEFT = DOLLAR + PLACEHOLDER_LEFT;
- private static final String PLACEHOLDER_RIGHT = "}";
- private static final String CYCLE_YEAR = "y";
- private static final String CYCLE_MONTH = "M";
- private static final String CYCLE_DAY = "d";
- private static final String CYCLE_HOUR = "H";
- private static final String CYCLE_MINUTE = "m";
- private static final String CYCLE_SECOND = "s";
- private static final String[] CYCLES =
- new String[] {CYCLE_YEAR, CYCLE_MONTH, CYCLE_DAY, CYCLE_HOUR, CYCLE_MINUTE, CYCLE_SECOND};
-
- /**
- * yyyy-MM-dd HH:mm:ss
- *
- * @param date
- * @return
- */
- public static ZonedDateTime toZonedDateTime(Date date) {
- Instant instant = date.toInstant();
- ZoneId zoneId = ZoneId.systemDefault();
- LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
- return ZonedDateTime.of(localDateTime, zoneId);
- }
+ private static final String DOLLAR = "&";
+ private static final String PLACEHOLDER_SPLIT = "%";
+ private static final String PLACEHOLDER_LEFT = "{";
+ private static final String LEFT = DOLLAR + PLACEHOLDER_LEFT;
+ private static final String PLACEHOLDER_RIGHT = "}";
+ private static final String CYCLE_YEAR = "y";
+ private static final String CYCLE_MONTH = "M";
+ private static final String CYCLE_DAY = "d";
+ private static final String CYCLE_HOUR = "H";
+ private static final String CYCLE_MINUTE = "m";
+ private static final String CYCLE_SECOND = "s";
+ private static final String[] CYCLES =
+ new String[] {
+ CYCLE_YEAR, CYCLE_MONTH, CYCLE_DAY, CYCLE_HOUR, CYCLE_MINUTE, CYCLE_SECOND
+ };
- /**
- * json support variable operation
- *
- * @param dateTime
- * @param str
- * @return
- */
- public static String replaces(ZonedDateTime dateTime, String str)
- throws VariableOperationFailedException {
- return replaces(dateTime, str, true);
- }
-
- /**
- * json support variable operation
- *
- * @param dateTime
- * @param str
- * @param format
- * @return
- */
- public static String replaces(ZonedDateTime dateTime, String str, boolean format)
- throws VariableOperationFailedException {
- try {
- JsonNode rootNode = JsonUtils.jackson().readTree(str);
- if (rootNode.isArray() || rootNode.isObject()) {
- replaceJson(dateTime, rootNode);
- return rootNode.toString();
- }
- } catch (Exception e) {
- return replace(dateTime, str);
+ /**
+ * yyyy-MM-dd HH:mm:ss
+ *
+ * @param date
+ * @return
+ */
+ public static ZonedDateTime toZonedDateTime(Date date) {
+ Instant instant = date.toInstant();
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+ return ZonedDateTime.of(localDateTime, zoneId);
}
- return replace(dateTime, str);
- }
- /**
- * @param dateTime
- * @param str
- * @return
- */
- private static String replace(ZonedDateTime dateTime, String str)
- throws VariableOperationFailedException {
- StringBuilder buffer = new StringBuilder(str);
- int startIndex = str.indexOf(LEFT);
+ /**
+ * json support variable operation
+ *
+ * @param dateTime
+ * @param str
+ * @return
+ */
+ public static String replaces(ZonedDateTime dateTime, String str)
+ throws VariableOperationFailedException {
+ return replaces(dateTime, str, true);
+ }
- while (startIndex != -1) {
- int endIndex = buffer.indexOf(PLACEHOLDER_RIGHT, startIndex);
- if (endIndex != -1) {
- String placeHolder = buffer.substring(startIndex, endIndex + 1);
- String content = placeHolder.replace(LEFT, "").replace(PLACEHOLDER_RIGHT, "").trim();
- String[] parts = content.split(PLACEHOLDER_SPLIT);
+ /**
+ * json support variable operation
+ *
+ * @param dateTime
+ * @param str
+ * @param format
+ * @return
+ */
+ public static String replaces(ZonedDateTime dateTime, String str, boolean format)
+ throws VariableOperationFailedException {
try {
- ZonedDateTime ndt = dateTime;
- for (int i = 1; i < parts.length; i++) {
- ndt = changeDateTime(ndt, parts[i]);
- }
-
- String newContent = ndt.format(DateTimeFormatter.ofPattern(parts[0]));
- if (buffer.substring(startIndex, endIndex + 1).contains(DOLLAR)) {
- buffer.replace(startIndex, endIndex + 1, newContent);
- }
- startIndex = buffer.indexOf(PLACEHOLDER_LEFT, startIndex + newContent.length());
- } catch (IllegalArgumentException e1) {
- startIndex = buffer.indexOf(PLACEHOLDER_LEFT, endIndex);
- } catch (Exception e2) {
- throw new VariableOperationFailedException(
- 20050, "variable operation expression" + e2.getMessage(), e2);
+ JsonNode rootNode = JsonUtils.jackson().readTree(str);
+ if (rootNode.isArray() || rootNode.isObject()) {
+ replaceJson(dateTime, rootNode);
+ return rootNode.toString();
+ }
+ } catch (Exception e) {
+ return replace(dateTime, str);
}
- } else {
- startIndex = -1; // leave while
- }
+ return replace(dateTime, str);
}
- return buffer.toString();
- }
- /**
- * @param dateTime
- * @param str
- * @return
- */
- private static ZonedDateTime changeDateTime(ZonedDateTime dateTime, String str) {
- if (str == null || str.isEmpty()) {
- return dateTime;
- }
+ /**
+ * @param dateTime
+ * @param str
+ * @return
+ */
+ private static String replace(ZonedDateTime dateTime, String str)
+ throws VariableOperationFailedException {
+ StringBuilder buffer = new StringBuilder(str);
+ int startIndex = str.indexOf(LEFT);
+
+ while (startIndex != -1) {
+ int endIndex = buffer.indexOf(PLACEHOLDER_RIGHT, startIndex);
+ if (endIndex != -1) {
+ String placeHolder = buffer.substring(startIndex, endIndex + 1);
+ String content =
+ placeHolder.replace(LEFT, "").replace(PLACEHOLDER_RIGHT, "").trim();
+ String[] parts = content.split(PLACEHOLDER_SPLIT);
+ try {
+ ZonedDateTime ndt = dateTime;
+ for (int i = 1; i < parts.length; i++) {
+ ndt = changeDateTime(ndt, parts[i]);
+ }
- for (String cycle : CYCLES) {
- if (str.contains(cycle)) {
- switch (cycle) {
- case CYCLE_DAY:
- return dateTime.plusDays(Integer.parseInt(str.replace(CYCLE_DAY, "")));
- case CYCLE_HOUR:
- return dateTime.plusHours(Integer.parseInt(str.replace(CYCLE_HOUR, "")));
- case CYCLE_MINUTE:
- return dateTime.plusMinutes(Integer.parseInt(str.replace(CYCLE_MINUTE, "")));
- case CYCLE_MONTH:
- return dateTime.plusMonths(Integer.parseInt(str.replace(CYCLE_MONTH, "")));
- case CYCLE_SECOND:
- return dateTime.plusSeconds(Integer.parseInt(str.replace(CYCLE_SECOND, "")));
- case CYCLE_YEAR:
- return dateTime.plusYears(Integer.parseInt(str.replace(CYCLE_YEAR, "")));
- default:
- break;
+ String newContent = ndt.format(DateTimeFormatter.ofPattern(parts[0]));
+ if (buffer.substring(startIndex, endIndex + 1).contains(DOLLAR)) {
+ buffer.replace(startIndex, endIndex + 1, newContent);
+ }
+ startIndex = buffer.indexOf(PLACEHOLDER_LEFT, startIndex + newContent.length());
+ } catch (IllegalArgumentException e1) {
+ startIndex = buffer.indexOf(PLACEHOLDER_LEFT, endIndex);
+ } catch (Exception e2) {
+ throw new VariableOperationFailedException(
+ 20050, "variable operation expression" + e2.getMessage(), e2);
+ }
+ } else {
+ startIndex = -1; // leave while
+ }
}
- }
+ return buffer.toString();
}
- return dateTime;
- }
+ /**
+ * @param dateTime
+ * @param str
+ * @return
+ */
+ private static ZonedDateTime changeDateTime(ZonedDateTime dateTime, String str) {
+ if (str == null || str.isEmpty()) {
+ return dateTime;
+ }
- /**
- * json support variable operation
- *
- * @param dateTime
- * @param object
- */
- @SuppressWarnings("DuplicatedCode")
- private static void replaceJson(ZonedDateTime dateTime, JsonNode object)
- throws VariableOperationFailedException {
- if (object.isArray()) {
- ArrayNode arrayNode = (ArrayNode) object;
- for (int i = 0; i < arrayNode.size(); i++) {
- final JsonNode temp = arrayNode.get(i);
- if (temp.isArray()) {
- replaceJson(dateTime, temp);
- } else if (temp.isObject()) {
- replaceJson(dateTime, temp);
- } else {
- arrayNode.insert(i, replace(dateTime, temp.toString()));
+ for (String cycle : CYCLES) {
+ if (str.contains(cycle)) {
+ switch (cycle) {
+ case CYCLE_DAY:
+ return dateTime.plusDays(Integer.parseInt(str.replace(CYCLE_DAY, "")));
+ case CYCLE_HOUR:
+ return dateTime.plusHours(Integer.parseInt(str.replace(CYCLE_HOUR, "")));
+ case CYCLE_MINUTE:
+ return dateTime.plusMinutes(
+ Integer.parseInt(str.replace(CYCLE_MINUTE, "")));
+ case CYCLE_MONTH:
+ return dateTime.plusMonths(Integer.parseInt(str.replace(CYCLE_MONTH, "")));
+ case CYCLE_SECOND:
+ return dateTime.plusSeconds(
+ Integer.parseInt(str.replace(CYCLE_SECOND, "")));
+ case CYCLE_YEAR:
+ return dateTime.plusYears(Integer.parseInt(str.replace(CYCLE_YEAR, "")));
+ default:
+ break;
+ }
+ }
}
- }
- } else if (object.isObject()) {
- ObjectNode objectNode = (ObjectNode) object;
- final Iterator<Map.Entry<String, JsonNode>> fields = object.fields();
- while (fields.hasNext()) {
- final Map.Entry<String, JsonNode> field = fields.next();
- final JsonNode temp = field.getValue();
- if (temp.isArray()) {
- replaceJson(dateTime, temp);
- } else if (temp.isObject()) {
- replaceJson(dateTime, temp);
- } else {
- objectNode.put(field.getKey(), replace(dateTime, temp.toString()));
+
+ return dateTime;
+ }
+
+ /**
+ * json support variable operation
+ *
+ * @param dateTime
+ * @param object
+ */
+ @SuppressWarnings("DuplicatedCode")
+ private static void replaceJson(ZonedDateTime dateTime, JsonNode object)
+ throws VariableOperationFailedException {
+ if (object.isArray()) {
+ ArrayNode arrayNode = (ArrayNode) object;
+ for (int i = 0; i < arrayNode.size(); i++) {
+ final JsonNode temp = arrayNode.get(i);
+ if (temp.isArray()) {
+ replaceJson(dateTime, temp);
+ } else if (temp.isObject()) {
+ replaceJson(dateTime, temp);
+ } else {
+ arrayNode.insert(i, replace(dateTime, temp.toString()));
+ }
+ }
+ } else if (object.isObject()) {
+ ObjectNode objectNode = (ObjectNode) object;
+ final Iterator<Map.Entry<String, JsonNode>> fields = object.fields();
+ while (fields.hasNext()) {
+ final Map.Entry<String, JsonNode> field = fields.next();
+ final JsonNode temp = field.getValue();
+ if (temp.isArray()) {
+ replaceJson(dateTime, temp);
+ } else if (temp.isObject()) {
+ replaceJson(dateTime, temp);
+ } else {
+ objectNode.put(field.getKey(), replace(dateTime, temp.toString()));
+ }
+ }
}
- }
}
- }
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/ServiceInstance.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/ServiceInstance.scala
index 5323602b7..311cdeb97 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/ServiceInstance.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/ServiceInstance.scala
@@ -5,18 +5,19 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common
+
class ServiceInstance {
private var applicationName: String = _
private var instance: String = _
@@ -25,6 +26,7 @@ class ServiceInstance {
def setInstance(instance: String): Unit = this.instance = instance
def getInstance: String = instance
+
def canEqual(other: Any): Boolean = other.isInstanceOf[ServiceInstance]
override def equals(other: Any): Boolean = other match {
@@ -37,19 +39,16 @@ class ServiceInstance {
override def hashCode(): Int = {
val state = Seq(applicationName, instance)
- state
- .map {
- case null => 0
- case s => s.hashCode
- }
- .foldLeft(0)((a, b) => 31 * a + b)
+ state.map{
+ case null => 0
+ case s => s.hashCode
+ }.foldLeft(0)((a, b) => 31 * a + b)
}
+
override def toString: String = s"ServiceInstance($applicationName, $instance)"
}
-
object ServiceInstance {
-
def apply(applicationName: String, instance: String): ServiceInstance = {
val serviceInstance = new ServiceInstance
serviceInstance.setApplicationName(applicationName)
@@ -57,9 +56,7 @@ object ServiceInstance {
serviceInstance
}
- def unapply(serviceInstance: ServiceInstance): Option[(String, String)] =
- if (serviceInstance != null) {
- Some(serviceInstance.applicationName, serviceInstance.instance)
- } else None
-
-}
+ def unapply(serviceInstance: ServiceInstance): Option[(String, String)] = if (serviceInstance != null) {
+ Some(serviceInstance.applicationName, serviceInstance.instance)
+ } else None
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/collection/LoopArray.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/collection/LoopArray.scala
index 5b9d3421c..5becb7359 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/collection/LoopArray.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/collection/LoopArray.scala
@@ -5,18 +5,19 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.collection
+
class LoopArray[T](maxCapacity: Int) {
private val eventQueue: Array[Any] = new Array[Any](maxCapacity)
@@ -46,9 +47,7 @@ class LoopArray[T](maxCapacity: Int) {
def get(index: Int): T = eventQueue synchronized {
val curMax = max
if (index < realSize) {
- throw new IllegalArgumentException(
- "The index " + index + " has already been deleted, now index must be better than " + realSize
- )
+ throw new IllegalArgumentException("The index " + index + " has already been deleted, now index must be better than " + realSize)
} else if (index > curMax) {
throw new IllegalArgumentException("The index " + index + " must be less than " + curMax)
}
@@ -67,7 +66,7 @@ class LoopArray[T](maxCapacity: Int) {
def max: Int = {
var _size = filledSize
- if (_size == 0) {
+ if(_size == 0) {
_size = 1
}
realSize + _size - 1
@@ -83,8 +82,7 @@ class LoopArray[T](maxCapacity: Int) {
def toList: List[T] = toIndexedSeq.toList
- def toIndexedSeq: IndexedSeq[T] = if (filledSize == 0) IndexedSeq.empty[T]
- else eventQueue synchronized { (min to max).map(get) }
+ def toIndexedSeq: IndexedSeq[T] = if (filledSize == 0) IndexedSeq.empty[T] else eventQueue synchronized {(min to max).map(get)}
}
@@ -98,12 +96,10 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
override def add(event: T): T = throw new IllegalAccessException("not supported method!")
/**
- * Add one, if the queue is full, it will block until the queue is
- * available（添加一个，如果队列满了，将会一直阻塞，直到队列可用）
- * @param event
- * @return
- * Always return true（总是返回true）
- */
+ * Add one, if the queue is full, it will block until the queue is available（添加一个，如果队列满了，将会一直阻塞，直到队列可用）
+ * @param event
+ * @return Always return true（总是返回true）
+ */
def put(event: T): Boolean = {
writeLock synchronized {
while (isFull) writeLock.wait(1000)
@@ -114,12 +110,11 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
}
/**
- * Add one, return FALSE if the queue is full（添加一个，如果队列满了，返回FALSE)
- * @param event
- * @return
- */
- def offer(event: T): Boolean = if (isFull) false
- else {
+ * Add one, return FALSE if the queue is full（添加一个，如果队列满了，返回FALSE)
+ * @param event
+ * @return
+ */
+ def offer(event: T): Boolean = if (isFull) false else {
writeLock synchronized {
if (isFull) return false
else super.add(event)
@@ -129,10 +124,9 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
}
/**
- * Get the latest one, if not, it will block until all new ones are
- * added(获取最新的一个，如果没有，将会一直阻塞，直到有的新的添加进来)
- * @return
- */
+ * Get the latest one, if not, it will block until all new ones are added(获取最新的一个，如果没有，将会一直阻塞，直到有的新的添加进来)
+ * @return
+ */
def take(): T = {
val t = readLock synchronized {
while (waitingSize == 0 || takeIndex > max) {
@@ -148,10 +142,10 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
}
/**
- * Get the latest one, if not, it will return None.(获取最新的一个，如果没有，将会返回None.) Note: This method
- * does not move the pointer(注意：该方法不会移动指针)
- * @return
- */
+ * Get the latest one, if not, it will return None.(获取最新的一个，如果没有，将会返回None.)
+ * Note: This method does not move the pointer(注意：该方法不会移动指针)
+ * @return
+ */
def peek(): Option[T] = readLock synchronized {
if (waitingSize == 0 || takeIndex > max) None
else if (takeIndex < min) Some(get(min))
@@ -159,16 +153,16 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
}
/**
- * Get the latest one, if not, it will return None.(获取最新的一个，如果没有，将会返回None.) Note: This method
- * will move the pointer(注意：该方法会移动指针)
- * @return
- */
+ * Get the latest one, if not, it will return None.(获取最新的一个，如果没有，将会返回None.)
+ * Note: This method will move the pointer(注意：该方法会移动指针)
+ * @return
+ */
def poll(): Option[T] = {
if (waitingSize == 0) return None
val event = readLock synchronized {
val _min = min
val _max = max
- if (takeIndex < _min) takeIndex = _min
+ if(takeIndex < _min) takeIndex = _min
else if (takeIndex > _max) return None
val t = get(takeIndex)
takeIndex += 1
@@ -180,10 +174,9 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
override def isFull: Boolean = super.isFull && takeIndex == realSize
- def waitingSize: Int = if (takeIndex <= realSize) super.size
- else {
+ def waitingSize: Int = if (takeIndex <= realSize) super.size else {
val length = super.size - takeIndex + realSize
- if (length < 0) 0 else length
+ if(length < 0) 0 else length
}
override def clear(): Unit = readLock synchronized {
@@ -191,8 +184,7 @@ class BlockingLoopArray[T](maxCapacity: Int = 32) extends LoopArray[T](maxCapaci
super.clear()
}
- override def toIndexedSeq: IndexedSeq[T] = if (waitingSize == 0) IndexedSeq.empty[T]
- else readLock synchronized { (takeIndex to max).map(get) }
+ override def toIndexedSeq: IndexedSeq[T] = if (waitingSize == 0) IndexedSeq.empty[T] else readLock synchronized {(takeIndex to max).map(get)}
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala
index c49f386ff..26d491a6d 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/BDPConfiguration.scala
@@ -5,28 +5,27 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.conf
+import java.io.{File, FileInputStream, IOException, InputStream}
+import java.util.Properties
import org.apache.linkis.common.utils.{Logging, Utils}
-
import org.apache.commons.io.IOUtils
import org.apache.commons.lang3.StringUtils
-import java.io.{File, FileInputStream, InputStream, IOException}
-import java.util.Properties
-
import scala.collection.JavaConverters.mapAsJavaMapConverter
+
private[conf] object BDPConfiguration extends Logging {
val DEFAULT_PROPERTY_FILE_NAME = "linkis.properties"
@@ -39,33 +38,26 @@ private[conf] object BDPConfiguration extends Logging {
private val env = sys.env
+
private def init: Unit = {
// load pub linkis conf
val propertyFile = sysProps.getOrElse("wds.linkis.configuration", DEFAULT_PROPERTY_FILE_NAME)
val configFileURL = getClass.getClassLoader.getResource(propertyFile)
if (configFileURL != null && new File(configFileURL.getPath).exists) {
- logger.warn(
- s"******************************** Notice: The Linkis configuration file is $propertyFile ! ***************************"
- )
+ logger.warn(s"******************************** Notice: The Linkis configuration file is $propertyFile ! ***************************")
initConfig(config, configFileURL.getPath)
- } else
- logger.warn(
- s"******************************** Notice: The Linkis configuration file $propertyFile is not exists! ***************************"
- )
+ }
+ else logger.warn(s"******************************** Notice: The Linkis configuration file $propertyFile is not exists! ***************************")
// load pub linkis conf
val serverConf = sysProps.getOrElse("wds.linkis.server.conf", DEFAULT_SERVER_CONF_FILE_NAME)
val serverConfFileURL = getClass.getClassLoader.getResource(serverConf)
if (serverConfFileURL != null && new File(serverConfFileURL.getPath).exists) {
- logger.warn(
- s"******************************** Notice: The Linkis serverConf file is $serverConf ! ***************************"
- )
+ logger.warn(s"******************************** Notice: The Linkis serverConf file is $serverConf ! ***************************")
initConfig(config, serverConfFileURL.getPath)
- } else
- logger.warn(
- s"******************************** Notice: The Linkis serverConf file $serverConf is not exists! ***************************"
- )
+ }
+ else logger.warn(s"******************************** Notice: The Linkis serverConf file $serverConf is not exists! ***************************")
// load server confs
val propertyFileOptions = sysProps.get("wds.linkis.server.confs")
@@ -74,36 +66,34 @@ private[conf] object BDPConfiguration extends Logging {
propertyFiles.foreach { propertyF =>
val configFileURL = getClass.getClassLoader.getResource(propertyF)
if (configFileURL != null && new File(configFileURL.getPath).exists) {
- logger.warn(
- s"******************************** Notice: The Linkis server.confs is file $propertyF ***************************"
- )
+ logger.warn(s"******************************** Notice: The Linkis server.confs is file $propertyF ***************************")
initConfig(config, configFileURL.getPath)
- } else
- logger.warn(
- s"******************************** Notice: The Linkis server.confs file $propertyF is not exists! ***************************"
- )
+ }
+ else logger.warn(s"******************************** Notice: The Linkis server.confs file $propertyF is not exists! ***************************")
}
}
}
- Utils.tryCatch {
+ Utils.tryCatch{
init
- } { e: Throwable =>
- logger.warn("Failed to init conf", e)
+ }{
+ e: Throwable =>
+ logger.warn("Failed to init conf", e)
}
private def initConfig(config: Properties, filePath: String) {
var inputStream: InputStream = null
- Utils.tryFinally {
- Utils.tryCatch {
+ Utils.tryFinally{
+ Utils.tryCatch{
inputStream = new FileInputStream(filePath)
config.load(inputStream)
- } { case e: IOException =>
- logger.error("Can't load " + filePath, e)
+ }{
+ case e: IOException =>
+ logger.error("Can't load " + filePath, e)
}
- } {
+ }{
IOUtils.closeQuietly(inputStream)
}
}
@@ -113,7 +103,7 @@ private[conf] object BDPConfiguration extends Logging {
return Some(extractConfig.getProperty(key))
}
val value = config.getProperty(key)
- if (StringUtils.isNotEmpty(value)) {
+ if(StringUtils.isNotEmpty(value)) {
return Some(value)
}
val propsValue = sysProps.get(key).orElse(sys.props.get(key))
@@ -132,8 +122,7 @@ private[conf] object BDPConfiguration extends Logging {
props
}
- def getOption[T](commonVars: CommonVars[T]): Option[T] = if (commonVars.value != null)
- Option(commonVars.value)
+ def getOption[T](commonVars: CommonVars[T]): Option[T] = if (commonVars.value != null) Option(commonVars.value)
else {
val value = BDPConfiguration.getOption(commonVars.key)
if (value.isEmpty) Option(commonVars.defaultValue)
@@ -161,12 +150,9 @@ private[conf] object BDPConfiguration extends Logging {
def set(key: String, value: String): AnyRef = extractConfig.setProperty(key, value)
- def setIfNotExists(key: String, value: String): Any =
- if (!config.containsKey(key)) set(key, value)
-
- def getBoolean(key: String, default: Boolean): Boolean =
- getOption(key).map(_.toBoolean).getOrElse(default)
+ def setIfNotExists(key: String, value: String): Any = if (!config.containsKey(key)) set(key, value)
+ def getBoolean(key: String, default: Boolean): Boolean = getOption(key).map(_.toBoolean).getOrElse(default)
def getBoolean(commonVars: CommonVars[Boolean]): Option[Boolean] = getOption(commonVars)
def get(key: String, default: String): String = getOption(key).getOrElse(default)
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/ByteType.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/ByteType.scala
index 2fb975831..5accd5d47 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/ByteType.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/ByteType.scala
@@ -5,22 +5,23 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.conf
import org.apache.linkis.common.utils.ByteTimeUtils
+
class ByteType(byteStr: String) {
def this(bytes: Long) = this(ByteTimeUtils.bytesToString(bytes))
val toLong = ByteTimeUtils.byteStringAsBytes(byteStr)
override val toString = byteStr
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/CommonVars.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/CommonVars.scala
index 738b08ff9..8a8666364 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/CommonVars.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/CommonVars.scala
@@ -5,43 +5,38 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.conf
import scala.collection.JavaConversions._
+
case class CommonVars[T](key: String, defaultValue: T, value: T, description: String = null) {
val getValue: T = BDPConfiguration.getOption(this).getOrElse(defaultValue)
-
def getValue(properties: java.util.Map[String, String]): T = {
- if (properties == null || !properties.containsKey(key) || properties.get(key) == null)
- getValue
+ if(properties == null || !properties.containsKey(key) || properties.get(key) == null) getValue
else BDPConfiguration.formatValue(defaultValue, Option(properties.get(key))).get
}
-
def getValue(properties: Map[String, String]): T = getValue(mapAsJavaMap(properties))
def acquireNew: T = BDPConfiguration.getOption(this).getOrElse(defaultValue)
}
-
object CommonVars {
-
def apply[T](key: String, defaultValue: T, description: String): CommonVars[T] =
CommonVars(key, defaultValue, null.asInstanceOf[T], description)
- implicit def apply[T](key: String, defaultValue: T): CommonVars[T] =
- new CommonVars(key, defaultValue, null.asInstanceOf[T], null)
+ implicit def apply[T](key: String, defaultValue: T): CommonVars[T] = new CommonVars(key, defaultValue, null.asInstanceOf[T], null)
implicit def apply[T](key: String): CommonVars[T] = apply(key, null.asInstanceOf[T])
def properties = BDPConfiguration.properties
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
index 05a147f84..1b1a0528d 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
@@ -5,20 +5,21 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.conf
import org.apache.linkis.common.utils.Logging
+
object Configuration extends Logging {
val BDP_ENCODING = CommonVars("wds.linkis.encoding", "utf-8")
@@ -35,23 +36,17 @@ object Configuration extends Logging {
val LINKIS_HOME = CommonVars("wds.linkis.home", CommonVars("LINKIS_HOME", "/tmp").getValue)
- val GATEWAY_URL: CommonVars[String] =
- CommonVars[String]("wds.linkis.gateway.url", "http://127.0.0.1:9001/")
+ val GATEWAY_URL: CommonVars[String] = CommonVars[String]("wds.linkis.gateway.url", "http://127.0.0.1:9001/")
val LINKIS_WEB_VERSION: CommonVars[String] = CommonVars[String]("wds.linkis.web.version", "v1")
- val REFLECT_SCAN_PACKAGE: Array[String] = CommonVars
- .apply("wds.linkis.reflect.scan.package", "org.apache.linkis,com.webank.wedatasphere")
- .getValue
- .split(",")
+ val REFLECT_SCAN_PACKAGE: Array[String] = CommonVars.apply("wds.linkis.reflect.scan.package", "org.apache.linkis,com.webank.wedatasphere").getValue.split(",")
- val CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME =
- CommonVars("wds.linkis.console.configuration.application.name", "linkis-ps-configuration")
+ val CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME = CommonVars("wds.linkis.console.configuration.application.name", "linkis-ps-configuration")
- val CLOUD_CONSOLE_VARIABLE_SPRING_APPLICATION_NAME =
- CommonVars("wds.linkis.console.variable.application.name", "linkis-ps-publicservice")
+ val CLOUD_CONSOLE_VARIABLE_SPRING_APPLICATION_NAME = CommonVars("wds.linkis.console.variable.application.name", "linkis-ps-publicservice")
- // read from env
+ //read from env
val EUREKA_PREFER_IP: Boolean = CommonVars("EUREKA_PREFER_IP", false).getValue
val GOVERNANCE_STATION_ADMIN = CommonVars("wds.linkis.governance.station.admin", "hadoop")
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
index 85b539284..65db1fe28 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
@@ -5,54 +5,46 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.conf
import org.apache.commons.lang3.StringUtils
import scala.collection.JavaConverters.mapAsJavaMapConverter
-import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
+import scala.collection.mutable
object DWCArgumentsParser {
protected val DWC_CONF = "--engineconn-conf"
protected val SPRING_CONF = "--spring-conf"
private var dwcOptionMap = Map.empty[String, String]
- private[linkis] def setDWCOptionMap(dwcOptionMap: Map[String, String]) = this.dwcOptionMap =
- dwcOptionMap
-
+ private[linkis] def setDWCOptionMap(dwcOptionMap: Map[String, String]) = this.dwcOptionMap = dwcOptionMap
def getDWCOptionMap: Map[String, String] = dwcOptionMap
def parse(args: Array[String]): DWCArgumentsParser = {
val keyValueRegex = "([^=]+)=(.+)".r
var i = 0
val optionParser = new DWCArgumentsParser
- while (i < args.length) {
+ while(i < args.length) {
args(i) match {
case DWC_CONF | SPRING_CONF =>
args(i + 1) match {
case keyValueRegex(key, value) =>
optionParser.setConf(args(i), key, value)
i += 1
- case _ =>
- throw new IllegalArgumentException(
- "illegal commond line, format: --conf key=value."
- )
+ case _ => throw new IllegalArgumentException("illegal commond line, format: --conf key=value.")
}
- case _ =>
- throw new IllegalArgumentException(
- s"illegal commond line, ${args(i)} cannot recognize."
- )
+ case _ => throw new IllegalArgumentException(s"illegal commond line, ${args(i)} cannot recognize.")
}
i += 1
}
@@ -62,28 +54,20 @@ object DWCArgumentsParser {
def formatToArray(optionParser: DWCArgumentsParser): Array[String] = {
val options = ArrayBuffer[String]()
- def write(confMap: Map[String, String], optionType: String): Unit = confMap.foreach {
- case (key, value) =>
- if (StringUtils.isNotEmpty(key) && StringUtils.isNotEmpty(value)) {
- options += optionType
- options += (key + "=" + value)
- }
+ def write(confMap: Map[String, String], optionType: String): Unit = confMap.foreach { case (key, value) =>
+ if (StringUtils.isNotEmpty(key) && StringUtils.isNotEmpty(value)) {
+ options += optionType
+ options += (key + "=" + value)
+ }
}
write(optionParser.getDWCConfMap, DWC_CONF)
write(optionParser.getSpringConfMap, SPRING_CONF)
options.toArray
}
-
- def formatToArray(
- springOptionMap: Map[String, String],
- dwcOptionMap: Map[String, String]
- ): Array[String] =
- formatToArray(
- new DWCArgumentsParser().setSpringConf(springOptionMap).setDWCConf(dwcOptionMap)
- )
+ def formatToArray(springOptionMap: Map[String, String], dwcOptionMap: Map[String, String]): Array[String] =
+ formatToArray(new DWCArgumentsParser().setSpringConf(springOptionMap).setDWCConf(dwcOptionMap))
def format(optionParser: DWCArgumentsParser): String = formatToArray(optionParser).mkString(" ")
-
def format(springOptionMap: Map[String, String], dwcOptionMap: Map[String, String]): String =
formatToArray(springOptionMap, dwcOptionMap).mkString(" ")
@@ -96,9 +80,7 @@ object DWCArgumentsParser {
}
options.toArray
}
-
}
-
class DWCArgumentsParser {
import DWCArgumentsParser._
private val dwcOptionMap = new mutable.HashMap[String, String]()
@@ -106,7 +88,6 @@ class DWCArgumentsParser {
def getSpringConfMap: Map[String, String] = springOptionMap.toMap
def getSpringConfs: java.util.Map[String, String] = springOptionMap.asJava
def getDWCConfMap: Map[String, String] = dwcOptionMap.toMap
-
def setConf(optionType: String, key: String, value: String): DWCArgumentsParser = {
optionType match {
case DWC_CONF =>
@@ -116,16 +97,13 @@ class DWCArgumentsParser {
}
this
}
-
def setSpringConf(optionMap: Map[String, String]): DWCArgumentsParser = {
if (optionMap != null) this.springOptionMap ++= optionMap
this
}
-
def setDWCConf(optionMap: Map[String, String]): DWCArgumentsParser = {
if (optionMap != null) this.dwcOptionMap ++= optionMap
this
}
-
def validate(): Unit = {}
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/TimeType.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/TimeType.scala
index dc644bb46..f0edddfbc 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/TimeType.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/TimeType.scala
@@ -5,29 +5,30 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.conf
-import org.apache.linkis.common.utils.ByteTimeUtils
-
import java.util.Date
import java.util.concurrent.TimeUnit
+import org.apache.linkis.common.utils.ByteTimeUtils
+
import scala.concurrent.duration.Duration
+
class TimeType(timeStr: String) {
def this(ms: Long) = this(ByteTimeUtils.msDurationToString(ms))
val toLong = ByteTimeUtils.timeStringAsMs(timeStr)
val toDate = new Date(toLong)
val toDuration = Duration(toLong, TimeUnit.MILLISECONDS)
override val toString = timeStr
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/errorcode/CommonErrorConstants.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/errorcode/CommonErrorConstants.scala
index 56c462a06..05ff63e3a 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/errorcode/CommonErrorConstants.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/errorcode/CommonErrorConstants.scala
@@ -5,18 +5,18 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.errorcode
object CommonErrorConstants {
- val COMMON_ERROR = 10000
+ val COMMON_ERROR = 10000
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsReader.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsReader.scala
index 65047e4c0..e37ee0750 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsReader.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsReader.scala
@@ -5,46 +5,39 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io
import java.io.{Closeable, IOException}
-abstract class FsReader[K <: MetaData, V <: Record] extends Closeable {
+abstract class FsReader[K <: MetaData, V <: Record] extends Closeable {
@throws[IOException]
def getRecord: Record
-
@throws[IOException]
def getMetaData: MetaData
-
@throws[IOException]
def skip(recordNum: Int): Int
-
@throws[IOException]
def getPosition: Long
-
@throws[IOException]
def hasNext: Boolean
/**
- * Number of unread bytes remaining(剩余未读bytes数)
- *
- * @return
- * Number of unread bytes remaining(剩余未读bytes数)
- * @throws IOException
- * If the acquisition fails, an exception is thrown.(如获取失败，则抛出异常)
- */
+ * Number of unread bytes remaining(剩余未读bytes数)
+ *
+ * @return Number of unread bytes remaining(剩余未读bytes数)
+ * @throws IOException If the acquisition fails, an exception is thrown.(如获取失败，则抛出异常)
+ */
@throws[IOException]
def available: Long
-
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsWriter.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsWriter.scala
index 1901e525b..7f1044832 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsWriter.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/FsWriter.scala
@@ -5,26 +5,24 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io
import java.io.{Closeable, Flushable, IOException}
-abstract class FsWriter[K <: MetaData, V <: Record] extends Closeable with Flushable {
+abstract class FsWriter[K <: MetaData, V <: Record] extends Closeable with Flushable {
@throws[IOException]
def addMetaData(metaData: MetaData): Unit
-
@throws[IOException]
def addRecord(record: Record): Unit
-
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/MetaData.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/MetaData.scala
index c5d90c0dc..057447021 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/MetaData.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/MetaData.scala
@@ -5,18 +5,19 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io
+
trait MetaData {
def cloneMeta(): MetaData
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/Record.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/Record.scala
index 6d3d0bdc8..e8c97357f 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/Record.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/Record.scala
@@ -5,18 +5,19 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io
+
trait Record {
def cloneRecord(): Record
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultDeserializer.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultDeserializer.scala
index 96f3d6d2c..8c45a9a9c 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultDeserializer.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultDeserializer.scala
@@ -5,22 +5,24 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io.resultset
import org.apache.linkis.common.io.{MetaData, Record}
+
+
abstract class ResultDeserializer[K <: MetaData, V <: Record] {
def createMetaData(bytes: Array[Byte]): K
def createRecord(bytes: Array[Byte]): V
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSerializer.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSerializer.scala
index 1120625d7..bd1ba5899 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSerializer.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSerializer.scala
@@ -5,21 +5,22 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io.resultset
import org.apache.linkis.common.io.{MetaData, Record}
+
abstract class ResultSerializer {
def metaDataToBytes(metaData: MetaData): Array[Byte]
def recordToBytes(record: Record): Array[Byte]
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSet.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSet.scala
index c5991e1ca..6f64e9c40 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSet.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSet.scala
@@ -5,56 +5,67 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io.resultset
import org.apache.linkis.common.io.{FsPath, MetaData, Record}
+
trait ResultSet[K <: MetaData, V <: Record] {
val charset: String
/**
- * Result set type(结果集类型)
- * @return
- */
+ * Result set type(结果集类型)
+ * @return
+ */
def resultSetType(): String
-
/**
- * Give a file path via an Fs path and file name<br> The file suffix name is determined by the
- * uniform specification of the method. effect: <ul> <li>[ResultSetWriter]] and
- * [[ResultSetReader]] normalize the generated file name by this method</li> <li>Assist the
- * [[belongToPath]] method to determine whether a path is a resultSet path</li>
- *
- * </ul> 通过一个Fs路径和文件名，给出一个文件路径<br> 文件后缀名由该该方法统一规范决定 作用： <ul>
- * <li>[[ResultSetWriter]]和[[ResultSetReader]]通过该方法规范化生成文件名</li>
- * <li>协助[[belongToPath]]方法判断，某个路径是不是resultSet路径</li> </ul>
- * @param parentDir
- * The parent path of an underlying storage system(某个底层存储系统的父路径)
- * @param fileName
- * File name, without suffix(文件名，不包含后缀)
- * @return
- */
+ * Give a file path via an Fs path and file name<br>
+ * The file suffix name is determined by the uniform specification of the method.
+ * effect:
+ * <ul>
+ * <li>[ResultSetWriter]] and [[ResultSetReader]] normalize the generated file name by this method</li>
+ * <li>Assist the [[belongToPath]] method to determine whether a path is a resultSet path</li>
+ *
+ * </ul>
+ * 通过一个Fs路径和文件名，给出一个文件路径<br>
+ * 文件后缀名由该该方法统一规范决定
+ * 作用：
+ * <ul>
+ * <li>[[ResultSetWriter]]和[[ResultSetReader]]通过该方法规范化生成文件名</li>
+ * <li>协助[[belongToPath]]方法判断，某个路径是不是resultSet路径</li>
+ * </ul>
+ * @param parentDir The parent path of an underlying storage system(某个底层存储系统的父路径)
+ * @param fileName File name, without suffix(文件名，不包含后缀)
+ * @return
+ */
def getResultSetPath(parentDir: FsPath, fileName: String): FsPath
/**
- * Generates a file header for a resultSet that identifies a string as a resultSet of that type.
- * 作用： <ul> <li>[[ResultSetWriter]]和[[ResultSetReader]]通过该方法规范化生成文件名</li>
- * <li>协助[[belongToPath]]方法判断，某个路径是不是resultSet路径</li> </ul>
- *
- * 生成某个resultSet的文件头，用于标识某段string为该类型的resultSet. 作用： <ul>
- * <li>[[ResultSetWriter]]和[[ResultSetReader]]通过该方法规范化写入和读取文件头</li>
- * <li>协助[[belongToResultSet]]方法判断，某个string是不是resultSet</li> </ul>
- * @return
- */
+ * Generates a file header for a resultSet that identifies a string as a resultSet of that type.
+ * 作用：
+ * <ul>
+ * <li>[[ResultSetWriter]]和[[ResultSetReader]]通过该方法规范化生成文件名</li>
+ * <li>协助[[belongToPath]]方法判断，某个路径是不是resultSet路径</li>
+ * </ul>
+ *
+ * 生成某个resultSet的文件头，用于标识某段string为该类型的resultSet.
+ * 作用：
+ * <ul>
+ * <li>[[ResultSetWriter]]和[[ResultSetReader]]通过该方法规范化写入和读取文件头</li>
+ * <li>协助[[belongToResultSet]]方法判断，某个string是不是resultSet</li>
+ * </ul>
+ * @return
+ */
def getResultSetHeader: Array[Byte]
def belongToPath(path: String): Boolean
def belongToResultSet(content: String): Boolean
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetReader.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetReader.scala
index b1bafe4fe..214e8106b 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetReader.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetReader.scala
@@ -5,29 +5,26 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io.resultset
-import org.apache.linkis.common.io.{FsReader, MetaData, Record}
-
import java.io.{ByteArrayInputStream, InputStream}
-abstract class ResultSetReader[K <: MetaData, V <: Record](
- resultSet: ResultSet[K, V],
- inputStream: InputStream
-) extends FsReader {
+import org.apache.linkis.common.io.{FsReader, MetaData, Record}
- def this(resultSet: ResultSet[K, V], data: String) =
- this(resultSet, new ByteArrayInputStream(data.getBytes(resultSet.charset)))
+abstract class ResultSetReader[K <: MetaData, V <: Record](resultSet: ResultSet[K, V],
+ inputStream: InputStream) extends FsReader {
+ def this(resultSet: ResultSet[K, V], data: String) = this(resultSet,
+ new ByteArrayInputStream(data.getBytes(resultSet.charset)))
def this(data: String) = this(null, data)
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetWriter.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetWriter.scala
index 2874a4d70..b5af56a02 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetWriter.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/io/resultset/ResultSetWriter.scala
@@ -5,28 +5,27 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.io.resultset
import org.apache.linkis.common.io.{FsPath, FsWriter, MetaData, Record}
-abstract class ResultSetWriter[K <: MetaData, V <: Record](
- resultSet: ResultSet[K, V],
- maxCacheSize: Long,
- storePath: FsPath
-) extends FsWriter[K, V] {
+
+abstract class ResultSetWriter[K <: MetaData, V <: Record](resultSet: ResultSet[K, V],
+ maxCacheSize: Long,
+ storePath: FsPath) extends FsWriter[K, V] {
def toString: String
def toFSPath: FsPath
def addMetaDataAndRecordString(content: String): Unit
def addRecordString(content: String): Unit
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/Event.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/Event.scala
index 111cafb12..05619890b 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/Event.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/Event.scala
@@ -5,16 +5,17 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.listener
-trait Event
+
+trait Event
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/EventListener.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/EventListener.scala
index 95cc813c1..3dae9fee1 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/EventListener.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/EventListener.scala
@@ -5,18 +5,19 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.listener
+
trait EventListener {
def onEventError(event: Event, t: Throwable): Unit
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala
index f3bc62e8f..742729c4b 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/ListenerEventBus.scala
@@ -5,53 +5,52 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.listener
+import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong}
+import java.util.concurrent.{ArrayBlockingQueue, CopyOnWriteArrayList, Future, TimeoutException}
import org.apache.linkis.common.utils.{Logging, Utils}
-
import org.apache.commons.lang3.time.DateFormatUtils
import java.time.Duration
-import java.util.concurrent.{ArrayBlockingQueue, CopyOnWriteArrayList, Future, TimeoutException}
-import java.util.concurrent.atomic.{AtomicBoolean, AtomicLong}
-
import scala.util.control.NonFatal
+
trait ListenerBus[L <: EventListener, E <: Event] extends Logging {
val self = this
private val listeners = new CopyOnWriteArrayList[L]
/**
- * Add a listener to listen events. This method is thread-safe and can be called in any thread.
- */
+ * Add a listener to listen events. This method is thread-safe and can be called in any thread.
+ */
final def addListener(listener: L): Unit = {
listeners.add(listener)
logger.info(toString + " add a new listener => " + listener.getClass)
}
/**
- * Remove a listener and it won't receive any events. This method is thread-safe and can be
- * called in any thread.
- */
+ * Remove a listener and it won't receive any events. This method is thread-safe and can be called
+ * in any thread.
+ */
final def removeListener(listener: L): Unit = {
listeners.remove(listener)
}
/**
- * Post the event to all registered listeners. The `postToAll` caller should guarantee calling
- * `postToAll` in the same thread for all events.
- */
+ * Post the event to all registered listeners. The `postToAll` caller should guarantee calling
+ * `postToAll` in the same thread for all events.
+ */
final def postToAll(event: E): Unit = {
// JavaConverters can create a JIterableWrapper if we use asScala.
// However, this method will be called frequently. To avoid the wrapper cost, here we use
@@ -59,9 +58,9 @@ trait ListenerBus[L <: EventListener, E <: Event] extends Logging {
val iter = listeners.iterator
while (iter.hasNext) {
val listener = iter.next()
- Utils.tryCatch {
+ Utils.tryCatch{
doPostEvent(listener, event)
- } {
+ }{
case NonFatal(e) =>
Utils.tryAndError(listener.onEventError(event, e))
case t: Throwable => throw t
@@ -70,53 +69,43 @@ trait ListenerBus[L <: EventListener, E <: Event] extends Logging {
}
/**
- * Post an event to the specified listener. `onPostEvent` is guaranteed to be called in the same
- * thread for all listeners.
- */
+ * Post an event to the specified listener. `onPostEvent` is guaranteed to be called in the same
+ * thread for all listeners.
+ */
protected def doPostEvent(listener: L, event: E): Unit
}
-
-abstract class ListenerEventBus[L <: EventListener, E <: Event](
- val eventQueueCapacity: Int,
- name: String
-)(
- listenerConsumerThreadSize: Int = 5,
- listenerThreadMaxFreeTime: Long = Duration.ofMinutes(2).toMillis
-) extends ListenerBus[L, E]
- with Logging {
+abstract class ListenerEventBus[L <: EventListener, E <: Event]
+ (val eventQueueCapacity: Int, name: String)
+ (listenerConsumerThreadSize: Int = 5, listenerThreadMaxFreeTime: Long = Duration.ofMinutes(2).toMillis)
+ extends ListenerBus[L, E] with Logging {
private lazy val eventQueue = new ArrayBlockingQueue[E](eventQueueCapacity)
-
- protected val executorService =
- Utils.newCachedThreadPool(listenerConsumerThreadSize + 2, name + "-Consumer-ThreadPool", true)
-
- private val eventDealThreads =
- Array.tabulate(listenerConsumerThreadSize)(new ListenerEventThread(_))
-
+ protected val executorService = Utils.newCachedThreadPool(listenerConsumerThreadSize + 2, name + "-Consumer-ThreadPool", true)
+ private val eventDealThreads = Array.tabulate(listenerConsumerThreadSize)(new ListenerEventThread(_))
private val started = new AtomicBoolean(false)
private val stopped = new AtomicBoolean(false)
private var listenerThread: Future[_] = _
/**
- * Start sending events to attached listeners.
- *
- * This first sends out all buffered events posted before this listener bus has started, then
- * listens for any additional events asynchronously while the listener bus is still running.
- * This should only be called once.
- */
+ * Start sending events to attached listeners.
+ *
+ * This first sends out all buffered events posted before this listener bus has started, then
+ * listens for any additional events asynchronously while the listener bus is still running.
+ * This should only be called once.
+ *
+ */
def start(): Unit = {
if (started.compareAndSet(false, true)) {
listenerThread = executorService.submit(new Runnable {
override def run(): Unit =
while (!stopped.get) {
- val event = Utils.tryCatch(eventQueue.take()) { case t: InterruptedException =>
- logger.info(s"stopped $name thread.", t)
- return
+ val event = Utils.tryCatch(eventQueue.take()) {
+ case t: InterruptedException => logger.info(s"stopped $name thread.", t)
+ return
}
- while (!eventDealThreads.exists(_.putEvent(event)) && !stopped.get)
- Utils.tryAndError(Thread.sleep(1))
+ while(!eventDealThreads.exists(_.putEvent(event)) && !stopped.get) Utils.tryAndError(Thread.sleep(1))
}
})
} else {
@@ -135,18 +124,18 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
}
/**
- * For testing only. Wait until there are no more events in the queue, or until the specified
- * time has elapsed. Throw `TimeoutException` if the specified time elapsed before the queue
- * emptied. Exposed for testing.
- */
+ * For testing only. Wait until there are no more events in the queue, or until the specified
+ * time has elapsed. Throw `TimeoutException` if the specified time elapsed before the queue
+ * emptied.
+ * Exposed for testing.
+ */
@throws(classOf[TimeoutException])
def waitUntilEmpty(timeoutMillis: Long): Unit = {
val finishTime = System.currentTimeMillis + timeoutMillis
while (!queueIsEmpty) {
if (System.currentTimeMillis > finishTime) {
throw new TimeoutException(
- s"The event queue is not empty after $timeoutMillis milliseconds"
- )
+ s"The event queue is not empty after $timeoutMillis milliseconds")
}
/* Sleep rather than using wait/notify, because this is used only for testing and
* wait/notify add overhead in the general case. */
@@ -155,25 +144,23 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
}
/**
- * For testing only. Return whether the listener daemon thread is still alive. Exposed for
- * testing.
- */
+ * For testing only. Return whether the listener daemon thread is still alive.
+ * Exposed for testing.
+ */
def listenerThreadIsAlive: Boolean = !listenerThread.isDone
/**
- * Return whether the event queue is empty.
- *
- * The use of synchronized here guarantees that all events that once belonged to this queue have
- * already been processed by all attached listeners, if this returns true.
- */
- private def queueIsEmpty: Boolean = synchronized {
- eventQueue.isEmpty && !eventDealThreads.exists(_.isRunning)
- }
+ * Return whether the event queue is empty.
+ *
+ * The use of synchronized here guarantees that all events that once belonged to this queue
+ * have already been processed by all attached listeners, if this returns true.
+ */
+ private def queueIsEmpty: Boolean = synchronized { eventQueue.isEmpty && !eventDealThreads.exists(_.isRunning) }
/**
- * Stop the listener bus. It will wait until the queued events have been processed, but drop the
- * new events after stopping.
- */
+ * Stop the listener bus. It will wait until the queued events have been processed, but drop the
+ * new events after stopping.
+ */
def stop(): Unit = {
if (!started.get()) {
throw new IllegalStateException(s"Attempted to stop $name that has not yet started!")
@@ -190,6 +177,7 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
}
}
+
override val toString: String = name + "-ListenerBus"
trait DropEvent {
@@ -202,9 +190,7 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
@volatile private var lastReportTimestamp = 0L
private val logDroppedEvent = new AtomicBoolean(false)
private val logStoppedEvent = new AtomicBoolean(false)
-
executorService.submit(new Runnable {
-
override def run(): Unit = while (true) {
val droppedEvents = droppedEventsCounter.get
if (droppedEvents > 0) {
@@ -217,43 +203,35 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
if (droppedEventsCounter.compareAndSet(droppedEvents, 0)) {
val prevLastReportTimestamp = lastReportTimestamp
lastReportTimestamp = System.currentTimeMillis()
- logger.warn(
- s"Dropped $droppedEvents ListenerEvents since " +
- DateFormatUtils.format(prevLastReportTimestamp, "yyyy-MM-dd HH:mm:ss")
- )
+ logger.warn(s"Dropped $droppedEvents ListenerEvents since " +
+ DateFormatUtils.format(prevLastReportTimestamp, "yyyy-MM-dd HH:mm:ss"))
}
}
}
Utils.tryQuietly(Thread.sleep(600000))
}
-
})
-
/**
- * If the event queue exceeds its capacity, the new events will be dropped. The subclasses
- * will be notified with the dropped events.
- *
- * Note: `onDropEvent` can be called in any thread.
- */
+ * If the event queue exceeds its capacity, the new events will be dropped. The subclasses will be
+ * notified with the dropped events.
+ *
+ * Note: `onDropEvent` can be called in any thread.
+ */
def onDropEvent(event: E): Unit = {
droppedEventsCounter.incrementAndGet()
if (logDroppedEvent.compareAndSet(false, true)) {
// Only log the following message once to avoid duplicated annoying logs.
- logger.error(
- "Dropping ListenerEvent because no remaining room in event queue. " +
- "This likely means one of the Listeners is too slow and cannot keep up with " +
- "the rate at which tasks are being started by the scheduler."
- )
+ logger.error("Dropping ListenerEvent because no remaining room in event queue. " +
+ "This likely means one of the Listeners is too slow and cannot keep up with " +
+ "the rate at which tasks are being started by the scheduler.")
}
}
-
override def onBusStopped(event: E): Unit = {
droppedEventsCounter.incrementAndGet()
if (logStoppedEvent.compareAndSet(false, true)) {
logger.error(s"$name has already stopped! Dropping event $event.")
}
}
-
}
protected class ListenerEventThread(index: Int) extends Runnable {
@@ -262,10 +240,8 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
private var event: Option[E] = None
private var lastEventDealTime = 0L
- def releaseFreeThread(): Unit = if (
- listenerThreadMaxFreeTime > 0 && future.isDefined && event.isEmpty && lastEventDealTime > 0 &&
- System.currentTimeMillis() - lastEventDealTime >= listenerThreadMaxFreeTime
- ) {
+ def releaseFreeThread(): Unit = if (listenerThreadMaxFreeTime > 0 && future.isDefined && event.isEmpty && lastEventDealTime > 0 &&
+ System.currentTimeMillis() - lastEventDealTime >= listenerThreadMaxFreeTime) {
synchronized {
if (lastEventDealTime == 0 && future.isEmpty) return
lastEventDealTime = 0L
@@ -274,22 +250,18 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
future = None
}
}
-
def isRunning: Boolean = event.isDefined
- def putEvent(event: E): Boolean = if (this.event.isDefined) false
- else
- synchronized {
- if (this.event.isDefined) false
- else {
- lastEventDealTime = System.currentTimeMillis()
- this.event = Some(event)
- if (future.isEmpty) future = Some(executorService.submit(this))
- else notify()
- true
- }
+ def putEvent(event: E): Boolean = if (this.event.isDefined) false else synchronized {
+ if (this.event.isDefined) false
+ else {
+ lastEventDealTime = System.currentTimeMillis()
+ this.event = Some(event)
+ if (future.isEmpty) future = Some(executorService.submit(this))
+ else notify()
+ true
}
-
+ }
override def run(): Unit = {
val threadName = Thread.currentThread().getName
val currentThreadName = s"$name-Thread-$index"
@@ -299,30 +271,23 @@ abstract class ListenerEventBus[L <: EventListener, E <: Event](
logger.info(s"$currentThreadName released.")
Thread.currentThread().setName(threadName)
}
- while (continue) {
+ while(continue) {
synchronized {
- while (event.isEmpty)
- Utils.tryQuietly(
- wait(),
- _ => {
- threadRelease()
- return
- }
- )
+ while (event.isEmpty) Utils.tryQuietly(wait(), _ => {
+ threadRelease()
+ return
+ })
}
- Utils.tryFinally(event.foreach(postToAll))(synchronized {
+ Utils.tryFinally(event.foreach(postToAll)) (synchronized {
lastEventDealTime = System.currentTimeMillis()
event = None
})
}
threadRelease()
}
-
def shutdown(): Unit = {
continue = false
future.foreach(_.cancel(true))
}
-
}
-
-}
+}
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/SingleThreadListenerBus.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/SingleThreadListenerBus.scala
index f5f1d8da8..62054d600 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/SingleThreadListenerBus.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/listener/SingleThreadListenerBus.scala
@@ -5,19 +5,17 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.listener
-abstract class SingleThreadListenerBus[L <: EventListener, E <: Event](
- eventQueueCapacity: Int,
- name: String
-) extends ListenerEventBus[L, E](eventQueueCapacity, name)(1, -1)
+abstract class SingleThreadListenerBus[L <: EventListener, E <: Event](eventQueueCapacity: Int, name: String)
+ extends ListenerEventBus[L, E](eventQueueCapacity, name)(1, -1)
\ No newline at end of file
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala
index 77c82f388..0a776b0ef 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/log/LogUtils.scala
@@ -5,23 +5,26 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.log
import java.text.SimpleDateFormat
import java.util.Date
+
+
object LogUtils {
+
private def getTimeFormat: String = {
val simpleDateFormat: SimpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.mmm")
val now = new Date(System.currentTimeMillis())
@@ -52,4 +55,5 @@ object LogUtils {
getTimeFormat + " " + "SYSTEM-WARN" + " " + rawLog
}
+
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ArrayUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ArrayUtils.scala
index 3a3eceaf5..092e1cdfb 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ArrayUtils.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ArrayUtils.scala
@@ -5,22 +5,23 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.utils
import java.lang.reflect
import scala.reflect.ClassTag
+
object ArrayUtils {
def newArray[T](newLength: Int, clazz: Class[_ <: Array[T]]): Array[T] =
@@ -30,26 +31,27 @@ object ArrayUtils {
def copyArray[T](array: Array[T], newLength: Int): Array[T] = {
val destArray = newArray[T](newLength, array.getClass)
- if (null == array || array.isEmpty) return destArray
- System.arraycopy(array, 0, destArray, 0, Math.min(array.length, newLength))
+ if(null == array || array.isEmpty) return destArray
+ System.arraycopy(array, 0, destArray, 0,
+ Math.min(array.length, newLength))
destArray
}
def copyArray[T](array: Array[T]): Array[T] =
copyArray[T](array, array.length)
- def copyArrayWithClass[T](array: Seq[T], clazz: Class[_ <: T]): Array[T] = {
+ def copyArrayWithClass[T](array: Seq[T], clazz: Class[_ <:T]): Array[T] = {
val destArray = reflect.Array.newInstance(clazz, array.length) match {
case destArray: Array[T] => destArray
}
- if (null == array || array.isEmpty) return destArray
- for (i <- array.indices)
+ if(null == array || array.isEmpty) return destArray
+ for(i <- array.indices)
destArray(i) = array(i)
destArray
}
def copyScalaArray[T: ClassTag](array: Seq[T], newLength: Int): Array[T] = {
- val fill: Int => T = index => if (index < array.length) array(index) else null.asInstanceOf[T]
+ val fill: Int => T = index => if(index < array.length) array(index) else null.asInstanceOf[T]
Array.tabulate(newLength)(fill)
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ClassUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ClassUtils.scala
index b29b5354b..dc814eaaa 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ClassUtils.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ClassUtils.scala
@@ -5,29 +5,25 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.common.utils
-import org.apache.linkis.common.conf.Configuration
-
import java.lang.reflect.Modifier
+import org.apache.linkis.common.conf.Configuration
import org.reflections.Reflections
object ClassUtils {
-
- lazy val reflections =
- new Reflections(Configuration.REFLECT_SCAN_PACKAGE, this.getClass.getClassLoader)
-
+ lazy val reflections = new Reflections(Configuration.REFLECT_SCAN_PACKAGE, this.getClass.getClassLoader)
def jarOfClass(cls: Class[_]): Option[String] = {
val uri = cls.getResource("/" + cls.getName.replace('.', '/') + ".class")
if (uri != null) {
@@ -43,10 +39,7 @@ object ClassUtils {
}
def getClassInstance[T](className: String): T = {
- Thread.currentThread.getContextClassLoader
- .loadClass(className)
- .asInstanceOf[Class[T]]
- .newInstance()
+ Thread.currentThread.getContextClassLoader.loadClass(className).asInstanceOf[Class[T]].newInstance()
}
def getFieldVal(o: Any, name: String): Any = {
@@ -54,8 +47,8 @@ object ClassUtils {
val field = o.getClass.getDeclaredField(name)
field.setAccessible(true)
field.get(o)
- } { case t: Throwable =>
- throw t
+ } {
+ case t: Throwable => throw t
}
}
@@ -64,13 +57,14 @@ object ClassUtils {
val field = o.getClass.getDeclaredField(name)
field.setAccessible(true)
field.set(o, value.asInstanceOf[AnyRef])
- } { case t: Throwable =>
- throw t
+ } {
+ case t: Throwable => throw t
}
}
def isInterfaceOrAbstract(clazz: Class[_]): Boolean = {
- clazz.isInterface || Modifier.isAbstract(clazz.getModifiers)
+ clazz.isInterface || Modifier.isAbstract(clazz.getModifiers)
}
+
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala
index dbd2de0ab..70715a67b 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,17 +17,13 @@
package org.apache.linkis.common.utils
-import org.apache.linkis.common.conf.CommonVars
-
import org.apache.commons.lang3.StringUtils
+import org.apache.linkis.common.conf.CommonVars
object CodeAndRunTypeUtils {
private val CONF_LOCK = new Object()
- val CODE_TYPE_AND_RUN_TYPE_RELATION = CommonVars(
- "wds.linkis.codeType.runType.relation",
- "sql=>sql|hql|jdbc|hive|psql|fql|tsql,python=>python|py|pyspark,java=>java,scala=>scala,shell=>sh|shell"
- )
+ val CODE_TYPE_AND_RUN_TYPE_RELATION = CommonVars("wds.linkis.codeType.runType.relation", "sql=>sql|hql|jdbc|hive|psql|fql|tsql,python=>python|py|pyspark,java=>java,scala=>scala,shell=>sh|shell")
val RUN_TYPE_SQL = "sql"
val RUN_TYPE_PYTHON = "python"
@@ -40,26 +36,17 @@ object CodeAndRunTypeUtils {
private def codeTypeAndRunTypeRelationMapParser(configV: String): Map[String, List[String]] = {
val confDelimiter = ","
if (configV == null || "".equals(configV)) Map()
- else
- configV
- .split(confDelimiter)
- .filter(x => x != null && !"".equals(x))
- .map(x => {
- val confArr = x.split("=>")
- if (confArr.length == 2)
- (confArr(0), for (x <- confArr(1).split("\\|").toList) yield x.trim)
- else null
- })
- .filter(x => x != null)
- .toMap
+ else configV.split(confDelimiter).filter(x => x != null && !"".equals(x)).map(x => {
+ val confArr = x.split("=>")
+ if (confArr.length == 2) (confArr(0), for (x <- confArr(1).split("\\|").toList) yield x.trim) else null
+ }).filter(x => x != null).toMap
}
def getCodeTypeAndRunTypeRelationMap: Map[String, List[String]] = {
if (codeTypeAndRunTypeRelationMap == null) {
CONF_LOCK.synchronized {
if (codeTypeAndRunTypeRelationMap == null) {
- codeTypeAndRunTypeRelationMap =
- codeTypeAndRunTypeRelationMapParser(CODE_TYPE_AND_RUN_TYPE_RELATION.getValue)
+ codeTypeAndRunTypeRelationMap = codeTypeAndRunTypeRelationMapParser(CODE_TYPE_AND_RUN_TYPE_RELATION.getValue)
}
}
}
@@ -87,5 +74,4 @@ object CodeAndRunTypeUtils {
if (suffixListOfRunType.contains(suffix)) return true
false
}
-
}
diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/FileService.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/FileService.scala
index b72d283b5..9577abefe 100644
--- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/FileService.scala
+++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/FileService.scala
@@ -5,20 +5,21 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
... 325056 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org