This is an automated email from the ASF dual-hosted git repository. casion pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/linkis.git
commit 5cd2de33ae9fd29f49ccb3002397443a5079b3ef Merge: f6617d0771 5831a19b1f Author: Casion <[email protected]> AuthorDate: Tue Jun 11 10:47:37 2024 +0800 Merge pull request #5126 from WeDataSphere/master-1.6.0 1. Entrance result set directory unified optimization 2. Entrance memory usage Optimize 3. JDBC Driver support use default db .../apache/linkis/common/conf/Configuration.scala | 7 + .../linkis/hadoop/common/utils/KerberosUtils.java | 93 ++++- .../linkis/hadoop/common/conf/HadoopConf.scala | 2 +- .../linkis/hadoop/common/utils/HDFSUtils.scala | 5 +- .../hadoop/common/utils/KerberosUtilsTest.java | 2 +- .../linkis/hadoop/common/conf/HadoopConfTest.scala | 2 +- .../linkis/httpclient/AbstractHttpClient.scala | 29 +- .../linkis/httpclient/config/ClientConfig.scala | 7 +- .../httpclient/config/ClientConfigBuilder.scala | 10 +- .../org/apache/linkis/proxy/ProxyUserService.java | 6 +- .../linkis/server/utils/ModuleUserUtils.java | 4 + .../org/apache/linkis/utils/LinkisSpringUtils.java | 48 +++ .../linkis/scheduler/AbstractScheduler.scala | 13 +- .../scheduler/conf/SchedulerConfiguration.scala | 3 + .../linkis/scheduler/queue/ConsumeQueue.scala | 2 + .../apache/linkis/scheduler/queue/Consumer.scala | 6 + .../org/apache/linkis/scheduler/queue/Job.scala | 6 +- .../linkis/scheduler/queue/LoopArrayQueue.scala | 2 +- .../queue/fifoqueue/FIFOUserConsumer.scala | 14 + .../parallelqueue/ParallelConsumerManager.scala | 5 + .../ParallelSchedulerContextImpl.scala | 6 + .../apache/linkis/cli/application/CtxBuilder.java | 5 + .../cli/application/LinkisClientApplication.java | 2 +- .../command/template/option/BaseOption.java | 2 +- .../interactor/command/template/option/Flag.java | 9 +- .../client/once/LinkisManagerClient.scala | 12 +- .../client/once/action/ListEngineConnAction.scala | 48 +++ .../client/once/result/GetEngineConnResult.scala | 38 ++ ...ConnResult.scala => ListEngineConnResult.scala} | 12 +- .../{UJESClientImpl.scala => LinkisFSClient.scala} | 35 +- .../org/apache/linkis/ujes/client/UJESClient.scala | 57 ++- .../apache/linkis/ujes/client/UJESClientImpl.scala | 2 +- ...ultSetAction.scala => CreateNewDirAction.scala} | 57 +-- ...sultSetAction.scala => IsPathExistAction.scala} | 50 +-- .../ujes/client/request/ResultSetAction.scala | 8 + ...esultSetAction.scala => UploadFileAction.scala} | 72 ++-- .../ujes/client/response/CreateNewDirResult.scala} | 24 +- ...sultSetResult.scala => IsPathExistResult.scala} | 24 +- .../ujes/client/response/ResultSetResult.scala | 28 ++ .../ujes/client/response/UploadFileResult.scala} | 24 +- .../linkis/ujes/client/utils/UJESClientUtils.scala | 35 ++ .../common/constant/ec/ECConstants.scala | 4 + .../common/constant/job/JobRequestConstants.scala | 4 + .../{TenantConf.scala => AcrossClusterConf.scala} | 6 +- .../{TenantConf.scala => DepartmentConf.scala} | 6 +- .../common/protocol/conf/TenantConf.scala | 11 +- .../linkis/governance/common/utils/JobUtils.scala | 30 +- .../linkis/ecm/server/conf/ECMConfiguration.scala | 9 +- .../server/service/impl/ECMListenerService.scala | 1 - .../apache/linkis/ecm/server/util/ECMUtils.scala | 3 +- .../concurrent/monitor/TimingMonitorService.java | 6 +- .../executor/exception/HookExecuteException.java} | 24 +- .../engineconn/common/conf/EngineConnConf.scala | 4 + .../common/conf/EngineConnConstant.scala | 8 + .../linkis/engineconn/core/hook/ShutdownHook.scala | 10 + .../acessible/executor/log/SendAppender.java | 19 + .../conf/AccessibleExecutorConfiguration.scala | 11 +- .../execution/AccessibleEngineConnExecution.scala | 38 ++ .../executor/info/NodeHealthyInfoManager.scala | 31 +- .../executor/lock/EngineConnTimedLock.scala | 17 +- .../service/DefaultAccessibleService.scala | 1 - .../service/DefaultExecutorHeartbeatService.scala | 32 +- .../executor/service/DefaultManagerService.scala | 3 + .../service/ExecutorHeartbeatService.scala | 2 + .../executor/utils/AccessableExecutorUtils.scala} | 20 +- .../common/conf/EnvConfiguration.scala | 4 +- .../JavaProcessEngineConnLaunchBuilder.scala | 52 +-- .../linkis/entrance/job/EntranceExecutionJob.java | 50 ++- .../persistence/QueryPersistenceManager.java | 1 + .../entrance/restful/EntranceLabelRestfulApi.java | 26 +- .../entrance/restful/EntranceRestfulApi.java | 31 +- .../entrance/conf/EntranceConfiguration.scala | 14 +- .../entrance/execute/DefaultEntranceExecutor.scala | 5 +- .../linkis/entrance/execute/EntranceJob.scala | 5 +- .../interceptor/impl/CustomVariableUtils.scala | 30 +- .../impl/StorePathEntranceInterceptor.scala | 47 ++- .../interceptor/impl/TemplateConfUtils.scala | 14 +- .../impl/VarSubstitutionInterceptor.scala | 2 +- .../org/apache/linkis/entrance/log/Cache.scala | 7 +- .../linkis/entrance/log/CacheLogReader.scala | 38 +- .../linkis/entrance/log/CacheLogWriter.scala | 22 +- .../linkis/entrance/log/HDFSCacheLogWriter.scala | 35 +- .../org/apache/linkis/entrance/log/LogReader.scala | 7 +- .../org/apache/linkis/entrance/log/LoopArray.scala | 51 ++- .../linkis/entrance/utils/CommonLogPathUtils.scala | 37 ++ .../org/apache/linkis/ujes/jdbc/UJESSQLDriver.java | 3 + .../linkis/ujes/jdbc/LinkisSQLConnection.scala | 40 +- .../linkis/ujes/jdbc/UJESClientFactory.scala | 53 ++- .../linkis/ujes/jdbc/UJESSQLDriverMain.scala | 5 + .../apache/linkis/ujes/jdbc/UJESSQLResultSet.scala | 12 +- .../manager/label/constant/LabelKeyConstant.java | 2 + .../manager/label/entity/cluster/ClusterLabel.java | 3 +- .../label/entity/engine/DriverTaskLabel.java} | 35 +- .../manager/label/entity/engine/EngineType.scala | 2 + .../linkis/manager/label/utils/LabelUtil.scala | 16 +- .../factory/StdLabelBuilderFactoryTest.java | 15 + .../HiveEngineConcurrentConnExecutor.scala | 7 +- .../hive/executor/HiveEngineConnExecutor.scala | 88 +++-- .../engineplugin/spark/executor/SQLSession.scala | 7 +- .../spark/executor/SparkPythonExecutor.scala | 27 +- .../spark/executor/SparkScalaExecutor.scala | 75 ++-- .../spark/executor/SparkSqlExecutor.scala | 13 + .../configuration/conf/AcrossClusterRuleKeys.java | 24 +- .../configuration/dao/AcrossClusterRuleMapper.java | 29 +- .../linkis/configuration/dao/DepartmentMapper.java | 20 +- ...RuleMapper.java => DepartmentTenantMapper.java} | 24 +- .../{TenantVo.java => DepartmentTenantVo.java} | 78 ++-- .../linkis/configuration/entity/DepartmentVo.java | 185 +++++++++ .../linkis/configuration/entity/TenantVo.java | 13 + .../restful/api/AcrossClusterRuleRestfulApi.java | 431 +++++++++++++++++---- .../restful/api/ConfigurationRestfulApi.java | 47 +-- ...agerRestfulApi.java => TemplateRestfulApi.java} | 13 +- .../restful/api/TenantConfigrationRestfulApi.java | 132 ++++++- .../service/AcrossClusterRuleService.java | 22 +- .../{TenantService.java => DepartmentService.java} | 8 +- .../configuration/service/TenantConfigService.java | 14 + .../configuration/service/TenantService.java | 4 + .../service/impl/AcrossClusterRuleServiceImpl.java | 84 +++- ...ServiceImpl.java => DepartmentServiceImpl.java} | 32 +- .../service/impl/TenantConfigServiceImpl.java | 118 ++++-- .../service/impl/TenantServiceImpl.java | 33 +- .../util/{HttpsUtil.java => ClientUtil.java} | 10 +- .../linkis/configuration/util/CommonUtils.java | 43 +- .../resources/mapper/common/DepartmentMapper.xml | 38 ++ .../mapper/mysql/AcrossClusterRuleMapper.xml | 87 ++++- .../resources/mapper/mysql/UserTenantMapper.xml | 19 +- .../linkis/configuration/conf/Configuration.scala | 3 + .../service/ConfigurationService.scala | 39 +- .../configuration/util/LabelParameterParser.scala | 6 +- 129 files changed, 2717 insertions(+), 836 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
