This is an automated email from the ASF dual-hosted git repository.

casion pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git


    from f6617d0771 refactor: data clumps (#5119)
     add 15ce8f900b Linkis Clent Feature optimization, adding FSClient and 
enriching LinkisManagerClient
     add 63e06aa478 Engine support marking as unhealthy to exit gracefully
     add e5add910a0 Current Engine supports automatic exit
     add 434e14b75d Fix engine exit hang bug
     add 787eb47a55 add ec HookExecuteException
     add fa1328b90f add across cluster and department conf
     add 988069abc7 optimize Configuration module
     add 36f725826b shutdown hook optimize
     add 23355f9673 ec support add extra classpath
     add 6b1a822986 Fix log loss issue
     add 24092c0d86 The result set path is changed to a unified path
     add edad487ec6 log optimize
     add d7afbdd2cf Entrance memory usage optimization
     add 49cd11e56d HDFS kerberos support refresh ticket
     add c2c78a9643 Http client support ssl
     add aa039a4c85 jdbc support url default db
     add 198860c155 add task label
     add a9836346e3 add module utils
     add 84601377c0 job support clear and log optimize
     add 8389e4084b jdbc driver support url default db
     add 5831a19b1f Fix build issue
     new 5cd2de33ae Merge pull request #5126 from WeDataSphere/master-1.6.0

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.


Summary of changes:
 .../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} |   7 +-
 .../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 +-
 ...InfoAction.scala => ListEngineConnAction.scala} |  24 +-
 .../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 +-
 ...etListAction.scala => CreateNewDirAction.scala} |  33 +-
 ...SetListAction.scala => IsPathExistAction.scala} |  26 +-
 .../ujes/client/request/ResultSetAction.scala      |   8 +
 ...tSetListAction.scala => UploadFileAction.scala} |  54 ++-
 ...bserveResult.scala => CreateNewDirResult.scala} |   9 +-
 ...tTablesResult.scala => IsPathExistResult.scala} |   8 +-
 .../ujes/client/response/ResultSetResult.scala     |  28 ++
 ...bObserveResult.scala => UploadFileResult.scala} |   9 +-
 .../linkis/ujes/client/utils/UJESClientUtils.scala |  35 ++
 .../common/constant/ec/ECConstants.scala           |   4 +
 .../common/constant/job/JobRequestConstants.scala  |   4 +
 .../{TenantConf.scala => AcrossClusterConf.scala}  |   6 +-
 ...anceInstanceConf.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}  |  14 +-
 .../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}  |  28 +-
 .../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 +-
 ...ntEngineConnLabel.java => DriverTaskLabel.java} |  20 +-
 .../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 |  10 +-
 ...nantMapper.java => DepartmentTenantMapper.java} |  21 +-
 .../{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 +-
 .../{UserIpService.java => DepartmentService.java} |   8 +-
 .../configuration/service/TenantConfigService.java |  14 +
 .../configuration/service/TenantService.java       |   4 +
 .../service/impl/AcrossClusterRuleServiceImpl.java |  84 +++-
 ...ServiceImpl.java => DepartmentServiceImpl.java} |  31 +-
 .../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}  |  32 +-
 .../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, 2632 insertions(+), 749 deletions(-)
 copy 
linkis-commons/{linkis-common/src/main/scala/org/apache/linkis/common/io/Record.scala
 => linkis-module/src/main/java/org/apache/linkis/proxy/ProxyUserService.java} 
(84%)
 create mode 100644 
linkis-commons/linkis-module/src/main/java/org/apache/linkis/utils/LinkisSpringUtils.java
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/action/{ECResourceInfoAction.scala
 => ListEngineConnAction.scala} (71%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/result/{GetEngineConnResult.scala
 => ListEngineConnResult.scala} (72%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/{UJESClientImpl.scala
 => LinkisFSClient.scala} (52%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/{ResultSetListAction.scala
 => CreateNewDirAction.scala} (67%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/{ResultSetListAction.scala
 => IsPathExistAction.scala} (69%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/request/{ResultSetListAction.scala
 => UploadFileAction.scala} (54%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/{JobObserveResult.scala
 => CreateNewDirResult.scala} (84%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/{GetTablesResult.scala
 => IsPathExistResult.scala} (83%)
 copy 
linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/ujes/client/response/{JobObserveResult.scala
 => UploadFileResult.scala} (84%)
 copy 
linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/conf/{TenantConf.scala
 => AcrossClusterConf.scala} (83%)
 copy 
linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/protocol/conf/{EntranceInstanceConf.scala
 => DepartmentConf.scala} (82%)
 copy 
linkis-computation-governance/{linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/exception/LabelRuntimeException.java
 => 
linkis-engineconn/linkis-computation-engineconn/src/main/java/org/apache/linkis/engineconn/computation/executor/exception/HookExecuteException.java}
 (76%)
 copy 
linkis-computation-governance/{linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/entity/metrics/NodeHealthyInfo.java
 => 
linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/utils/AccessableExecutorUtils.scala}
 (63%)
 copy 
linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/{ConcurrentEngineConnLabel.java
 => DriverTaskLabel.java} (78%)
 copy 
linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-authentication/src/main/java/org/apache/linkis/gateway/authentication/dao/TokenDao.java
 => 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/DepartmentMapper.java
 (77%)
 copy 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/{UserTenantMapper.java
 => DepartmentTenantMapper.java} (67%)
 copy 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/{TenantVo.java
 => DepartmentTenantVo.java} (69%)
 create mode 100644 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/DepartmentVo.java
 rename 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/{TemplateManagerRestfulApi.java
 => TemplateRestfulApi.java} (95%)
 copy 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/{UserIpService.java
 => DepartmentService.java} (75%)
 copy 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/{UserIpServiceImpl.java
 => DepartmentServiceImpl.java} (52%)
 rename 
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/{HttpsUtil.java
 => ClientUtil.java} (93%)
 copy 
linkis-public-enhancements/{linkis-pes-publicservice/src/main/resources/mapper/common/ErrorCodeMapper.xml
 => linkis-configuration/src/main/resources/mapper/common/DepartmentMapper.xml} 
(55%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to