You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2022/06/09 02:16:51 UTC
[incubator-linkis] 01/01: Merge pull request #2251 from apache/dev-1.1.3
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 7a4a0cf5d631a5b1924567daa02a1528131476e1
Merge: be0a96895 c7c5a5ff9
Author: allenlliu <40...@qq.com>
AuthorDate: Thu Jun 9 10:16:44 2022 +0800
Merge pull request #2251 from apache/dev-1.1.3
Merge branch dev-1.1.3 to Master
LICENSE-binary | 8 +-
.../assembly-combined/conf/log4j2.xml | 1 -
assembly-combined-package/bin/install.sh | 16 +
.../deploy-config/linkis-env.sh | 3 +
db/linkis_ddl.sql | 65 +-
db/module/linkis-cs.sql | 101 +--
db/upgrade/1.1.3_schema/mysql/linkis_ddl.sql | 69 ++
.../apache/linkis/common/conf/Configuration.scala | 4 +
.../apache/linkis/common/utils/VariableUtils.scala | 479 ++++++-----
.../linkis/common/variable/CustomDateType.scala | 225 ++++++
.../linkis/common/variable/DateTypeUtils.scala | 224 ++++++
.../linkis/common/variable/VariableType.scala | 163 ++++
linkis-commons/linkis-module/pom.xml | 5 +
.../src/main/resources/mybatis-config.xml | 2 +
.../linkis/server/utils/LinkisMainHelper.scala | 12 +-
.../linkis/protocol/constants/TaskConstant.java | 3 +
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 1 +
.../common/CacheableRPCInterceptor.scala | 3 +-
.../linkis/scheduler/queue/SchedulerEvent.scala | 6 +
.../linkis/scheduler/AbstractSchedulerTest.scala | 42 +
.../linkis/scheduler/SchedulerContextTest.scala | 22 +-
.../conf/SchedulerConfigurationTest.scala | 36 +
.../linkis/scheduler/event/LogEventTest.scala | 17 +-
.../exception/LinkisJobRetryExceptionTest.scala | 26 +-
.../exception/SchedulerErrorExceptionTest.scala | 26 +-
.../WaitForNextAskExecutorExceptionTest.scala | 24 +-
.../scheduler/future/BDPFutureTaskTest.scala | 46 ++
.../queue/fifoqueue/FIFOConsumerManagerTest.scala | 52 ++
.../queue/fifoqueue/FIFOGroupFactoryTest.scala | 24 +-
.../scheduler/queue/fifoqueue/FIFOGroupTest.scala | 40 +
.../fifoqueue/FIFOSchedulerContextImplTest.scala | 39 +-
.../queue/fifoqueue/FIFOSchedulerTest.scala | 47 ++
.../queue/fifoqueue/FIFOUserConsumerTest.scala | 30 +-
.../ParallelConsumerManagerTest.scala | 20 +-
.../parallelqueue/ParallelGroupFactoryTest.scala | 25 +-
.../queue/parallelqueue/ParallelGroupTest.scala | 36 +
.../ParallelSchedulerContextImplTest.scala | 19 +-
.../parallelqueue/ParallelSchedulerTest.scala | 39 +
linkis-commons/linkis-storage/pom.xml | 2 +-
.../org/apache/linkis/storage/excel/XlsxUtils.java | 2 -
.../linkis/storage/fs/impl/HDFSFileSystem.java | 6 +-
.../linkis/storage/fs/impl/LocalFileSystem.java | 7 +-
.../linkis/storage/conf/LinkisStorageConf.scala | 25 +-
.../apache/linkis/storage/domain/DataType.scala | 1 +
.../linkis/storage/excel/ExcelFsWriter.scala | 3 +-
.../linkis/storage/excel/StorageExcelWriter.scala | 74 +-
.../storage/excel/StorageMultiExcelWriter.scala | 4 +-
.../apache/linkis/storage/source/FileSource.scala | 4 +-
.../client/once/action/ECResourceInfoAction.scala | 53 ++
.../client/once/result/ECResourceInfoResult.scala} | 27 +-
.../common/conf/GovernaceCommonConf.scala | 4 +-
.../common/constant/job/TaskInfoConstants.scala | 21 +-
.../governance/common/utils/ECPathUtils.scala | 32 +-
.../linkis-engineconn-manager-core/pom.xml | 5 +
.../ecm/core/launch/ProcessEngineConnLaunch.scala | 44 +-
.../apache/linkis/ecm/core/utils/PortUtils.scala | 64 ++
.../linkis/ecm/core/utils/PortUtilsTest.scala | 23 +-
.../server/operator/EngineConnLogOperator.scala | 110 ++-
.../operator/EngineConnYarnLogOperator.scala | 103 +++
.../impl/AbstractEngineConnLaunchService.scala | 2 +-
.../impl/DefaultLocalDirsHandleService.scala | 17 +-
.../service/TaskExecutionServiceImpl.scala | 25 +-
.../upstream/handler/ECTaskKillHandler.scala | 5 +-
.../entrance/restful/EntranceRestfulApi.java | 77 +-
.../entrance/execute/DefaultEntranceExecutor.scala | 59 +-
.../linkis/entrance/execute/EntranceExecutor.scala | 8 +-
.../interceptor/impl/CSEntranceInterceptor.scala | 2 +-
.../interceptor/impl/CustomVariableUtils.scala | 880 +--------------------
.../impl/StorePathEntranceInterceptor.scala | 3 +-
.../impl/VarSubstitutionInterceptor.scala | 3 +-
.../EntranceOrchestrationFactory.scala | 1 -
.../entrance/scheduler/EntranceGroupFactory.scala | 20 +-
.../entrance/timeout/JobTimeoutManager.scala | 25 +-
.../manager/label/constant/LabelKeyConstant.java | 1 +
.../label/entity/entrance/RetryCountLabel.java | 46 ++
.../am/restful/ECResourceInfoRestfulApi.java | 70 ++
.../linkis/manager/am/restful/EMRestfulApi.java | 3 +
.../manager/am/service/ECResourceInfoService.java | 17 +-
.../am/service/impl/ECResourceInfoServiceImpl.java | 61 ++
.../linkis/manager/am/conf/AMConfiguration.scala | 2 +
.../am/pointer/DefaultEngineNodPointer.scala | 2 +-
.../am/selector/rule/NewECMStandbyRule.scala | 76 ++
.../engine/DefaultEngineAskEngineService.scala | 4 +-
.../DefaultEngineConnStatusCallbackService.scala | 13 +-
.../service/engine/DefaultEngineInfoService.scala | 2 +-
.../service/engine/DefaultEngineReuseService.scala | 14 +-
.../am/service/monitor/NodeHeartbeatMonitor.scala | 2 +-
.../entity/persistence/ECResourceInfoRecord.java | 216 +++++
.../PersistenceResourceActionRecord.java | 155 ----
.../protocol/resource/ResourceProtocol.scala | 4 +
.../linkis/manager/dao/ECResourceRecordMapper.java | 21 +-
.../linkis/manager/dao/ResourceManagerMapper.java | 10 -
.../manager/dao/impl/ECResourceRecordMapper.xml | 63 ++
.../linkis/manager/dao/impl/LabelManagerMapper.xml | 1 +
.../manager/dao/impl/ResourceManagerMapper.xml | 19 -
.../persistence/ResourceManagerPersistence.java | 7 -
.../impl/DefaultLabelManagerPersistence.java | 14 +-
.../impl/DefaultResourceLabelPersistence.java | 16 +-
.../impl/DefaultResourceManagerPersistence.java | 16 -
.../resourcemanager/restful/RMMonitorRest.scala | 47 +-
.../service/impl/DefaultResourceManager.scala | 171 ++--
.../service/impl/ResourceLogService.scala | 194 ++---
.../linkis/resourcemanager/utils/RMUtils.scala | 2 +-
.../factory/LinkisYarnClusterClientFactory.java | 17 +-
.../flink/src/main/resources/log4j2.xml | 14 +-
.../flink/config/FlinkEnvConfiguration.scala | 6 +-
.../flink/factory/FlinkEngineConnFactory.scala | 74 +-
.../flink/operator/TriggerSavepointOperator.scala | 4 +-
.../flink/setting/HudiSettings.scala | 112 +++
.../engineconnplugin/flink/setting/Settings.scala | 18 +-
.../hive/src/main/resources/log4j2.xml | 14 +-
.../io_file/src/main/resources/log4j2.xml | 14 +-
.../main/resources/linkis-engineconn.properties | 1 +
.../jdbc/src/main/resources/log4j2.xml | 14 +-
.../pipeline/src/main/resources/log4j2.xml | 14 +-
.../conf/PipelineEngineConfiguration.scala | 1 +
.../pipeline/executor/ExcelExecutor.scala | 12 +-
.../python/src/main/resources/log4j2.xml | 14 +-
.../python/src/main/resources/python/python.py | 16 +
.../shell/src/main/resources/conf/log4j2.xml | 14 +-
.../spark/src/main/resources/log4j2.xml | 14 +-
.../spark/src/main/resources/python/mix_pyspark.py | 16 +
.../reheater/PruneTaskReheaterTransform.scala | 5 +-
.../conf/ComputationOrchestratorConf.scala | 2 -
.../progress/AbstractProgressOperation.scala | 18 +-
.../progress/DefaultProgressOperation.scala | 52 +-
.../operation/progress/ProgressInfoEvent.scala | 6 +-
.../operation/progress/ProgressProcessor.scala | 13 +-
.../service/ComputationTaskExecutionReceiver.scala | 19 +-
.../conf/OrchestratorConfiguration.scala | 2 +
.../orchestrator/listener/task/TaskInfoEvent.scala | 3 +-
.../listener/task/TaskProgressListener.scala | 2 +-
.../plans/logical/LogicalContext.scala | 4 +-
.../plans/logical/LogicalContextImpl.scala | 4 +-
.../plans/physical/PhysicalContext.scala | 6 +-
.../plans/physical/PhysicalContextImpl.scala | 9 +-
.../plans/physical/RetryExecTask.scala | 22 +-
.../ecm/service/TaskExecutionReceiver.scala | 6 +-
.../linkis/bml/client/impl/HttpBmlClient.scala | 4 +-
.../cache/DefaultContextAddListener.java | 84 ++
.../cs/contextcache/cache/DefaultContextCache.java | 6 +-
.../cache/csid/impl/ContextIDValueImpl.java | 4 +-
.../cache/cskey/impl/ContextValueMapSetImpl.java | 3 +-
.../cs/contextcache/conf/ContextCacheConf.java | 9 +
.../index/ContextInvertedIndexSetImpl.java | 3 +-
.../cs/contextcache/metric/SizeEstimator.java | 5 +-
.../org/apache/linkis/cs/client/ContextClient.java | 22 +
.../linkis/cs/client/http/HttpContextClient.java | 153 +++-
.../linkis/cs/client/http/ContextAction.scala | 32 +-
.../linkis/cs/client/http/ContextResult.scala | 59 +-
.../cs/client/utils/ContextServerHttpConf.scala | 41 +-
.../org/apache/linkis/cs/client/test/Test.java | 6 +
.../client/test/no_context_search/TestClear.java | 60 ++
.../test/test_multiuser/TestChangeContext.java | 19 +-
.../linkis/cs/common/utils/CSCommonUtils.java | 16 +
.../highavailable/proxy/MethodInterceptorImpl.java | 13 +-
.../cs/persistence/conf/PersistenceConf.java | 2 +-
.../linkis/cs/persistence/dao/ContextIDMapper.java | 15 +
.../cs/persistence/dao/ContextMapMapper.java | 11 +
.../persistence/dao/impl/contextHistoryMapper.xml | 7 +-
.../dao/impl/contextIDListenerMapper.xml | 4 +-
.../cs/persistence/dao/impl/contextIDMapper.xml | 34 +-
.../dao/impl/contextKeyListenerMapper.xml | 4 +-
.../cs/persistence/dao/impl/contextMapMapper.xml | 36 +-
.../entity/PersistenceContextHistory.java | 32 +
.../persistence/entity/PersistenceContextID.java | 30 +
.../entity/PersistenceContextIDListener.java | 32 +
.../entity/PersistenceContextKeyListener.java | 24 +
.../entity/PersistenceContextKeyValue.java | 32 +
.../persistence/ContextIDPersistence.java | 16 +
.../persistence/ContextMapPersistence.java | 9 +
.../persistence/impl/ContextIDPersistenceImpl.java | 35 +
.../impl/ContextMapPersistenceImpl.java | 34 +
.../linkis/cs/server/conf/ContextServerConf.java | 3 +
.../cs/server/enumeration/ServiceMethod.java | 4 +-
.../cs/server/restful/ContextIDRestfulApi.java | 104 ++-
.../cs/server/restful/ContextRestfulApi.java | 110 ++-
.../cs/server/scheduler/DefaultCsScheduler.java | 5 +-
.../linkis/cs/server/service/AbstractService.java | 3 +
.../linkis/cs/server/service/ContextIDService.java | 14 +
.../linkis/cs/server/service/ContextService.java | 12 +
.../server/service/impl/ContextIDServiceImpl.java | 68 +-
.../cs/server/service/impl/ContextServiceImpl.java | 66 +-
.../org/apache/linkis/cs/server/util/CsUtils.java | 3 +
.../linkis/metadata/hive/dao/HiveMetaDao.java | 4 +
.../linkis/metadata/hive/dao/impl/HiveMetaDao.xml | 46 ++
.../metadata/restful/api/DataSourceRestfulApi.java | 14 +-
.../linkis/metadata/service/DataSourceService.java | 2 +
.../service/HiveMetaWithPermissionService.java | 4 +
.../service/impl/DataSourceServiceImpl.java | 21 +-
.../impl/HiveMetaWithPermissionServiceImpl.java | 44 ++
.../linkis/metadata/utils/MdqConstants.scala} | 25 +-
.../jobhistory/restful/api/QueryRestfulApi.java | 11 +
.../jobhistory/conversions/TaskConversions.scala | 16 +-
.../apache/linkis/jobhistory/util/QueryUtils.scala | 16 +-
.../filesystem/restful/api/FsRestfulApi.java | 14 +-
.../linkis-service-discovery/linkis-eureka/pom.xml | 18 +
.../gateway/config/GatewayConfiguration.scala | 2 +
.../linkis/gateway/security/UserRestful.scala | 2 +-
.../parser/EntranceExecutionGatewayParser.scala | 15 +-
pom.xml | 2 +-
scalastyle-config.xml | 2 +-
tool/dependencies/known-dependencies.txt | 17 +-
web/src/apps/URM/i18n/common/en.json | 15 +-
web/src/apps/URM/i18n/common/zh.json | 9 +-
.../module/functionManagement/addFunctionModal.vue | 50 +-
.../apps/URM/module/functionManagement/index.scss | 3 -
.../apps/URM/module/functionManagement/index.vue | 53 +-
.../apps/URM/module/functionManagement/vlist.vue | 4 +-
.../URM/module/udfManagement/addFunctionModal.vue | 49 +-
web/src/apps/URM/module/udfManagement/index.scss | 3 -
web/src/apps/URM/module/udfManagement/index.vue | 67 +-
web/src/apps/URM/module/udfManagement/vlist.vue | 4 +-
web/src/apps/URM/router.js | 2 +-
web/src/apps/URM/view/urm/index.vue | 2 +-
web/src/apps/linkis/assets/styles/console.scss | 10 +-
web/src/apps/linkis/components/cardList/index.scss | 1 +
web/src/apps/linkis/components/cardList/index.vue | 2 +-
web/src/apps/linkis/i18n/common/en.json | 45 +-
web/src/apps/linkis/i18n/common/zh.json | 24 +-
web/src/apps/linkis/module/ECM/engineConn.vue | 28 +-
web/src/apps/linkis/module/ECM/index.scss | 2 +
web/src/apps/linkis/module/ECM/index.vue | 26 +-
web/src/apps/linkis/module/ECM/log.vue | 2 +-
web/src/apps/linkis/module/ECM/search.vue | 2 +-
web/src/apps/linkis/module/datasource/index.vue | 89 ++-
.../module/globalHistoryManagement/index.vue | 25 +-
.../module/globalHistoryManagement/viewHistory.vue | 4 +-
.../apps/linkis/module/globalValiable/index.vue | 2 +-
.../module/microServiceManagement/index.scss | 4 +
.../linkis/module/microServiceManagement/index.vue | 45 +-
.../linkis/module/resourceManagement/index.scss | 2 +
.../linkis/module/resourceManagement/index.vue | 96 ++-
web/src/apps/linkis/router.js | 20 +-
web/src/apps/linkis/view/linkis/index.vue | 59 +-
web/src/common/i18n/en.json | 5 +-
web/src/common/i18n/zh.json | 6 +-
web/src/common/style/headerUserMenu.scss | 4 +-
web/src/components/consoleComponent/log.vue | 2 +-
web/src/components/consoleComponent/progress.vue | 2 +-
web/src/components/consoleComponent/result.vue | 5 +-
.../virtualTable/historyTable/historyTable.vue | 4 +-
web/src/dss/router.js | 4 +-
web/src/dss/view/layout.vue | 46 +-
web/src/dss/view/login/index.vue | 9 +-
web/src/main.js | 4 +
web/src/router.js | 2 +-
web/src/utils/watermark.js | 81 ++
248 files changed, 5540 insertions(+), 2518 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org