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 51704268a feat: optimize process of closing spark job on k8s (#4957)
new 6affc4b2c The value configured by Linkis is trimmed.
new e1111ab54 linkis-cli add version info to source map
new 5aee61ca4 cs service supports active and standby configuration logic
new b8b82389a Linkis base info support to return linkis cluster info
new b21ad6efe [Feature][mg-eureka] List eureka service instance close #4884
new 3b2b1d2a5 The information returned by a running task should not
contain error information
new f1f944d6c code optimize
new 22497f7e5 UDF info add desc info return
new 49bd9a21a add new create file method support set owner
new bdc7a5c55 Distributed lock optimization adds lock holding attributes
to prevent repeated lock acquisition and unlocking errors.
new 1e70b84da add clear map method
new 46589aed3 Basic data management adds UDF tree management
new 8c59c621f fix csv file with utf-8 with bom chart[]
new b91ec0fc5 [Feature]New configuration management function added to the
management console #4842 [Feature]New user configuration function added to the
management console #4841
new 95566692d Add cross-cluster rule configuration
new f838aa129 add template conf feature
new d61915d2b add template conf and cross cluster ddl
new 293356eb9 Fix build error
new 2a66bf618 add instancio-junit module
new 8225429e8 Merge remote-tracking branch 'upstream/master' into
master-pes
new 08795ecd3 Fix integration test bug
new f8936ce0c Fix integration test bug
new 234c38eda Fix integration test bug
new 149f45e82 Merge pull request #4954 from WeDataSphere/master-pes
The 3977 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:
.../linkis/common/conf/BDPConfiguration.scala | 25 +-
.../org/apache/linkis/common/log/LogUtils.scala | 4 +-
.../apache/linkis/protocol/utils/TaskUtils.scala | 17 +-
.../linkis/storage/utils/FileSystemUtils.java | 59 ++
.../job/interactive/InteractiveJobDescBuilder.java | 11 +-
.../application/present/file/ResultFileWriter.java | 3 +-
.../governance/common/entity/TemplateConfKey.java | 79 ++
.../common/protocol/conf/TemplateConfRequest.java | 37 +-
.../common/protocol/conf/TemplateConfResponse.java | 20 +-
.../common/conf/GovernanceCommonConf.scala | 6 -
.../exception/GovernanceErrorException.scala | 2 +-
.../governance/common/paser/CodeParser.scala | 13 +-
.../common/paser/ScalaCodeParserTest.scala | 11 +-
.../linkis/templates/configmap-init-sql.yaml | 107 ++-
linkis-dist/package/db/linkis_ddl.sql | 91 ++-
linkis-dist/package/db/linkis_ddl_pg.sql | 67 +-
linkis-dist/package/db/linkis_dml.sql | 25 +-
.../package/db/module/linkis_configuration.sql | 38 +-
.../package/db/module/linkis_configuration_dml.sql | 5 -
linkis-dist/package/db/module/linkis_udf.sql | 9 +-
linkis-dist/package/db/udf/udf_sys.sql | 813 +++++++++++++++++++++
.../db/upgrade/1.5.0_schema/mysql/linkis_ddl.sql | 70 +-
.../linkis-configuration/pom.xml | 7 +
.../configuration/conf/AcrossClusterRuleKeys.java | 43 ++
...belMapper.java => AcrossClusterRuleMapper.java} | 21 +-
...apper.java => ConfigKeyLimitForUserMapper.java} | 18 +-
.../linkis/configuration/dao/ConfigMapper.java | 40 +-
.../linkis/configuration/dao/LabelMapper.java | 5 +
.../configuration/dao/TemplateConfigKeyMapper.java | 49 ++
.../{UserIpVo.java => AcrossClusterRule.java} | 120 +--
.../linkis/configuration/entity/ConfigKey.java | 99 +++
.../entity/ConfigKeyLimitForUser.java | 200 +++++
.../configuration/entity/ConfigKeyLimitVo.java} | 49 +-
.../configuration/entity/ConfigKeyValue.java | 12 +
.../{ConfigKeyValue.java => ConfigUserValue.java} | 183 ++---
.../configuration/entity/TemplateConfigKey.java | 200 +++++
.../configuration/entity/TemplateConfigKeyVO.java} | 17 +-
.../linkis/configuration/entity/UserIpVo.java | 2 +
.../enumeration/BoundaryTypeEnum.java} | 30 +-
.../LinkisConfigurationErrorCodeSummary.java | 6 +-
.../restful/api/AcrossClusterRuleRestfulApi.java | 332 +++++++++
.../restful/api/ConfigurationRestfulApi.java | 341 ++++++++-
.../restful/api/TemplateManagerRestfulApi.java | 277 +++++++
...yService.java => AcrossClusterRuleService.java} | 24 +-
.../configuration/service/ConfigKeyService.java | 15 +
...yService.java => TemplateConfigKeyService.java} | 30 +-
.../service/impl/AcrossClusterRuleServiceImpl.java | 103 +++
.../service/impl/ConfigKeyServiceImpl.java | 48 +-
.../service/impl/TemplateConfigKeyServiceImpl.java | 500 +++++++++++++
.../service/impl/TenantConfigServiceImpl.java | 56 +-
.../linkis/configuration/util/CommonUtils.java | 38 +
.../main/resources/mapper/common/LabelMapper.xml | 23 +-
.../mapper/mysql/AcrossClusterRuleMapper.xml | 130 ++++
.../mapper/mysql/ConfigKeyLimitForUserMapper.xml | 145 ++++
.../main/resources/mapper/mysql/ConfigMapper.xml | 243 +++++-
.../mapper/mysql/TemplateConfigKeyMapper.xml | 161 ++++
.../mapper/postgresql/AcrossClusterRuleMapper.xml | 130 ++++
.../postgresql/ConfigKeyLimitForUserMapper.xml | 145 ++++
.../resources/mapper/postgresql/ConfigMapper.xml | 278 ++++++-
.../mapper/postgresql/TemplateConfigKeyMapper.xml | 161 ++++
.../service/ConfigurationService.scala | 80 +-
.../dao/ConfigKeyLimitForUserMapperTest.java | 63 ++
.../linkis/configuration/dao/ConfigMapperTest.java | 29 +-
.../linkis/configuration/dao/LabelMapperTest.java | 17 -
.../dao/TemplateConfigKeyMapperTest.java | 96 +++
.../linkis/configuration/dao/UserIpMapperTest.java | 91 ---
.../configuration/dao/UserTenantMapperTest.java | 84 ---
.../exception/ConfigurationExceptionTest.java | 17 -
.../restful/api/ConfigurationRestfulApiTest.java | 2 +-
.../src/test/resources/application.properties | 1 -
.../src/test/resources/create.sql | 99 +--
.../src/test/resources/data.sql | 51 ++
.../linkis-cs-server/pom.xml | 5 +
.../linkis/cs/server/conf/ContextServerConf.java | 3 +
.../cs/server/label/CSInstanceLabelClient.java | 104 +++
.../instance/label/restful/InstanceRestful.java | 44 +-
.../label/service/impl/DefaultInsLabelService.java | 6 -
.../mapper/mysql/InsLabelRelationMapper.xml | 5 +-
.../mapper/postgresql/InsLabelRelationMapper.xml | 5 +-
.../cache/impl/DefaultQueryCacheManager.java | 7 +-
.../linkis/jobhistory/dao/JobHistoryMapper.java | 6 +-
.../jobhistory/restful/api/QueryRestfulApi.java | 73 +-
.../resources/mapper/mysql/JobHistoryMapper.xml | 6 +-
.../service/impl/JobHistoryQueryServiceImpl.scala | 5 +-
.../jobhistory/dao/JobHistoryMapperTest.java | 7 +-
.../src/test/resources/create.sql | 4 +-
.../client/handler/LinkisErrorCodeHandler.java | 2 +-
.../java/org/apache/linkis/udf/entity/UDFInfo.java | 10 +
.../org/apache/linkis/udf/entity/UDFManager.java | 20 +
.../basedatamanager/server/conf/UdfTreeConf.java} | 14 +-
.../server/dao/UdfBaseInfoMapper.java} | 19 +-
.../server/domain/UdfBaseInfoEntity.java} | 124 +++-
.../server/domain/UdfManagerEntity.java | 23 +
.../server/domain/UdfTreeEntity.java | 12 +
.../server/restful/ErrorCodeRestfulApi.java | 8 +-
.../server/restful/GatewayAuthTokenRestfulApi.java | 7 +-
.../RmExternalResourceProviderRestfulApi.java | 9 +-
.../server/restful/UdfManagerRestfulApi.java | 26 +-
.../server/restful/UdfTreeRestfulApi.java | 52 +-
.../server/service/UdfBaseInfoService.java} | 18 +-
.../service/impl/UdfBaseInfoServicelmpl.java | 19 +-
.../basedatamanager/server/utils/UdfTreeUtils.java | 93 +++
.../filesystem/restful/api/BMLFsRestfulApi.java | 4 +-
.../filesystem/restful/api/FsRestfulApi.java | 48 +-
.../src/test/resources/basedata_manager_create.sql | 29 +-
.../label/client/InstanceLabelClient.scala | 25 +-
.../common/lock/CommonLockSpringConfiguration.java | 2 +-
.../common/lock/dao/CommonLockMapper.java | 6 +-
.../common/lock/entity/CommonLock.java | 9 +
.../common/lock/service/CommonLockService.java | 2 +
.../service/impl/DefaultCommonLockService.java | 24 +-
.../resources/mapper/common/CommonLockMapper.xml | 13 +-
.../common/lock/dao/CommonLockMapperTest.java | 45 +-
.../linkis/udf/service/impl/UDFServiceImpl.java | 4 +
.../src/main/resources/mapper/mysql/UDFDao.xml | 55 +-
.../main/resources/mapper/mysql/UDFVersionDao.xml | 8 +-
.../main/resources/mapper/postgresql/UDFDao.xml | 54 +-
.../resources/mapper/postgresql/UDFVersionDao.xml | 6 +-
.../src/test/resources/create.sql | 23 +-
.../gateway/config/GatewayConfiguration.scala | 2 +
.../linkis/gateway/security/UserRestful.scala | 4 +-
pom.xml | 9 +
122 files changed, 6511 insertions(+), 1020 deletions(-)
create mode 100644
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/entity/TemplateConfKey.java
copy
linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
=>
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/protocol/conf/TemplateConfRequest.java
(50%)
copy
linkis-public-enhancements/linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/dao/CommonLockMapper.java
=>
linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/common/protocol/conf/TemplateConfResponse.java
(68%)
create mode 100644 linkis-dist/package/db/udf/udf_sys.sql
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/conf/AcrossClusterRuleKeys.java
copy
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/{LabelMapper.java
=> AcrossClusterRuleMapper.java} (55%)
copy
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/{LabelMapper.java
=> ConfigKeyLimitForUserMapper.java} (57%)
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/dao/TemplateConfigKeyMapper.java
copy
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/{UserIpVo.java
=> AcrossClusterRule.java} (55%)
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyLimitForUser.java
copy
linkis-public-enhancements/{linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
=>
linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/ConfigKeyLimitVo.java}
(51%)
copy
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/{ConfigKeyValue.java
=> ConfigUserValue.java} (56%)
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/TemplateConfigKey.java
copy
linkis-public-enhancements/{linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
=>
linkis-configuration/src/main/java/org/apache/linkis/configuration/entity/TemplateConfigKeyVO.java}
(72%)
copy
linkis-public-enhancements/{linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java
=>
linkis-configuration/src/main/java/org/apache/linkis/configuration/enumeration/BoundaryTypeEnum.java}
(76%)
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/AcrossClusterRuleRestfulApi.java
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java
copy
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/{ConfigKeyService.java
=> AcrossClusterRuleService.java} (56%)
copy
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/{ConfigKeyService.java
=> TemplateConfigKeyService.java} (55%)
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/AcrossClusterRuleServiceImpl.java
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/TemplateConfigKeyServiceImpl.java
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/mysql/AcrossClusterRuleMapper.xml
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/mysql/ConfigKeyLimitForUserMapper.xml
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/mysql/TemplateConfigKeyMapper.xml
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/postgresql/AcrossClusterRuleMapper.xml
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/postgresql/ConfigKeyLimitForUserMapper.xml
create mode 100644
linkis-public-enhancements/linkis-configuration/src/main/resources/mapper/postgresql/TemplateConfigKeyMapper.xml
create mode 100644
linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/ConfigKeyLimitForUserMapperTest.java
create mode 100644
linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/TemplateConfigKeyMapperTest.java
delete mode 100644
linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/UserIpMapperTest.java
delete mode 100644
linkis-public-enhancements/linkis-configuration/src/test/java/org/apache/linkis/configuration/dao/UserTenantMapperTest.java
create mode 100644
linkis-public-enhancements/linkis-configuration/src/test/resources/data.sql
create mode 100644
linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java
copy
linkis-public-enhancements/{linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
=>
linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/conf/UdfTreeConf.java}
(72%)
copy
linkis-public-enhancements/{linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
=>
linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/dao/UdfBaseInfoMapper.java}
(63%)
copy
linkis-public-enhancements/{linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java
=>
linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/domain/UdfBaseInfoEntity.java}
(52%)
copy
linkis-public-enhancements/{linkis-ps-common-lock/src/main/java/org/apache/linkis/publicservice/common/lock/service/CommonLockService.java
=>
linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/UdfBaseInfoService.java}
(67%)
copy
linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/GovernanceErrorException.scala
=>
linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/service/impl/UdfBaseInfoServicelmpl.java
(59%)
create mode 100644
linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/basedatamanager/server/utils/UdfTreeUtils.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
