This is an automated email from the ASF dual-hosted git repository. peacewong pushed a change to branch dev-1.3.0 in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from 47d73473e test add Asia/Shanghai add c7791d2a3 refactor(style): fix the scala's maxColumn from 98 to 100 (#3164) No new revisions were added by this update. Summary of changes: .scalafmt.conf | 2 +- .../linkis/common/collection/LoopArray.scala | 8 +- .../linkis/common/conf/BDPConfiguration.scala | 36 +++--- .../linkis/common/conf/DWCArgumentsParser.scala | 12 +- .../linkis/common/listener/ListenerEventBus.scala | 18 +-- .../org/apache/linkis/common/utils/Logging.scala | 4 +- .../org/apache/linkis/common/utils/ZipUtils.scala | 4 +- .../linkis/common/variable/CustomDateType.scala | 6 +- .../linkis/common/variable/VariableType.scala | 25 +--- .../common/utils/CodeAndRunTypeUtilsTest.scala | 6 +- .../linkis/hadoop/common/conf/HadoopConf.scala | 6 +- .../linkis/httpclient/AbstractHttpClient.scala | 23 ++-- .../linkis/httpclient/request/UploadAction.scala | 8 +- .../linkis/server/conf/ServerConfiguration.scala | 12 +- .../linkis/server/security/SecurityFilter.scala | 4 +- .../protocol/callback/LogCallbackProtocol.scala | 3 +- .../linkis/protocol/utils/ZuulEntranceUtils.scala | 6 +- .../org/apache/linkis/rpc/BaseRPCSender.scala | 4 +- .../main/scala/org/apache/linkis/rpc/Sender.scala | 27 ++-- .../apache/linkis/rpc/conf/RPCConfiguration.scala | 6 +- .../linkis/rpc/exception/DWCURIException.scala | 3 +- .../rpc/interceptor/RPCInterceptorExchange.scala | 3 +- .../linkis/rpc/sender/SpringMVCRPCSender.scala | 4 +- .../org/apache/linkis/rpc/sender/UnionSender.scala | 4 +- .../rpc/sender/eureka/EurekaRPCServerLoader.scala | 15 ++- .../scheduler/executer/AbstractExecutor.scala | 4 +- .../scheduler/executer/ExecuteResponse.scala | 3 +- .../scheduler/listener/ExecutorListener.scala | 6 +- .../org/apache/linkis/scheduler/queue/Job.scala | 11 +- .../apache/linkis/scheduler/queue/JobInfo.scala | 4 +- .../queue/fifoqueue/FIFOSchedulerContextImpl.scala | 8 +- .../queue/fifoqueue/FIFOUserConsumer.scala | 12 +- .../conf/SchedulerConfigurationTest.scala | 6 +- .../org/apache/linkis/storage/FSFactory.scala | 19 ++- .../org/apache/linkis/storage/io/IOClient.scala | 6 +- .../resultset/DefaultResultSetFactory.scala | 9 +- .../storage/resultset/ResultSetFactory.scala | 4 +- .../script/reader/StorageScriptFsReader.scala | 6 +- .../computation/client/LinkisJobBuilder.scala | 3 +- .../computation/client/LinkisJobClient.scala | 5 +- .../computation/client/ResultSetIterator.scala | 7 +- .../linkis/computation/client/once/OnceJob.scala | 5 +- .../client/once/simple/SimpleOnceJob.scala | 6 +- .../impl/EngineConnDiagnosisOperator.scala | 4 +- .../operator/impl/EngineConnLogOperator.scala | 5 +- .../operator/impl/EngineConnProgressOperator.scala | 4 +- .../protocol/engineconn/RequestEngineStatus.scala | 3 +- .../common/utils/EngineConnArguments.scala | 4 +- .../ecm/core/launch/ProcessEngineConnLaunch.scala | 3 +- .../linkis/ecm/server/conf/ECMConfiguration.scala | 6 +- .../linkis/ecm/server/listener/ECMReadyEvent.scala | 3 +- .../ecm/server/metrics/DefaultECMMetrics.scala | 11 +- .../ecm/server/report/DefaultECMHealthReport.scala | 3 +- .../server/service/EngineConnLaunchService.scala | 5 +- .../service/ResourceLocalizationService.scala | 5 +- .../impl/AbstractEngineConnLaunchService.scala | 6 +- .../service/impl/DefaultECMHealthService.scala | 4 +- .../DefaultEngineConnStatusCallbackService.scala | 4 +- .../impl/DefaultLocalDirsHandleService.scala | 6 +- .../service/impl/DefaultYarnCallbackService.scala | 4 +- .../impl/ProcessEngineConnLaunchService.scala | 6 +- .../apache/linkis/ecm/server/util/ECMUtils.scala | 3 +- .../executor/execute/ComputationExecutor.scala | 4 +- .../executor/execute/EngineExecutionContext.scala | 6 +- .../computation/executor/hook/InitSQLHook.scala | 6 +- .../service/TaskExecutionServiceImpl.scala | 15 +-- .../upstream/access/ECTaskEntranceInfoAccess.scala | 15 ++- .../access/ECTaskEntranceInfoAccessHelper.scala | 5 +- .../execution/AbstractEngineConnExecution.scala | 6 +- .../linkis/engineconn/core/hook/ShutdownHook.scala | 4 +- .../engineconn/launch/EngineConnServer.scala | 9 +- .../execution/AccessibleEngineConnExecution.scala | 9 +- .../service/DefaultAccessibleService.scala | 4 +- .../service/DefaultExecutorHeartbeatService.scala | 4 +- .../acessible/executor/service/LockService.scala | 3 +- .../executor/entity/SensibleExecutor.scala | 5 +- .../listener/EngineConnAsyncListenerBus.scala | 8 +- .../common/creation/ExecutorFactory.scala | 5 +- .../JavaProcessEngineConnLaunchBuilder.scala | 20 ++- .../process/ProcessEngineConnLaunchBuilder.scala | 8 +- .../resource/AbstractEngineResourceFactory.scala | 4 +- .../common/resource/UserNodeResource.scala | 3 +- .../service/DefaultEngineConnLaunchService.scala | 25 ++-- .../DefaultEngineConnResourceFactoryService.scala | 4 +- .../apache/linkis/entrance/EntranceServer.scala | 6 +- .../linkis/entrance/EntranceWebSocketService.scala | 10 +- .../entrance/conf/EntranceConfiguration.scala | 8 +- .../linkis/entrance/cs/CSEntranceHelper.scala | 5 +- .../linkis/entrance/event/EntranceLogEvent.scala | 6 +- .../entrance/execute/DefaultEntranceExecutor.scala | 16 +-- .../linkis/entrance/execute/EntranceJob.scala | 3 +- .../execute/impl/EntranceExecutorManagerImpl.scala | 6 +- .../entrance/interceptor/EntranceInterceptor.scala | 9 +- .../entrance/interceptor/OnceJobInterceptor.scala | 9 +- .../interceptor/impl/CommentInterceptor.scala | 9 +- .../linkis/entrance/interceptor/impl/Explain.scala | 7 +- .../interceptor/impl/LabelCheckInterceptor.scala | 9 +- .../impl/ParserVarLabelInterceptor.scala | 5 +- .../impl/PythonCodeCheckInterceptor.scala | 4 +- .../impl/ShellDangerousGrammerInterceptor.scala | 9 +- .../impl/StorePathEntranceInterceptor.scala | 9 +- .../linkis/entrance/log/ErrorCodeListener.scala | 3 +- .../org/apache/linkis/entrance/log/LogReader.scala | 11 +- .../EntranceUserParallelOrchestratorPlugin.scala | 11 +- .../entrance/parser/CommonEntranceParser.scala | 5 +- .../entrance/persistence/PersistenceEngine.scala | 4 +- .../entrance/persistence/PersistenceManager.scala | 5 +- .../entrance/restful/EntranceRestfulRemote.scala | 5 +- .../entrance/scheduler/EntranceGroupFactory.scala | 5 +- .../cache/CacheOutputExecuteResponse.scala | 3 +- .../manager/am/manager/DefaultEMNodeManager.scala | 15 +-- .../am/manager/DefaultEngineNodeManager.scala | 11 +- .../linkis/manager/am/manager/EMNodeManager.scala | 7 +- .../manager/am/manager/EngineNodeManager.scala | 5 +- .../manager/am/pointer/DefaultEMNodPointer.scala | 9 +- .../pointer/DefaultEngineConnPluginPointer.scala | 9 +- .../cache/ConfCacheRemoveBroadcastListener.scala | 4 +- .../engine/DefaultEngineAskEngineService.scala | 5 +- .../engine/DefaultEngineConnCanKillService.scala | 4 +- .../DefaultEngineConnStatusCallbackService.scala | 4 +- .../engine/DefaultEngineCreateService.scala | 21 +--- .../engine/DefaultEngineRecycleService.scala | 5 +- .../service/engine/DefaultEngineReuseService.scala | 5 +- .../engine/EngineConnStatusCallbackService.scala | 4 +- .../am/service/heartbeat/AMHeartbeatService.scala | 9 +- .../am/service/monitor/NodeHeartbeatMonitor.scala | 47 +++---- .../apache/linkis/manager/am/utils/AMUtils.scala | 12 +- .../impl/DefaultNodeLabelRemoveService.scala | 4 +- .../service/impl/DefaultNodeLabelService.scala | 5 +- .../service/impl/DefaultResourceLabelService.scala | 10 +- .../linkis/manager/rm/restful/RMMonitorRest.scala | 137 ++++++++++----------- .../manager/rm/service/LabelResourceService.scala | 6 +- .../rm/service/RequestResourceService.scala | 12 +- .../manager/rm/service/ResourceManager.scala | 8 +- .../rm/service/impl/DefaultResourceManager.scala | 42 +++---- .../rm/service/impl/UserResourceService.scala | 13 +- .../apache/linkis/manager/rm/utils/RMUtils.scala | 5 +- .../manager/common/entity/resource/Resource.scala | 13 +- .../linkis/manager/common/operator/Operator.scala | 4 +- .../manager/common/utils/ResourceUtils.scala | 8 +- .../executer/client/ElasticSearchResponse.scala | 7 +- .../elasticsearch/executer/client/EsClient.scala | 8 +- .../flink/executor/FlinkExecutor.scala | 10 +- .../executor/FlinkSQLComputationExecutor.scala | 5 +- .../flink/factory/FlinkEngineConnFactory.scala | 10 +- .../flink/ql/impl/CreateTableAsSelectGrammar.scala | 9 +- .../flink/setting/HudiSettings.scala | 5 +- .../engineconnplugin/flink/setting/Settings.scala | 5 +- .../hive/executor/HiveEngineConnExecutor.scala | 12 +- .../linkis/engineplugin/hive/log/LogHelper.scala | 6 +- .../io/executor/IoEngineConnExecutor.scala | 4 +- .../jdbc/executer/JDBCEngineConnExecutor.scala | 4 +- .../jdbc/executer/JDBCMultiDatasourceParser.scala | 4 +- .../TestJDBCEngineConnExecutor.scala | 5 +- .../factory/OpenLooKengEngineConnFactory.scala | 4 +- .../exception/PythonSessionNullException.scala | 3 +- .../python/executor/PythonEngineConnExecutor.scala | 16 +-- .../python/executor/PythonSession.scala | 5 +- .../python/hook/PythonVersionEngineHook.scala | 8 +- .../conf/TestPythonEngineConfiguration.scala | 5 +- .../shell/executor/ShellEngineConnExecutor.scala | 19 +-- .../spark/Interpreter/PythonInterpreter.scala | 7 +- .../args/SparkPythonArgsPreExecutionHook.scala | 4 +- .../spark/cs/CSSparkPreExecutionHook.scala | 5 +- .../engineplugin/spark/executor/SQLSession.scala | 6 +- .../spark/executor/SparkScalaExecutor.scala | 9 +- .../spark/factory/SparkEngineConnFactory.scala | 10 +- .../engineplugin/spark/imexport/CsvRelation.scala | 4 +- .../engineplugin/spark/imexport/LoadData.scala | 10 +- ...SparkSubmitProcessEngineConnLaunchBuilder.scala | 8 +- .../execution/datasources/csv/DolphinToSpark.scala | 9 +- .../sqoop/executor/SqoopExecutor.scala | 6 +- .../sqoop/executor/SqoopOnceCodeExecutor.scala | 18 +-- .../linkis/storage/io/client/DefaultIOClient.scala | 4 +- .../io/iteraceptor/IOMethodInterceptor.scala | 13 +- .../ComputationOrchestratorSessionFactory.scala | 5 +- .../physical/ComputePhysicalTransform.scala | 5 +- .../catalyst/planner/TaskPlannerTransform.scala | 10 +- .../reheater/PruneTaskReheaterTransform.scala | 6 +- .../computation/entity/ComputationJobReq.scala | 3 +- .../computation/execute/CodeExecTaskExecutor.scala | 9 +- .../execute/CodeExecTaskExecutorManager.scala | 9 +- .../computation/monitor/EngineConnMonitor.scala | 11 +- .../computation/operation/log/LogProcessor.scala | 7 +- .../progress/DefaultProgressOperation.scala | 12 +- .../resource/ResourceReportOperation.scala | 5 +- .../computation/physical/CacheExecTask.scala | 11 +- .../physical/CodeLogicalUnitExecTask.scala | 5 +- .../service/ComputationTaskExecutionReceiver.scala | 9 +- .../conf/OrchestratorConfiguration.scala | 6 +- .../orchestrator/converter/AbstractConverter.scala | 5 +- .../orchestrator/converter/ConverterImpl.scala | 5 +- .../orchestrator/core/AbstractOrchestration.scala | 3 +- .../core/AbstractOrchestratorSessionBuilder.scala | 77 ++++++------ .../orchestrator/execution/ExecTaskRunner.scala | 8 +- .../execution/impl/AbstractTaskManager.scala | 6 +- .../execution/impl/BaseExecutionTask.scala | 5 +- .../execution/impl/BaseTaskResponse.scala | 3 +- .../execution/impl/DefaultTaskManager.scala | 28 ++--- .../execution/impl/NotifyTaskConsumer.scala | 11 +- .../listener/OrchestratorListenerBusContext.scala | 14 +-- .../execution/ExecutionTaskCompletedListener.scala | 4 +- .../listener/execution/ExecutionTaskEvent.scala | 6 +- .../planner/command/ExplainCommandDesc.scala | 3 +- .../strategy/async/AsyncExecTaskRunnerImpl.scala | 5 +- .../ecm/LoadBalanceLabelEngineConnManager.scala | 5 +- .../linkis/orchestrator/ecm/entity/MarkReq.scala | 6 +- .../linkis/bml/client/impl/HttpBmlClient.scala | 6 +- .../configuration/service/CategoryService.scala | 4 +- .../service/ConfigurationService.scala | 7 +- .../configuration/util/LabelParameterParser.scala | 10 +- .../datasource/client/DataSourceRemoteClient.scala | 4 +- .../DataSourceClientBuilderException.scala | 3 +- .../client/impl/LinkisMetaDataRemoteClient.scala | 5 +- .../request/PublishDataSourceVersionAction.scala | 8 +- .../linkis/metadata/ddl/ImportDDLCreator.scala | 4 +- .../errorcode/client/utils/ErrorCodeMatcher.scala | 5 +- .../label/service/InsLabelRpcService.scala | 6 +- .../service/rpc/DefaultInsLabelRpcService.scala | 5 +- .../jobhistory/conversions/TaskConversions.scala | 4 +- .../filesystem/validator/PathValidator.scala | 7 +- .../linkis/gateway/http/GatewayContext.scala | 3 +- .../linkis/gateway/route/GatewayRouter.scala | 3 +- .../linkis/gateway/security/ProxyUserUtils.scala | 4 +- .../linkis/gateway/security/SecurityFilter.scala | 11 +- .../linkis/gateway/security/UserRestful.scala | 13 +- .../gateway/security/sso/SSOInterceptor.scala | 3 +- .../security/token/TokenAuthentication.scala | 5 +- .../dws/discovery/DWSGatewayDiscovery.scala | 6 +- .../dws/discovery/DefaultConfigDiscovery.scala | 6 +- .../ujes/route/HaContextGatewayRouter.scala | 4 +- .../route/contextservice/ContextIdParserImpl.scala | 11 +- .../SpringCloudGatewayConfiguration.scala | 67 +++++----- .../http/LinkisGatewayHttpHeadersFilter.scala | 5 +- .../http/SpringCloudGatewayHttpRequest.scala | 3 +- .../http/SpringCloudGatewayHttpResponse.scala | 5 +- .../SpringCloudGatewayWebsocketUtils.scala | 5 +- .../websocket/WebsocketGatewaySession.scala | 5 +- tool/code-style-idea.xml | 1 + 239 files changed, 680 insertions(+), 1391 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@linkis.apache.org For additional commands, e-mail: commits-h...@linkis.apache.org